diff options
15 files changed, 16 insertions, 165 deletions
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
diff --git a/org.fox.ttcomics/src/main/res/anim/layout_comics.xml b/org.fox.ttcomics/src/main/res/anim/layout_comics.xml deleted file mode 100644 index 93a58f1..0000000 --- a/org.fox.ttcomics/src/main/res/anim/layout_comics.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layoutAnimation xmlns:android="http://schemas.android.com/apk/res/android"
- android:delay="20%"
- android:animation="@anim/appear"
-/>
diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_good.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_good.png Binary files differdeleted file mode 100644 index 594ee12..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_action_good.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_search_light.png b/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_search_light.png Binary files differdeleted file mode 100644 index f12e005..0000000 --- a/org.fox.ttcomics/src/main/res/drawable-hdpi/ic_search_light.png +++ /dev/null diff --git a/org.fox.ttcomics/src/main/res/drawable/comic_tile.xml b/org.fox.ttcomics/src/main/res/drawable/comic_tile.xml deleted file mode 100644 index 428e246..0000000 --- a/org.fox.ttcomics/src/main/res/drawable/comic_tile.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#33b5e5" />
- <corners android:radius="2dp"/>
- </shape>
- </item>
-
- <!-- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#e0e0e0" />
- <corners android:radius="2dp"/>
- </shape>
- </item> -->
-
- <item
- android:bottom="2dp">
- <shape android:shape="rectangle" >
- <solid android:color="#ffffff" />
- <corners android:radius="2dp"/>
- </shape>
- </item>
-
-</layer-list>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/drawable/comic_tile_folder.xml b/org.fox.ttcomics/src/main/res/drawable/comic_tile_folder.xml deleted file mode 100644 index 2cd13b5..0000000 --- a/org.fox.ttcomics/src/main/res/drawable/comic_tile_folder.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#99cc00" />
- <corners android:radius="2dp"/>
- </shape>
- </item>
-
- <!-- <item>
- <shape android:shape="rectangle" >
- <solid android:color="#e0e0e0" />
- <corners android:radius="2dp"/>
- </shape>
- </item> -->
-
- <item
- android:bottom="2dp">
- <shape android:shape="rectangle" >
- <solid android:color="#ffffff" />
- <corners android:radius="2dp"/>
- </shape>
- </item>
-
-</layer-list>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml index e557871..507f0b7 100644 --- a/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml +++ b/org.fox.ttcomics/src/main/res/layout/comics_grid_row.xml @@ -62,7 +62,7 @@ android:ellipsize="middle"
android:singleLine="true"
android:text="Comic_1980.cbz"
- android:textSize="11dp" />
+ android:textSize="11sp" />
<ProgressBar
android:id="@+id/file_progress_bar"
@@ -78,7 +78,7 @@ android:layout_weight="0"
android:gravity="right"
android:text="12 of 325"
- android:textSize="8dp" />
+ android:textSize="8sp" />
</LinearLayout>
</LinearLayout>
diff --git a/org.fox.ttcomics/src/main/res/layout/dialog_location_compat.xml b/org.fox.ttcomics/src/main/res/layout/dialog_location_compat.xml deleted file mode 100644 index 385b8d5..0000000 --- a/org.fox.ttcomics/src/main/res/layout/dialog_location_compat.xml +++ /dev/null @@ -1,23 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/linearLayout1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal" >
- -
- <SeekBar
- android:id="@+id/number_seeker"
- android:layout_weight="1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
- - -
- <TextView
- android:id="@+id/page_number"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="1 of 365" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml index b810b9f..2d5f0c6 100644 --- a/org.fox.ttcomics/src/main/res/values/strings.xml +++ b/org.fox.ttcomics/src/main/res/values/strings.xml @@ -34,7 +34,6 @@ <string name="error_loading_image">Error loading image</string>
<string name="error_could_not_read_folder_contents_">Could not read folder contents.</string>
<string name="picker_choose">Choose %1$s</string>
- <string name="dialog_location_page_number">%1$d of %2$d</string>
<string name="sync_server_has_further_page">You are currently on page %1$d. Furthest read page stored on the server is %2$d. Open it instead?</string>
<string name="dialog_open_page">Open page</string>
<string name="menu_sync_location">Sync to last page read</string>
@@ -57,15 +56,10 @@ <string name="menu_toggle_orientation_lock">(Un)lock orientation</string>
<string name="prefs_comics_directory_summary">Base directory for comic archives.</string>
<string name="prefs_fit_to_width">Fit to width</string>
- <string name="menu_donate">Donate</string>
<string name="sync_running_in_test_mode">Sync running in test mode.</string>
<string name="reset_remove_synced_progress">Would you like to remove synced progress too?</string>
<string name="error_cant_open_file">Can\'t open file: %1$s</string>
<string name="prefs_prevent_screen_sleep">Keep screen awake</string>
- <string name="trial_mode_prompt">Trial mode, %1$d day(s) left.</string>
- <string name="trial_purchase">Unlock full version</string>
- <string name="trial_expired">Trial expired</string>
- <string name="trial_expired_message">To continue using Pow! Comics Reader please unlock the full version by purchasing the key.</string>
<string name="error_other_error">Error: unknown error (see log)</string>
<string name="list_type_directory">Directory</string>
<string name="list_type_unknown">Unknown</string>
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml index a34281e..7c93175 100644 --- a/org.fox.ttcomics/src/main/res/values/style.xml +++ b/org.fox.ttcomics/src/main/res/values/style.xml @@ -13,6 +13,7 @@ <style name="ViewDarkTheme" parent="Theme.AppCompat">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
+ <item name="colorAccent">#FF6600</item>
<item name="viewComicsBackground">@android:color/black</item>
</style>
|
