From 9bad5024ff2fe13d9fe366ed40a2ea8662620c18 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 21 Aug 2019 16:21:17 +0800
Subject: Fixed getting same notifications for different accounts (for real
 this time). Add a settings acivity but with no use now. Minor bugs fixed.
 Minor UI tweaks.

---
 app/src/main/res/values/arrays.xml  | 33 +++++++++++++++++++++++++++++++++
 app/src/main/res/values/strings.xml | 13 ++++++++++++-
 app/src/main/res/values/styles.xml  |  4 ++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values/arrays.xml

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

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..99955ed6
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,33 @@
+<resources>
+    <string-array name="settings_notification_interval">
+        <item>1 hour</item>
+        <item>2 hours</item>
+        <item>3 hours</item>
+        <item>4 hours</item>
+        <item>6 hours</item>
+        <item>12 hours</item>
+        <item>1 day</item>
+    </string-array>
+
+    <string-array name="settings_notification_interval_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>6</item>
+        <item>12</item>
+        <item>24</item>
+    </string-array>
+
+    <string-array name="settings_theme">
+        <item>Light Theme</item>
+        <item>Dark Theme</item>
+        <item>Device Default</item>
+    </string-array>
+
+    <string-array name="settings_theme_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a245f76..dba73658 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,8 @@
     <string name="search_subreddits_activity_label">Subreddits</string>
     <string name="edit_post_activity_label">Edit Post</string>
     <string name="edit_comment_activity_label">Edit Comment</string>
-    <string name="view_message_activity">Inbox</string>
+    <string name="view_message_activity_label">Inbox</string>
+    <string name="settings_activity_label">Settings</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
@@ -239,4 +240,14 @@
     <string name="label_post">Post</string>
 
     <string name="account_switched">Account Switched. So all other pages are gone.</string>
+
+    <string name="settings_account_master_title">Account</string>
+    <string name="settings_notification_master_title">Notification</string>
+    <string name="settings_notification_enable_notification_title">Enable Notifications</string>
+    <string name="settings_notification_interval_title">Check Notifications Interval</string>
+    <string name="settings_theme_title">Theme</string>
+    <string name="settings_theme_light__theme_summary">Light Theme</string>
+    <string name="settings_theme_dark_theme_summary">Dark Theme</string>
+    <string name="settings_theme_system_default_summary">Device default</string>
+    <string name="settings_enable_nsfw_title">Enable NSFW</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0b20ce0e..2b97cc0d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,4 +60,8 @@
         <item name="android:textColor">@color/primaryTextColor</item>
     </style>
 
+    <style name="PreferenceActivityTheme" parent="AppTheme.NoActionBar">
+        <item name="android:textColorPrimary">@color/primaryTextColor</item>
+    </style>
+
 </resources>
-- 
cgit v1.2.3