AMOLED dark theme is now available.

5 files changed, 66 insertions, 9 deletions

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 2049c23c..a6e767f1 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,15 +5,13 @@
     <color name="colorAccent">#FF4081</color>
 
     <color name="transparentActionBarAndExoPlayerControllerColor">#88000000</color>
-    
+
     <color name="gold">#FFC107</color>
 
     <color name="primaryTextColor">#FFFFFF</color>
 
     <color name="colorPrimaryDarkDayNightTheme">#1E88E5</color>
 
-    <color name="circularProgressBarBackground">#242424</color>
-
     <color name="dividerColor">#69666C</color>
 
     <color name="grey">#424242</color>
@@ -62,5 +60,5 @@
     <color name="commentVerticalBar6">#00B925</color>
     <color name="commentVerticalBar7">#EE4602</color>
 
-    <color name="greyTabBackgroundColor">#282828</color>
+    <color name="toolbarAndTabBackgroundColor">#282828</color>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 201074bd..bd522e6e 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -25,4 +25,17 @@
         <attr name="content_font_18" format="dimension"/>
         <attr name="content_font_20" format="dimension"/>
     </declare-styleable>
+
+    <declare-styleable name="Theme">
+        <attr name="colorPrimary" format="color"/>
+        <attr name="colorPrimaryDark" format="color"/>
+        <attr name="backgroundColor" format="color"/>
+        <attr name="roundedBottomSheetPrimaryBackground" format="color"/>
+        <attr name="cardViewBackgroundColor" format="color"/>
+        <attr name="toolbarAndTabBackgroundColor" format="color"/>
+        <attr name="circularProgressBarBackground" format="color"/>
+        <attr name="tabLayoutWithExpandedCollapsingToolbarTabBackground" format="color"/>
+        <attr name="tabLayoutWithCollapsedCollapsingToolbarTabBackground" format="color"/>
+        <attr name="navBarColor" format="color" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 811089f3..2f6087dd 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,8 +12,6 @@
 
     <color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>
 
-    <color name="circularProgressBarBackground">#FFFFFF</color>
-
     <color name="dividerColor">#E0E0E0</color>
 
     <color name="grey">#E0E0E0</color>
@@ -70,7 +68,7 @@
     <color name="commentVerticalBar6">#02EE6E</color>
     <color name="commentVerticalBar7">#EE4602</color>
 
-    <color name="greyTabBackgroundColor">@color/colorPrimary</color>
+    <color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
 
     <color name="submitter">#EE8A02</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c898353c..236b1c4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -273,6 +273,7 @@
     <string name="settings_theme_light__theme_summary">Light Theme</string>
     <string name="settings_theme_dark_theme_summary">Dark Theme</string>
     <string name="settings_theme_system_default_summary">Device default</string>
+    <string name="settings_amoled_dark_title">Amoled Dark</string>
     <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
     <string name="settings_font_size_title">Font Size</string>
     <string name="settings_title_font_size_title">Title Font Size</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2b6e10bb..698057fd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,8 +3,8 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimary">?attr/colorPrimary</item>
+        <item name="colorPrimaryDark">?attr/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:textColorPrimary">@android:color/white</item>
@@ -46,6 +46,7 @@
     
     <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="android:textSize">?attr/font_default</item>
+        <item name="android:background">?attr/cardViewBackgroundColor</item>
         <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitleTextStyle</item>
         <item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialogBodyTextStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item>
@@ -74,6 +75,7 @@
         <item name="android:textColorPrimary">@color/primaryTextColor</item>
         <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item>
         <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item>
+        <item name="alertDialogTheme">@style/ListPreferenceStyle</item>
     </style>
 
     <style name="PreferenceTitleTextStyle">
@@ -85,6 +87,10 @@
         <item name="android:textSize">?attr/font_default</item>
     </style>
 
+    <style name="ListPreferenceStyle" parent="ThemeOverlay.AppCompat.Dialog.Alert">
+        <item name="android:background">?attr/cardViewBackgroundColor</item>
+    </style>
+
     <style name="FontStyle" />
 
     <style name="FontStyle.Small">
@@ -195,4 +201,45 @@
         <item name="content_font_20">26sp</item>
     </style>
 
+    <style name="Theme" />
+
+    <style name="Theme.Default">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="backgroundColor">@color/backgroundColor</item>
+        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="toolbarAndTabBackgroundColor">@color/toolbarAndTabBackgroundColor</item>
+        <item name="circularProgressBarBackground">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
+        <item name="navBarColor">@color/backgroundColor</item>
+    </style>
+
+    <style name="Theme.Default.NormalDark">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="backgroundColor">@color/backgroundColor</item>
+        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="toolbarAndTabBackgroundColor">@color/toolbarAndTabBackgroundColor</item>
+        <item name="circularProgressBarBackground">@color/colorPrimary</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
+        <item name="navBarColor">@color/backgroundColor</item>
+    </style>
+
+    <style name="Theme.Default.AmoledDark">
+        <item name="colorPrimary">#000000</item>
+        <item name="colorPrimaryDark">#000000</item>
+        <item name="backgroundColor">#000000</item>
+        <item name="roundedBottomSheetPrimaryBackground">#000000</item>
+        <item name="cardViewBackgroundColor">#000000</item>
+        <item name="toolbarAndTabBackgroundColor">#000000</item>
+        <item name="circularProgressBarBackground">#000000</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#000000</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#000000</item>
+        <item name="navBarColor">#000000</item>
+    </style>
+
 </resources>