Still prepare to add different themes.

4 files changed, 156 insertions, 45 deletions

diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 9f35b9be..03dfb30f 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -4,7 +4,7 @@
 
     <declare-styleable name="FontStyle">
         <attr name="font_default" format="dimension"/>
-        <attr name="font_10" format="dimension" />
+        <attr name="font_10" format="dimension"/>
         <attr name="font_12" format="dimension"/>
         <attr name="font_16" format="dimension"/>
         <attr name="font_18" format="dimension"/>
@@ -30,36 +30,51 @@
     <declare-styleable name="Theme">
         <attr name="colorPrimary" format="color"/>
         <attr name="colorPrimaryDark" format="color"/>
-        <attr name="colorAccent" format="color" />
-        <attr name="colorPrimaryLightTheme" format="color" />
+        <attr name="colorAccent" format="color"/>
+        <attr name="colorPrimaryLightTheme" format="color"/>
+        <attr name="primaryTextColor" format="color"/>
+        <attr name="secondaryTextColor" 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="tabLayoutWithExpandedCollapsingToolbarTextColor" format="color" />
-        <attr name="tabLayoutWithExpandedCollapsingToolbarTabIndicator" format="color" />
+        <attr name="tabLayoutWithExpandedCollapsingToolbarTextColor" format="color"/>
+        <attr name="tabLayoutWithExpandedCollapsingToolbarTabIndicator" format="color"/>
         <attr name="tabLayoutWithCollapsedCollapsingToolbarTabBackground" format="color"/>
-        <attr name="tabLayoutWithCollapsedCollapsingToolbarTextColor" format="color" />
-        <attr name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator" format="color" />
-        <attr name="navBarColor" format="color" />
-        <attr name="upvoted" format="color" />
-        <attr name="downvoted" format="color" />
-        <attr name="post_type" format="color" />
-        <attr name="spoilerColor" format="color" />
-        <attr name="nsfwColor" format="color" />
-        <attr name="flairColor" format="color" />
-        <attr name="archivedTint" format="color" />
-        <attr name="lockedIconTint" format="color" />
-        <attr name="crosspost" format="color" />
-        <attr name="stickiedPost" format="color" />
-        <attr name="subscribed" format="color" />
-        <attr name="unsubscribed" format="color" />
-        <attr name="username" format="color" />
-        <attr name="subreddit" format="color" />
-        <attr name="authorFlairTextColor" format="color" />
-        <attr name="submitter" format="color" />
-        <attr name="moderator" format="color" />
+        <attr name="tabLayoutWithCollapsedCollapsingToolbarTextColor" format="color"/>
+        <attr name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator" format="color"/>
+        <attr name="navBarColor" format="color"/>
+        <attr name="upvoted" format="color"/>
+        <attr name="downvoted" format="color"/>
+        <attr name="post_type" format="color"/>
+        <attr name="spoilerColor" format="color"/>
+        <attr name="nsfwColor" format="color"/>
+        <attr name="flairColor" format="color"/>
+        <attr name="archivedTint" format="color"/>
+        <attr name="lockedIconTint" format="color"/>
+        <attr name="crosspost" format="color"/>
+        <attr name="stickiedPost" format="color"/>
+        <attr name="subscribed" format="color"/>
+        <attr name="unsubscribed" format="color"/>
+        <attr name="username" format="color"/>
+        <attr name="subreddit" format="color"/>
+        <attr name="authorFlairTextColor" format="color"/>
+        <attr name="submitter" format="color"/>
+        <attr name="moderator" format="color"/>
+        <attr name="notificationIconColor" format="color"/>
+        <attr name="singleCommentThreadBackgroundColor" format="color"/>
+        <attr name="unreadMessageBackgroundColor" format="color"/>
+        <attr name="dividerColor" format="color"/>
+        <attr name="noPreviewLinkBackgroundColor" format="color"/>
+        <attr name="voteAndReplyUnavailableVoteButtonColor" format="color"/>
+        <attr name="commentVerticalBarColor1" format="color"/>
+        <attr name="commentVerticalBarColor2" format="color"/>
+        <attr name="commentVerticalBarColor3" format="color"/>
+        <attr name="commentVerticalBarColor4" format="color"/>
+        <attr name="commentVerticalBarColor5" format="color"/>
+        <attr name="commentVerticalBarColor6" format="color"/>
+        <attr name="commentVerticalBarColor7" 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 c7880cd7..f5e397c5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,13 +8,13 @@
     
     <color name="gold">#FFC107</color>
 
