summaryrefslogtreecommitdiff
path: root/org.fox.ttcomics/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttcomics/src/main')
-rw-r--r--org.fox.ttcomics/src/main/AndroidManifest.xml4
-rw-r--r--org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java6
-rw-r--r--org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java2
-rw-r--r--org.fox.ttcomics/src/main/res/values-night-v21/style.xml9
-rw-r--r--org.fox.ttcomics/src/main/res/values-v11/style.xml6
-rw-r--r--org.fox.ttcomics/src/main/res/values-v21/style.xml4
-rw-r--r--org.fox.ttcomics/src/main/res/values/style.xml14
-rw-r--r--org.fox.ttcomics/src/main/res/xml/preferences.xml16
8 files changed, 14 insertions, 47 deletions
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 6e638ef..2e4511d 100644
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.fox.ttcomics2"
- android:versionCode="94"
- android:versionName="1.52" >
+ android:versionCode="95"
+ android:versionName="1.53" >
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
index d9721ac..adc749f 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
@@ -12,8 +12,6 @@ import android.view.ViewGroup;
import android.widget.SeekBar;
import android.widget.TextView;
-import com.ToxicBakery.viewpager.transforms.DepthPageTransformer;
-
import org.fox.ttcomics2.archive.CbrComicArchive;
import org.fox.ttcomics2.archive.CbzComicArchive;
import org.fox.ttcomics2.archive.ComicArchive;
@@ -164,10 +162,6 @@ public class ComicPager extends StateSavedFragment {
pager.setAdapter(m_adapter);
pager.setCurrentItem(position);
- if (m_prefs.getBoolean("use_page_transformer", false)) {
- pager.setPageTransformer(true, new DepthPageTransformer());
- }
-
m_activity.onComicSelected(m_fileName, position);
if (m_prefs.getBoolean("use_full_screen", false)) {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index 4733b3f..086793e 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -45,8 +45,6 @@ public class ViewComicActivity extends CommonActivity {
m_prefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
- setTheme(m_prefs.getBoolean("use_dark_theme", false) ? R.style.ViewDarkTheme : R.style.ViewLightTheme);
-
super.onCreate(savedInstanceState);
if (m_prefs.getBoolean("prevent_screen_sleep", false)) {
diff --git a/org.fox.ttcomics/src/main/res/values-night-v21/style.xml b/org.fox.ttcomics/src/main/res/values-night-v21/style.xml
new file mode 100644
index 0000000..d300a9b
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/values-night-v21/style.xml
@@ -0,0 +1,9 @@
+<resources>
+
+ <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <item name="android:navigationBarColor">@android:color/black</item>
+ </style>
+
+ <style name="DarkDialogTheme" parent="android:Theme">
+ </style>
+</resources> \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/values-v11/style.xml b/org.fox.ttcomics/src/main/res/values-v11/style.xml
deleted file mode 100644
index 54a7530..0000000
--- a/org.fox.ttcomics/src/main/res/values-v11/style.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
- <style name="DarkDialogTheme" parent="android:Theme.Holo.Dialog">
- </style>
-
-</resources> \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/values-v21/style.xml b/org.fox.ttcomics/src/main/res/values-v21/style.xml
index fb3dea3..c3ac29a 100644
--- a/org.fox.ttcomics/src/main/res/values-v21/style.xml
+++ b/org.fox.ttcomics/src/main/res/values-v21/style.xml
@@ -3,8 +3,4 @@
<style name="DarkDialogTheme" parent="android:Theme.Material.Dialog">
</style>
- <style name="ViewDarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
- <item name="android:navigationBarColor">@android:color/black</item>
- </style>
-
</resources> \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml
index 8e5eac5..5540514 100644
--- a/org.fox.ttcomics/src/main/res/values/style.xml
+++ b/org.fox.ttcomics/src/main/res/values/style.xml
@@ -1,24 +1,14 @@
<resources>
- <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
- <item name="colorPrimary">#607D8B</item>
- <item name="colorPrimaryDark">#455A64</item>
- <item name="colorAccent">#FF5722</item>
- </style>
-
- <style name="ViewLightTheme" parent="AppTheme">
-
+ <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
</style>
- <style name="ViewDarkTheme" parent="ViewDarkTheme.Base">
+ <style name="AppTheme" parent="AppTheme.Base">
<item name="colorPrimary">#607D8B</item>
<item name="colorPrimaryDark">#455A64</item>
<item name="colorAccent">#FF5722</item>
</style>
- <style name="ViewDarkTheme.Base" parent="Theme.AppCompat.NoActionBar">
- </style>
-
<style name="DarkDialogTheme" parent="android:Theme">
</style>
</resources> \ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/xml/preferences.xml b/org.fox.ttcomics/src/main/res/xml/preferences.xml
index 097a469..85a1f77 100644
--- a/org.fox.ttcomics/src/main/res/xml/preferences.xml
+++ b/org.fox.ttcomics/src/main/res/xml/preferences.xml
@@ -49,16 +49,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_reading" android:key="prefs_reading">
- <org.fox.ttcomics2.utils.LessBrokenSwitchPreference
- android:defaultValue="false"
- android:key="use_dark_theme"
- android:title="@string/prefs_dark_theme" />
-
- <!-- <org.fox.ttcomics2.utils.LessBrokenSwitchPreference
- android:defaultValue="false"
- android:key="dim_status_bar"
- android:title="@string/prefs_dim_status_bar" /> -->
-
+
<org.fox.ttcomics2.utils.LessBrokenSwitchPreference
android:defaultValue="false"
android:key="use_full_screen"
@@ -74,11 +65,6 @@
android:key="prevent_screen_sleep"
android:title="@string/prefs_prevent_screen_sleep" />
- <org.fox.ttcomics2.utils.LessBrokenSwitchPreference
- android:defaultValue="false"
- android:key="use_page_transformer"
- android:title="@string/prefs_use_page_transformer" />
-
</PreferenceCategory>
<Preference