From 6ecce9ddc5110c74aa22855d38164f1cf76d6f8b Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 18 Oct 2018 12:56:56 +0800
Subject: [PATCH] Add dark theme and black theme

---
 app/src/main/AndroidManifest.xml              | 16 +++---
 .../com/hippo/ehviewer/ui/EhActivity.java     |  6 +++
 .../ehviewer/ui/EhPreferenceActivity.java     |  6 +++
 .../hippo/ehviewer/ui/GalleryActivity.java    | 13 +++++
 .../com/hippo/ehviewer/ui/MainActivity.java   | 13 +++++
 .../hippo/ehviewer/ui/SettingsActivity.java   | 14 +++++
 .../hippo/ehviewer/ui/ToolbarActivity.java    | 14 +++++
 app/src/main/res/values/themes.xml            | 52 +++++++++++++++++++
 8 files changed, 126 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eef628bbd..30336fb39 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,48 +103,48 @@
         <activity
             android:name="com.hippo.ehviewer.ui.SettingsActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme"/>
+            android:theme="@style/AppTheme.Settings"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.ExcludedLanguagesActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/excluded_languages"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.DirPickerActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/dir_picker"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.LicenseActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/license"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.FilterActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/filter"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.SetSecurityActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/set_pattern_protection"/>
 
         <activity
             android:name="com.hippo.ehviewer.ui.UConfigActivity"
             android:configChanges="screenSize|uiMode"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/AppTheme.Toolbar"
             android:label="@string/u_config"/>
 
         <activity
           android:name="com.hippo.ehviewer.ui.HostsActivity"
           android:configChanges="screenSize|uiMode"
-          android:theme="@style/AppTheme.NoActionBar"
+          android:theme="@style/AppTheme.Toolbar"
           android:label="@string/hosts"/>
 
         <activity
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
index 4e6bb0950..287377ee5 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
@@ -19,6 +19,7 @@ package com.hippo.ehviewer.ui;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.support.v7.app.AppCompatActivity;
 import android.view.WindowManager;
 import com.google.analytics.tracking.android.EasyTracker;