-    <color name="primaryTextColor">#000000</color>
+    <!--<color name="primaryTextColor">#000000</color>-->
 
     <!--<color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>-->
 
-    <color name="dividerColor">#E0E0E0</color>
+    <!--<color name="dividerColor">#E0E0E0</color>-->
 
-    <color name="grey">#E0E0E0</color>
+    <!--<color name="grey">#E0E0E0</color>-->
 
     <color name="backgroundColor">#FFFFFF</color>
 
@@ -22,17 +22,17 @@
 
     <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>-->
 
-    <color name="backgroundColorInverse">#000000</color>
+    <color name="playButtonBackgroundColor">#000000</color>
 
     <color name="roundedBottomSheetPrimaryBackground">#FFFFFF</color>
 
-    <color name="roundedBottomSheetPrimaryNavigationBarColor">@android:color/black</color>
+    <color name="roundedBottomSheetPrimaryNavigationBarColor">#000000</color>
 
     <!--<color name="upvoted">#E91E63</color>
 
     <color name="downvoted">#007DDE</color>-->
 
-    <color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>
+    <!--<color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>-->
 
     <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
 
@@ -46,29 +46,29 @@
 
     <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
 
-    <color name="navBarColor">#FFFFFF</color>
+    <!--<color name="navBarColor">#FFFFFF</color>-->
 
-    <color name="cardViewBackgroundColor">#FFFFFF</color>
+    <!--<color name="cardViewBackgroundColor">#FFFFFF</color>-->
 
-    <color name="singleCommentThreadBackgroundColor">#B3E5F9</color>
+    <!--<color name="singleCommentThreadBackgroundColor">#B3E5F9</color>-->
 
-    <color name="unreadMessageBackgroundColor">#B3E5F9</color>
+    <!--<color name="unreadMessageBackgroundColor">#B3E5F9</color>-->
 
     <!--<color name="archivedTint">#B4009F</color>
 
     <color name="lockedIconTint">#EE7302</color>-->
 
-    <color name="notificationIconColor">@color/colorPrimary</color>
+    <!--<color name="notificationIconColor">@color/colorPrimary</color>-->
 
-    <color name="defaultTextColor">#8A000000</color>
+    <!--<color name="defaultTextColor">#8A000000</color>-->
 
-    <color name="commentVerticalBar1">#1565C0</color>
+    <!--<color name="commentVerticalBar1">#1565C0</color>
     <color name="commentVerticalBar2">#EE02BE</color>
     <color name="commentVerticalBar3">#02DFEE</color>
     <color name="commentVerticalBar4">#EED502</color>
     <color name="commentVerticalBar5">#EE0220</color>
     <color name="commentVerticalBar6">#02EE6E</color>
-    <color name="commentVerticalBar7">#EE4602</color>
+    <color name="commentVerticalBar7">#EE4602</color>-->
 
     <!--<color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f9292a8..ccb251e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,7 +308,7 @@
     <string name="settings_mute_video_title">Mute Video</string>
     <string name="settings_confirm_to_exit">Confirm to Exit</string>
     <string name="settings_show_top_level_comments_first_title">Show Top-level Comments First</string>
-    <string name="settings_show_comment_divider_title">Show comment divider</string>
+    <string name="settings_show_comment_divider_title">Show Comment Divider</string>
     <string name="settings_show_absolute_number_of_votes_title">Show Absolute Number of Votes</string>
     <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string>
     <string name="settings_default_post_layout">Default Post Layout</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 79085b9b..61c2bdea 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -69,7 +69,7 @@
     </style>
 
     <style name="MaterialAlertDialogNegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/primaryTextColor</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
     </style>
 
     <style name="MaterialAlertDialogTitleTextStyle" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
