aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-08-22 06:44:10 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-08-22 06:44:10 +0000
commit5f7bfd88b7b525a503065842140a71c491c201fc (patch)
tree18d4c1f878a5102a171bd8599337ed4327212b31 /app/src/main/res/values
parent0840b7144f9a2bf0b1338c04da686b9ef6e4e4ae (diff)
downloadinfinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar.gz
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar.bz2
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar.lz
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar.xz
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.tar.zst
infinity-for-reddit-5f7bfd88b7b525a503065842140a71c491c201fc.zip
Check for theme setting on every activities except ViewImageActivity and ViewVideoActivity to correctly set the theme. Minor bugs fixed. Minor UI tweaks.
Diffstat (limited to '')
-rw-r--r--app/src/main/res/values-night/colors.xml2
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/strings.xml4
-rw-r--r--app/src/main/res/values/styles.xml2
4 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ddb63e21..758b8537 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -28,7 +28,7 @@
<color name="roundedBottomSheetPrimaryNavigationBarColor">@color/roundedBottomSheetPrimaryBackground</color>
- <color name="voteUnavailableVoteButtonColor">#3C3C3C</color>
+ <color name="voteAndReplyUnavailableVoteButtonColor">#3C3C3C</color>
<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">#FFFFFF</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ef901a9e..b4c1fd87 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,7 +28,7 @@
<color name="roundedBottomSheetPrimaryNavigationBarColor">@color/roundedBottomSheetPrimaryBackground</color>
- <color name="voteUnavailableVoteButtonColor">#F0F0F0</color>
+ <color name="voteAndReplyUnavailableVoteButtonColor">#F0F0F0</color>
<color name="tabLayoutWithExpandedCollapsingToolbarTextColor">@color/colorPrimary</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad1b9b7d..a5a170d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,6 +182,10 @@
<string name="no_browser_found">No browser found</string>
<string name="archived_post_vote_unavailable">Archived post. Vote unavailable.</string>
+ <string name="archived_post_comment_unavailable">Archived post. Comment unavailable.</string>
+ <string name="archived_post_reply_unavailable">Archived post. Reply unavailable.</string>
+ <string name="locked_post_comment_unavailable">Locked post. Comment unavailable.</string>
+ <string name="locked_post_reply_unavailable">Locked post. Reply unavailable.</string>
<string name="text">TEXT</string>
<string name="link">LINK</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2b97cc0d..03c4361a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -62,6 +62,8 @@
<style name="PreferenceActivityTheme" parent="AppTheme.NoActionBar">
<item name="android:textColorPrimary">@color/primaryTextColor</item>
+ <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item>
+ <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item>
</style>
</resources>