aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/attr.xml23
-rw-r--r--app/src/main/res/values/colors.xml22
-rw-r--r--app/src/main/res/values/styles.xml110
3 files changed, 143 insertions, 12 deletions
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 37fc5341..9f35b9be 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -30,13 +30,36 @@
<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="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="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" />
</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 43811d56..c7880cd7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,7 +10,7 @@
<color name="primaryTextColor">#000000</color>
- <color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>
+ <!--<color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color>-->
<color name="dividerColor">#E0E0E0</color>
@@ -18,9 +18,9 @@
<color name="backgroundColor">#FFFFFF</color>
- <color name="backgroundColorPrimary">@color/colorPrimary</color>
+ <!--<color name="backgroundColorPrimary">@color/colorPrimary</color>
- <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>
+ <color name="backgroundColorPrimaryDark">@color/colorPrimaryDark</color>-->
<color name="backgroundColorInverse">#000000</color>
@@ -28,13 +28,13 @@
<color name="roundedBottomSheetPrimaryNavigationBarColor">@android:color/black</color>
- <color name="upvoted">#E91E63</color>
+ <!--<color name="upvoted">#E91E63</color>
- <color name="downvoted">#007DDE</color>
+ <color name="downvoted">#007DDE</color>-->
<color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>
- <color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
+ <!--<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
<color name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</color>
@@ -44,7 +44,7 @@
<color name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">@color/colorPrimary</color>
- <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>
+ <color name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">@color/tabLayoutWithCollapsedCollapsingToolbarTextColor</color>-->
<color name="navBarColor">#FFFFFF</color>
@@ -54,9 +54,9 @@
<color name="unreadMessageBackgroundColor">#B3E5F9</color>
- <color name="archivedTint">#B4009F</color>
+ <!--<color name="archivedTint">#B4009F</color>
- <color name="lockedIconTint">#EE7302</color>
+ <color name="lockedIconTint">#EE7302</color>-->
<color name="notificationIconColor">@color/colorPrimary</color>
@@ -70,7 +70,7 @@
<color name="commentVerticalBar6">#02EE6E</color>
<color name="commentVerticalBar7">#EE4602</color>
- <color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
+ <!--<color name="toolbarAndTabBackgroundColor">@color/colorPrimary</color>
<color name="submitter">#EE8A02</color>
@@ -84,5 +84,5 @@
<color name="usernameColor">#0D47A1</color>
- <color name="subredditNameColor">#FF4081</color>
+ <color name="subredditNameColor">#FF4081</color>-->
</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b91ecdb1..79085b9b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,7 +218,7 @@
<style name="Theme" />
- <style name="Theme.Default">
+ <!--<style name="Theme.Default">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="backgroundColor">@color/backgroundColor</item>
@@ -255,6 +255,114 @@
<item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#000000</item>
<item name="tabLayoutWithCollapsedCollapsingToolbarTabBackground">#000000</item>
<item name="navBarColor">#000000</item>
+ </style>-->
+
+ <style name="Theme.Default">
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ <item name="colorPrimaryLightTheme">@color/colorPrimary</item>
+ <item name="backgroundColor">@color/backgroundColor</item>
+ <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+ <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</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="post_type">@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>
+ </style>
+
+ <style name="Theme.Default.NormalDark">
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ <item name="colorPrimaryLightTheme">#1565C0</item>
+ <item name="backgroundColor">@color/backgroundColor</item>
+ <item name="roundedBottomSheetPrimaryBackground">@color/roundedBottomSheetPrimaryBackground</item>
+ <item name="cardViewBackgroundColor">@color/cardViewBackgroundColor</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="post_type">#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>
+ </style>
+
+ <style name="Theme.Default.AmoledDark">
+ <item name="colorPrimary">#000000</item>
+ <item name="colorPrimaryDark">#000000</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ <item name="colorPrimaryLightTheme">#1565C0</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">@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="post_type">#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>
</style>
</resources>