From 0600f2062499ab8cb7b41884a738df50268f26ac Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 8 Feb 2015 11:17:30 +0300 Subject: code cleanup --- .../java/org/fox/ttcomics/CbzComicArchive.java | 1 - .../main/java/org/fox/ttcomics/ComicFragment.java | 2 +- .../java/org/fox/ttcomics/ComicListFragment.java | 6 +--- .../src/main/java/org/fox/ttcomics/ComicPager.java | 6 ---- .../main/java/org/fox/ttcomics/MainActivity.java | 42 +--------------------- .../java/org/fox/ttcomics/ViewComicActivity.java | 33 ++++++----------- 6 files changed, 13 insertions(+), 77 deletions(-) (limited to 'org.fox.ttcomics/src/main/java/org') diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CbzComicArchive.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CbzComicArchive.java index 43bacb2..b89c49a 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CbzComicArchive.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CbzComicArchive.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java index 7775918..03cbdef 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java @@ -80,7 +80,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT BitmapFactory.decodeStream(archive.getItem(page), null, options); options.inJustDecodeBounds = false; - Bitmap bitmap = null; + Bitmap bitmap; int sampleSizes[]; diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java index ae74d23..8afe882 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicListFragment.java @@ -86,13 +86,9 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { int lastPos = m_activity.getLastPosition(filePath + "/" + fileBaseName); int size = m_activity.getSize(filePath + "/" + fileBaseName); - boolean isList = ComicListFragment.this.getView().findViewById(R.id.comics_list) != null; - if (v == null) { LayoutInflater vi = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - //v = vi.inflate(isList ? R.layout.comics_list_row : R.layout.comics_grid_row, null); v = vi.inflate(R.layout.comics_grid_row, null); } @@ -427,7 +423,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener { FileOutputStream fos = new FileOutputStream(thumbnailFile); byte[] buffer = new byte[1024]; - int len = 0; + int len; while ((len = is.read(buffer)) != -1) { fos.write(buffer, 0, len); } diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java index fc63cc0..fd12498 100644 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicPager.java @@ -138,14 +138,9 @@ public class ComicPager extends Fragment { pager.setCurrentItem(position); m_activity.onComicSelected(m_fileName, position); - //m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000)); - //m_activity.hideSystemUiIfNecessary(); if (m_prefs.getBoolean("use_full_screen", false)) { m_activity.hideSystemUI(true); - } - - if (m_prefs.getBoolean("use_full_screen", false)) { hideSeekBar(true); } @@ -158,7 +153,6 @@ public class ComicPager extends Fragment { public void onPageSelected(int position) { m_activity.onComicSelected(m_fileName, position); - //m_activity.setProgress(Math.round(((float)position / (float)(m_archive.getCount()-1)) * 10000)); m_seekBar.setProgress(position); if (m_prefs.getBoolean("use_full_screen", false)) { diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java index 7e05c8b..2108bd3 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/MainActivity.java @@ -22,58 +22,18 @@ public class MainActivity extends CommonActivity implements MaterialTabListener private final String TAG = this.getClass().getSimpleName(); private final static int TRIAL_DAYS = 7; - //private TabListener m_tabListener; private int m_selectedTab; private String m_baseDirectory = ""; private String m_fileName = ""; private MaterialTabHost tabHost; - /* @SuppressLint("NewApi") - private class TabListener implements ActionBar.TabListener { - - @Override - public void onTabReselected(Tab tab, FragmentTransaction ft) { - // TODO Auto-generated method stub - } - - @Override - public void onTabSelected(Tab tab, FragmentTransaction ft) { - FragmentTransaction sft = getSupportFragmentManager().beginTransaction(); - - if (m_selectedTab != tab.getPosition() && m_selectedTab != -1) { - - ComicListFragment frag = new ComicListFragment(); - frag.setMode(tab.getPosition()); - - frag.setBaseDirectory(m_baseDirectory); - - sft.replace(R.id.comics_list, frag, FRAG_COMICS_LIST); - } - - m_selectedTab = tab.getPosition(); - - sft.commit(); - } - - @Override - public void onTabUnselected(Tab tab, FragmentTransaction ft) { - // TODO Auto-generated method stub - - } - - } */ - @SuppressLint("NewApi") @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - //requestWindowFeature(Window.FEATURE_PROGRESS); - + setContentView(R.layout.activity_main); - //setProgressBarVisibility(false); - setSmallScreen(findViewById(R.id.tablet_layout_hack) == null); tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost); diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java index 5486e96..e77129b 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java @@ -37,19 +37,17 @@ public class ViewComicActivity extends CommonActivity { super.onCreate(savedInstanceState); setTheme(m_prefs.getBoolean("use_dark_theme", false) ? R.style.ViewDarkTheme : R.style.ViewLightTheme); - - //requestWindowFeature(Window.FEATURE_PROGRESS); - if (m_prefs.getBoolean("prevent_screen_sleep", false)) - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - - /* if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.KITKAT && !m_prefs.getBoolean("use_full_screen", false)) { - getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - setStatusBarTint(); - } */ - + if (m_prefs.getBoolean("prevent_screen_sleep", false)) { + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } + + if (m_prefs.getBoolean("use_full_screen", false)) { + hideSystemUI(true); + } + setContentView(R.layout.activity_view_comic); - + if (savedInstanceState == null) { m_fileName = getIntent().getStringExtra("fileName"); @@ -67,19 +65,8 @@ public class ViewComicActivity extends CommonActivity { setOrientationLock(isOrientationLocked(), true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - setTitle(new File(m_fileName).getName()); - /* if (m_prefs.getBoolean("use_full_screen", false)) { - //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - // WindowManager.LayoutParams.FLAG_FULLSCREEN); - - //getSupportActionBar().hide(); - } */ - - /* if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && m_prefs.getBoolean("use_dark_theme", false)) { - getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.BLACK)); - } */ + setTitle(new File(m_fileName).getName()); } @Override -- cgit v1.2.3