From bde2220d91774337fba60cfdcc4324005b878736 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 18 Apr 2020 11:34:43 +0800
Subject: Remove unused attributes. Fix loading images using GlideImageGetter
 after the activity is  destroyed.

---
 app/src/main/res/values/attr.xml   |  44 ------------
 app/src/main/res/values/styles.xml | 134 +------------------------------------
 2 files changed, 1 insertion(+), 177 deletions(-)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 57b4a09d..59df6280 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -32,53 +32,9 @@
         <attr name="colorPrimaryDark" format="color"/>
         <attr name="colorAccent" format="color"/>
         <attr name="colorPrimaryLightTheme" format="color"/>
-        <attr name="postTitleColor" format="color" />
-        <attr name="postContentColor" format="color" />
-        <attr name="commentColor" 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="toolbarPrimaryTextAndIconColor" 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="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="postType" 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/styles.xml b/app/src/main/res/values/styles.xml
index 6f490709..68f78baa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,7 +39,7 @@
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item>
+        <!--<item name="android:textColorPrimary">?attr/toolbarPrimaryTextAndIconColor</item>-->
     </style>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />
@@ -227,54 +227,10 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">@color/colorPrimary</item>
-        <item name="postTitleColor">#000000</item>
-        <item name="postContentColor">#8A000000</item>
-        <item name="commentColor">#000000</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="toolbarPrimaryTextAndIconColor">#FFFFFF</item>
-        <item name="toolbarAndTabBackgroundColor">@color/colorPrimary</item>
-        <item name="circularProgressBarBackground">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">@color/colorPrimary</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</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="postType">@color/colorPrimaryDark</item>
-        <item name="spoilerColor">#EE02EB</item>
-        <item name="nsfwColor">@color/colorAccent</item>
-        <item name="flairColor">#00AA8C</item>
-        <item name="archivedTint">#B4009F</item>
-        <item name="lockedIconTint">#EE7302</item>
-        <item name="crosspost">@color/colorAccent</item>
-        <item name="stickiedPost">@color/colorPrimaryDark</item>
-        <item name="subscribed">@color/colorAccent</item>
-        <item name="unsubscribed">@color/colorPrimaryDark</item>
-        <item name="username">@color/colorPrimaryDark</item>
-        <item name="subreddit">@color/colorAccent</item>
-        <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.Normal.NormalDark">
@@ -282,54 +238,10 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">#1565C0</item>
-        <item name="postTitleColor">#FFFFFF</item>
-        <item name="postContentColor">#B3FFFFFF</item>
-        <item name="commentColor">#FFFFFF</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">#242424</item>
-        <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item>
-        <item name="toolbarAndTabBackgroundColor">#282828</item>
-        <item name="circularProgressBarBackground">@color/colorPrimary</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</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="postType">#0D47A1</item>
-        <item name="spoilerColor">#EE02EB</item>
-        <item name="nsfwColor">@color/colorAccent</item>
-        <item name="flairColor">#00AA8C</item>
-        <item name="archivedTint">#B4009F</item>
-        <item name="lockedIconTint">#EE7302</item>
-        <item name="crosspost">@color/colorAccent</item>
-        <item name="stickiedPost">#1565C0</item>
-        <item name="subscribed">@color/colorAccent</item>
-        <item name="unsubscribed">#1565C0</item>
-        <item name="username">#0D47A1</item>
-        <item name="subreddit">@color/colorAccent</item>
-        <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.Normal.AmoledDark">
@@ -337,54 +249,10 @@
         <item name="colorPrimaryDark">#000000</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryLightTheme">#1565C0</item>
-        <item name="postTitleColor">#FFFFFF</item>
-        <item name="postContentColor">#B3FFFFFF</item>
-        <item name="commentColor">#FFFFFF</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>
-        <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item>
-        <item name="toolbarAndTabBackgroundColor">#000000</item>
-        <item name="circularProgressBarBackground">#000000</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">@color/backgroundColor</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</item>
-        <item name="tabLayoutWithExpandedCollapsingToolbarTabIndicator">#FFFFFF</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">#FFFFFF</item>
-        <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">#FFFFFF</item>
-        <item name="navBarColor">#000000</item>
-        <item name="upvoted">#E91E63</item>
-        <item name="downvoted">#007DDE</item>
-        <item name="postType">#0D47A1</item>
-        <item name="spoilerColor">#EE02EB</item>
-        <item name="nsfwColor">@color/colorAccent</item>
-        <item name="flairColor">#00AA8C</item>
-        <item name="archivedTint">#B4009F</item>
-        <item name="lockedIconTint">#EE7302</item>
-        <item name="crosspost">@color/colorAccent</item>
-        <item name="stickiedPost">#1565C0</item>
-        <item name="subscribed">@color/colorAccent</item>
-        <item name="unsubscribed">#1565C0</item>
-        <item name="username">#0D47A1</item>
-        <item name="subreddit">@color/colorAccent</item>
-        <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>
 
 </resources>
-- 
cgit v1.2.3