@@ -83,7 +83,7 @@
     <style name="PreferenceActivityTheme" parent="AppTheme.NoActionBar">
         <item name="android:textAppearanceListItem">@style/PreferenceTitleTextStyle</item>
         <item name="android:textAppearanceListItemSecondary">@style/PreferenceSubtitleTextStyle</item>
-        <item name="android:textColorPrimary">@color/primaryTextColor</item>
+        <item name="android:textColorPrimary">?attr/primaryTextColor</item>
         <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item>
         <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item>
         <item name="alertDialogTheme">@style/ListPreferenceStyle</item>
@@ -91,7 +91,7 @@
 
     <style name="PreferenceTitleTextStyle">
         <item name="android:textSize">?attr/font_16</item>
-        <item name="android:textColor">@color/primaryTextColor</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
     </style>
 
     <style name="PreferenceSubtitleTextStyle">
@@ -262,9 +262,11 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">@color/colorPrimary</item>
+        <item name="primaryTextColor">#000000</item>
+        <item name="secondaryTextColor">#8A000000</item>
         <item name="backgroundColor">@color/backgroundColor</item>
         <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
-        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="cardViewBackgroundColor">#FFFFFF</item>
         <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item>
         <item name="circularProgressBarBackground">#FFFFFF</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
@@ -291,6 +293,19 @@
         <item name="authorFlairTextColor">#EE02C4</item>
         <item name="submitter">#EE8A02</item>
         <item name="moderator">#00BA81</item>
+        <item name="notificationIconColor">@color/colorPrimary</item>
+        <item name="singleCommentThreadBackgroundColor">#B3E5F9</item>
+        <item name="unreadMessageBackgroundColor">#B3E5F9</item>
+        <item name="dividerColor">#E0E0E0</item>
+        <item name="noPreviewLinkBackgroundColor">#E0E0E0</item>
+        <item name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</item>
+        <item name="commentVerticalBarColor1">#1565C0</item>
+        <item name="commentVerticalBarColor2">#EE02BE</item>
+        <item name="commentVerticalBarColor3">#02DFEE</item>
+        <item name="commentVerticalBarColor4">#EED502</item>
+        <item name="commentVerticalBarColor5">#EE0220</item>
+        <item name="commentVerticalBarColor6">#02EE6E</item>
+        <item name="commentVerticalBarColor7">#EE4602</item>
     </style>
 
     <style name="Theme.Default.NormalDark">
@@ -298,9 +313,11 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">#1565C0</item>
+        <item name="primaryTextColor">#FFFFFF</item>
+        <item name="secondaryTextColor">#B3FFFFFF</item>
         <item name="backgroundColor">@color/backgroundColor</item>
         <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
-        <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</item>
+        <item name="cardViewBackgroundColor">#242424</item>
         <item name="toolbarAndTabBackgroundColor">#282828</item>
         <item name="circularProgressBarBackground">@color/colorPrimary</item>
         <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
@@ -327,6 +344,19 @@
         <item name="authorFlairTextColor">#EE02C4</item>
         <item name="submitter">#EE8A02</item>
         <item name="moderator">#00BA81</item>
+        <item name="notificationIconColor">#1565C0</item>
+        <item name="singleCommentThreadBackgroundColor">#123E77</item>
+        <item name="unreadMessageBackgroundColor">#123E77</item>
+        <item name="dividerColor">#69666C</item>
+        <item name="noPreviewLinkBackgroundColor">#424242</item>
+        <item name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</item>
+        <item name="commentVerticalBarColor1">#1565C0</item>
+        <item name="commentVerticalBarColor2">#C300B3</item>
+        <item name="commentVerticalBarColor3">#00B8DA</item>
+        <item name="commentVerticalBarColor4">#EDCA00</item>
+        <item name="commentVerticalBarColor5">#EE0219</item>
+        <item name="commentVerticalBarColor6">#00B925</item>
+        <item name="commentVerticalBarColor7">#EE4602</item>
     </style>
 
     <style name="Theme.Default.AmoledDark">
