From 3e9028c26e0099d19e9490dd278e5807fbe33daf Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:45:31 +0800
Subject: [PATCH] Update RikkaX material

---
 app/build.gradle                                | 10 +++++-----
 .../com/hippo/ehviewer/ui/GalleryActivity.java  | 17 ++++-------------
 build.gradle                                    |  2 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 84cef139f..29dc5035c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    buildToolsVersion "31.0.0-rc2"
     signingConfigs {
         def keystorePwd = null
         def alias = null
@@ -35,8 +35,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lintOptions {
@@ -146,8 +146,8 @@ dependencies {
     implementation 'com.github.NekoInverter:Image:8fd6c1e1df'
     implementation 'com.gitlab.NekoInverter:yorozuya:723dc867a9'
     implementation 'dev.rikka.rikkax.appcompat:appcompat:1.2.0-rc01'
-    implementation 'dev.rikka.rikkax.core:core:1.3.1'
-    implementation 'dev.rikka.rikkax.material:material:1.6.0'
+    implementation 'dev.rikka.rikkax.core:core:1.3.2'
+    implementation 'dev.rikka.rikkax.material:material:1.6.4'
     implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.2.0'
     implementation 'dev.rikka.rikkax.widget:borderview:1.0.1'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.2'
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
index 7679f9502..975765ad3 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -187,8 +187,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
     private int mSavingPage = -1;
 
-    private static int defaultNightMode = DayNightDelegate.MODE_NIGHT_UNSPECIFIED;
-
     ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
             new ActivityResultContracts.RequestPermission(),
             result -> {
@@ -305,27 +303,20 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
 
     @Override
     protected void attachBaseContext(@NonNull Context newBase) {
-        if (defaultNightMode == DayNightDelegate.MODE_NIGHT_UNSPECIFIED)
-            defaultNightMode = DayNightDelegate.getDefaultNightMode();
         switch (Settings.getReadTheme()) {
-            case 0:
-                DayNightDelegate.setDefaultNightMode(defaultNightMode);
-                break;
             case 1:
-                DayNightDelegate.setDefaultNightMode(DayNightDelegate.MODE_NIGHT_YES);
+                getDayNightDelegate().setLocalNightMode(DayNightDelegate.MODE_NIGHT_YES, false);
                 break;
             case 2:
-                DayNightDelegate.setDefaultNightMode(DayNightDelegate.MODE_NIGHT_NO);
+                getDayNightDelegate().setLocalNightMode(DayNightDelegate.MODE_NIGHT_NO, false);
                 break;
         }
         super.attachBaseContext(newBase);
     }
 
     @Override
-    public void finish() {
-        DayNightDelegate.setDefaultNightMode(defaultNightMode);
-        defaultNightMode = DayNightDelegate.MODE_NIGHT_UNSPECIFIED;
-        super.finish();
+    public boolean respectDefaultNightMode() {
+        return Settings.getReadTheme() == 0;
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index b16ea451d..72d4b086d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools:r8:3.0.27-dev'
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha10'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha11'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files