diff options
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/attr.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 33 |
3 files changed, 21 insertions, 19 deletions
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index 5d6dc3c1..9906b99f 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -37,7 +37,7 @@ <attr name="backgroundColor" format="color"/> <attr name="roundedBottomSheetPrimaryBackground" format="color"/> <attr name="cardViewBackgroundColor" format="color"/> - <attr name="toolbarPrimaryTextAndIconColor" format="color" /> + <attr name="toolbarPrimaryTextAndIconColor" format="color"/> <attr name="toolbarAndTabBackgroundColor" format="color"/> <attr name="circularProgressBarBackground" format="color"/> <attr name="tabLayoutWithExpandedCollapsingToolbarTabBackground" format="color"/> @@ -49,7 +49,7 @@ <attr name="navBarColor" format="color"/> <attr name="upvoted" format="color"/> <attr name="downvoted" format="color"/> - <attr name="post_type" format="color"/> + <attr name="postType" format="color"/> <attr name="spoilerColor" format="color"/> <attr name="nsfwColor" format="color"/> <attr name="flairColor" format="color"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41b3dde0..eb88ae16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,7 +56,8 @@ <string name="access_denied">Access denied</string> <string name="parse_user_info_error">Error occurred when parsing the user info</string> - <string name="tap_to_retry">Error loading image. Tap to retry.</string> + <string name="error_loading_image_tap_to_retry">Error loading the image. Tap to retry.</string> + <string name="error_loading_gif_tap_to_retry">Error loading the gif. Tap to retry.</string> <string name="load_posts_error">Error loading posts.\nTap to retry.</string> <string name="load_more_posts_error">Error loading posts.</string> <string name="load_post_error">Error loading this post.\nTap to retry.</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2ae6c7cf..8f7256a5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -244,7 +244,7 @@ <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="postType">@color/colorPrimaryDark</item> <item name="spoilerColor">#EE02EB</item> <item name="nsfwColor">@color/colorAccent</item> <item name="flairColor">#00AA8C</item> @@ -296,7 +296,7 @@ <item name="navBarColor">@color/backgroundColor</item> <item name="upvoted">#E91E63</item> <item name="downvoted">#007DDE</item> - <item name="post_type">#0D47A1</item> + <item name="postType">#0D47A1</item> <item name="spoilerColor">#EE02EB</item> <item name="nsfwColor">@color/colorAccent</item> <item name="flairColor">#00AA8C</item> @@ -348,7 +348,7 @@ <item name="navBarColor">#000000</item> <item name="upvoted">#E91E63</item> <item name="downvoted">#007DDE</item> - <item name="post_type">#0D47A1</item> + <item name="postType">#0D47A1</item> <item name="spoilerColor">#EE02EB</item> <item name="nsfwColor">@color/colorAccent</item> <item name="flairColor">#00AA8C</item> @@ -379,16 +379,17 @@ </style> <style name="Theme.Purple"> - <item name="colorPrimary">#00C3E9</item> - <item name="colorPrimaryDark">#009EBA</item> - <item name="colorAccent">#EE2502</item> + <item name="colorPrimary">#6002EE</item> + <item name="colorPrimaryDark">#3D00E0</item> + <item name="colorAccent">#0098DD</item> <item name="colorPrimaryLightTheme">?attr/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">#FFFFFF</item> - <item name="toolbarPrimaryTextAndIconColor">#FF3C4043</item> + <!--<item name="toolbarPrimaryTextAndIconColor">#FF3C4043</item>--> + <item name="toolbarPrimaryTextAndIconColor">#FFFFFF</item> <item name="toolbarAndTabBackgroundColor">?attr/colorPrimary</item> <item name="circularProgressBarBackground">#FFFFFF</item> <item name="tabLayoutWithExpandedCollapsingToolbarTabBackground">#FFFFFF</item> @@ -398,23 +399,23 @@ <item name="tabLayoutWithCollapsedCollapsingToolbarTextColor">?attr/toolbarPrimaryTextAndIconColor</item> <item name="tabLayoutWithCollapsedCollapsingToolbarTabIndicator">?attr/toolbarPrimaryTextAndIconColor</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="upvoted">#FC2727</item> + <item name="downvoted">#276BFC</item> + <item name="postType">#6002EE</item> <item name="spoilerColor">#EE02EB</item> - <item name="nsfwColor">#03A9F4</item> - <item name="flairColor">#00AA8C</item> + <item name="nsfwColor">#FC27A1</item> + <item name="flairColor">#00D039</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="username">#FB9E25</item> + <item name="subreddit">#4D27FC</item> <item name="authorFlairTextColor">#EE02C4</item> - <item name="submitter">#EE8A02</item> - <item name="moderator">#00BA81</item> + <item name="submitter">#EE8002</item> + <item name="moderator">#02EEDD</item> <item name="notificationIconColor">?attr/colorPrimary</item> <item name="singleCommentThreadBackgroundColor">#B3E5F9</item> <item name="unreadMessageBackgroundColor">#B3E5F9</item> |