@@ -334,6 +364,8 @@
         <item name="colorPrimaryDark">#000000</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">#1565C0</item>
+        <item name="primaryTextColor">#FFFFFF</item>
+        <item name="secondaryTextColor">#B3FFFFFF</item>
         <item name="backgroundColor">#000000</item>
         <item name="roundedBottomSheetPrimaryBackground">#000000</item>
         <item name="cardViewBackgroundColor">#000000</item>
@@ -363,6 +395,70 @@
         <item name="authorFlairTextColor">#EE02C4</item>
         <item name="submitter">#EE8A02</item>
         <item name="moderator">#00BA81</item>
+        <item name="notificationIconColor">#1565C0</item>
+        <item name="singleCommentThreadBackgroundColor">#123E77</item>
+        <item name="unreadMessageBackgroundColor">#123E77</item>
+        <item name="dividerColor">#69666C</item>
+        <item name="noPreviewLinkBackgroundColor">#424242</item>
+        <item name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</item>
+        <item name="commentVerticalBarColor1">#1565C0</item>
+        <item name="commentVerticalBarColor2">#C300B3</item>
+        <item name="commentVerticalBarColor3">#00B8DA</item>
+        <item name="commentVerticalBarColor4">#EDCA00</item>
+        <item name="commentVerticalBarColor5">#EE0219</item>
+        <item name="commentVerticalBarColor6">#00B925</item>
+        <item name="commentVerticalBarColor7">#EE4602</item>
+    </style>
+
+    <style name="Theme.Purple">
+        <item name="colorPrimary">#9C27B0</item>
+        <item name="colorPrimaryDark">#7B1FA2</item>
+        <item name="colorAccent">#03A9F4</item>
+        <item name="colorPrimaryLightTheme">#9C27B0</item>
+        <item name="primaryTextColor">#000000</item>
+        <item name="secondaryTextColor">#8A000000</item>
+        <item name="backgroundColor">@color/backgroundColor</item>
+        <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+        <item name="cardViewBackgroundColor">#FFFFFF</item>
+        <item name="toolbarAndTabBackgroundColor">#9C27B0</item>
+        <item name="circularProgressBarBackground">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#9C27B0</item>
+        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#9C27B0</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#9C27B0</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
+        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
+        <item name="navBarColor">@color/backgroundColor</item>
+        <item name="upvoted">#E91E63</item>
+        <item name="downvoted">#007DDE</item>
+        <item name="post_type">#7B1FA2</item>
+        <item name="spoilerColor">#EE02EB</item>
+        <item name="nsfwColor">#03A9F4</item>
+        <item name="flairColor">#00AA8C</item>
+        <item name="archivedTint">#B4009F</item>
+        <item name="lockedIconTint">#EE7302</item>
+        <item name="crosspost">#03A9F4</item>
+        <item name="stickiedPost">#7B1FA2</item>
+        <item name="subscribed">#03A9F4</item>
+        <item name="unsubscribed">#7B1FA2</item>
+        <item name="username">#7B1FA2</item>
+        <item name="subreddit">#03A9F4</item>
+        <item name="authorFlairTextColor">#EE02C4</item>
+        <item name="submitter">#EE8A02</item>
+        <item name="moderator">#00BA81</item>
+        <item name="notificationIconColor">#9C27B0</item>
+        <item name="singleCommentThreadBackgroundColor">#B3E5F9</item>
+        <item name="unreadMessageBackgroundColor">#B3E5F9</item>
+        <item name="dividerColor">#E0E0E0</item>
+        <item name="noPreviewLinkBackgroundColor">#E0E0E0</item>
+        <item name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</item>
+        <item name="commentVerticalBarColor1">#1565C0</item>
+        <item name="commentVerticalBarColor2">#EE02BE</item>
+        <item name="commentVerticalBarColor3">#02DFEE</item>
+        <item name="commentVerticalBarColor4">#EED502</item>
+        <item name="commentVerticalBarColor5">#EE0220</item>
+        <item name="commentVerticalBarColor6">#02EE6E</item>
+        <item name="commentVerticalBarColor7">#EE4602</item>
     </style>
 
 </resources>