From 736819cfea62d070c0549b354738a35e34fb2f3b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 22 Apr 2020 16:51:03 +0300
Subject: * follow system dark/day theme * remove viewpager transforms (buggy)

---
 org.fox.ttcomics/build.gradle                      |  9 +++----
 org.fox.ttcomics/org.fox.ttcomics.iml              | 30 +++++++++++-----------
 org.fox.ttcomics/src/main/AndroidManifest.xml      |  4 +--
 .../main/java/org/fox/ttcomics2/ComicPager.java    |  6 -----
 .../java/org/fox/ttcomics2/ViewComicActivity.java  |  2 --
 .../src/main/res/values-night-v21/style.xml        |  9 +++++++
 org.fox.ttcomics/src/main/res/values-v11/style.xml |  6 -----
 org.fox.ttcomics/src/main/res/values-v21/style.xml |  4 ---
 org.fox.ttcomics/src/main/res/values/style.xml     | 14 ++--------
 org.fox.ttcomics/src/main/res/xml/preferences.xml  | 16 +-----------
 10 files changed, 33 insertions(+), 67 deletions(-)
 create mode 100644 org.fox.ttcomics/src/main/res/values-night-v21/style.xml
 delete mode 100644 org.fox.ttcomics/src/main/res/values-v11/style.xml

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index 7d89841..682c21e 100644
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "org.fox.ttcomics2"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 27
     }
 
@@ -49,18 +49,17 @@ android {
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.shamanland:fab:0.0.8'
     implementation 'jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
-    implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
     implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
     implementation 'frankiesardo:icepick:3.2.0'
     compileOnly 'frankiesardo:icepick-processor:3.2.0'
     implementation 'com.github.livefront:bridge:v1.1.2'
     annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
-    implementation 'com.google.android.gms:play-services-base:17.1.0'
-    implementation 'com.google.android.gms:play-services-auth:17.0.0'
+    implementation 'com.google.android.gms:play-services-base:17.2.1'
+    implementation 'com.google.android.gms:play-services-auth:18.0.0'
     implementation files('libs/nineoldandroids-2.4.0.jar')
     implementation 'com.gu:option:1.3'
     implementation 'net.rdrei.android.dirchooser:library:3.2@aar'
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index e7a0aca..8039477 100644
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -92,8 +92,8 @@
     <orderEntry type="library" name="Gradle: __local_aars__:C.\Users\fox\Projects\tt-comics\org.fox.ttcomics\libs\nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: frankiesardo:icepick-processor:3.2.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:3.8.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: frankiesardo:icepick:3.2.0@jar" level="project" />
@@ -109,51 +109,51 @@
     <orderEntry type="library" name="Gradle: com.google.auto:auto-common:0.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:18.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.livefront:bridge:v1.1.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.joielechong:zip4jandroid:1.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:17.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:17.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.2.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:17.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:17.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:17.2.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.shamanland:fab:0.0.8@aar" level="project" />
     <orderEntry type="library" name="Gradle: jp.co.recruit_mp:android-HeaderFooterGridView:0.2.4@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core:3.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: net.rdrei.android.dirchooser:library:3.2@aar" level="project" />
   </component>
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
-- 
cgit v1.2.3