@@ -31,8 +32,13 @@ public abstract class EhActivity extends AppCompatActivity {
 
     private boolean mTrackStarted;
 
+    @StyleRes
+    protected abstract int getThemeResId(int theme);
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setTheme(getThemeResId(Settings.getTheme()));
+
         super.onCreate(savedInstanceState);
 
         ((EhApplication) getApplication()).registerActivity(this);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhPreferenceActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/EhPreferenceActivity.java
index 69341584f..9629fb2e2 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhPreferenceActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhPreferenceActivity.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.annotation.StyleRes;
 import android.view.WindowManager;
 import com.google.analytics.tracking.android.EasyTracker;
 import com.hippo.app.PrettyPreferenceActivity;
@@ -32,8 +33,13 @@ public abstract class EhPreferenceActivity extends PrettyPreferenceActivity {
 
     private boolean mTrackStarted;
 
+    @StyleRes
+    protected abstract int getThemeResId(int theme);
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setTheme(getThemeResId(Settings.getTheme()));
+
         super.onCreate(savedInstanceState);
 
         ((EhApplication) getApplication()).registerActivity(this);
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 3cd92c3a9..87054090c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
@@ -182,6 +182,19 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
     };
 
+    @Override
+    protected int getThemeResId(int theme) {
+        switch (theme) {
+            case Settings.THEME_LIGHT:
+            default:
+                return R.style.AppTheme_Gallery;
+            case Settings.THEME_DARK:
+                return R.style.AppTheme_Gallery_Dark;
+            case Settings.THEME_BLACK:
+                return R.style.AppTheme_Gallery_Black;
+        }
+    }
+
     private void buildProvider() {
         if (mGalleryProvider != null) {
             return;
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index e4ea6b877..a0f86de9c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -142,6 +142,19 @@ public final class MainActivity extends StageActivity
         registerLaunchMode(ProgressScene.class, SceneFragment.LAUNCH_MODE_STANDARD);
     }
 
+    @Override
+    protected int getThemeResId(int theme) {
+        switch (theme) {
+            case Settings.THEME_LIGHT:
+            default:
+                return R.style.AppTheme_Main;
+            case Settings.THEME_DARK:
+                return R.style.AppTheme_Main_Dark;
+            case Settings.THEME_BLACK:
+                return R.style.AppTheme_Main_Black;
+        }
+    }
+
     @Override
     public int getContainerViewId() {
         return R.id.fragment_container;
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
index bdb5ab9ff..5ba4fc1fe 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
@@ -25,6 +25,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.view.MenuItem;
 import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
 import com.hippo.ehviewer.ui.fragment.AboutFragment;
 import com.hippo.ehviewer.ui.fragment.AdvancedFragment;
 import com.hippo.ehviewer.ui.fragment.DownloadFragment;
@@ -47,6 +48,19 @@ public final class SettingsActivity extends EhPreferenceActivity {
             PrivacyFragment.class.getName(),
     };
 
+    @Override
+    protected int getThemeResId(int theme) {
+      switch (theme) {
+        case Settings.THEME_LIGHT:
+        default:
+          return R.style.AppTheme_Settings;
+        case Settings.THEME_DARK:
+          return R.style.AppTheme_Settings_Dark;
+        case Settings.THEME_BLACK:
+          return R.style.AppTheme_Settings_Black;
+      }
+    }
+
     private void setActionBarUpIndicator(Drawable drawable) {
         ActionBarDrawerToggle.Delegate delegate = getDrawerToggleDelegate();
         if (delegate != null) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ToolbarActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/ToolbarActivity.java
index 000c5acd3..581f2a45c 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/ToolbarActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/ToolbarActivity.java
@@ -25,9 +25,23 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.Settings;
 
 public abstract class ToolbarActivity extends EhActivity {
 
+    @Override
+    protected int getThemeResId(int theme) {
+        switch (theme) {
+            case Settings.THEME_LIGHT:
+            default:
+                return R.style.AppTheme_Toolbar;
+            case Settings.THEME_DARK:
+                return R.style.AppTheme_Toolbar_Dark;
+            case Settings.THEME_BLACK:
+                return R.style.AppTheme_Toolbar_Black;
+        }
+    }
+
     @Override
     public void setContentView(@LayoutRes int layoutResID) {
         super.setContentView(R.layout.activity_toolbar);
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ce70087b5..2df583a10 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -70,11 +70,63 @@
     <style name="AppTheme.Main" parent="AppTheme.NoActionBar">
     </style>
 
+    <style name="AppTheme.Main.Dark" parent="AppTheme.Dark.NoActionBar">
+    </style>
+
+    <style name="AppTheme.Main.Black" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+    </style>
+
+    <style name="AppTheme.Toolbar" parent="AppTheme.NoActionBar">
+    </style>
+
+    <style name="AppTheme.Toolbar.Dark" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+    </style>
+
+    <style name="AppTheme.Toolbar.Black" parent="AppTheme.Dark.NoActionBar">
+    </style>
+
     <style name="AppTheme.Gallery" parent="AppTheme.Dark.NoActionBar">
         <item name="colorPrimaryDark">@android:color/black</item>
         <item name="android:windowBackground">@color/gallery_background</item>
     </style>
 
+    <style name="AppTheme.Gallery.Dark" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="android:windowBackground">@color/gallery_background</item>
+    </style>
+
+    <style name="AppTheme.Gallery.Black" parent="AppTheme.Dark.NoActionBar">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+    </style>
+
+    <style name="AppTheme.Settings" parent="AppTheme">
+    </style>
+
+    <style name="AppTheme.Settings.Dark" parent="AppTheme.Dark">
+    </style>
+
+    <style name="AppTheme.Settings.Black" parent="AppTheme.Dark">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorAccent">@android:color/black</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
+    </style>
+
     <!-- ============ -->
     <!-- Widget Theme -->
     <!-- ============ -->