From 4b8bbcf5f2d0423e4bf25505419b67f8e660940b Mon Sep 17 00:00:00 2001
From: Phillip Hsu <philliphsu@outlook.com>
Date: Mon, 6 Jun 2016 21:24:44 -0700
Subject: [PATCH] Moved preference strings from strings.xml to their own
 category file

---
 .../clock2/settings/SettingsActivity.java     | 12 -----
 .../clock2/settings/SettingsFragment.java     |  3 +-
 .../values/{prefs.xml => prefs_alarms.xml}    | 28 +++++++++-
 app/src/main/res/values/prefs_timers.xml      |  7 +++
 app/src/main/res/values/prefs_world_clock.xml | 13 +++++
 app/src/main/res/values/strings.xml           | 33 ------------
 app/src/main/res/xml/preferences.xml          | 52 +++++++++----------
 7 files changed, 74 insertions(+), 74 deletions(-)
 rename app/src/main/res/values/{prefs.xml => prefs_alarms.xml} (60%)
 create mode 100644 app/src/main/res/values/prefs_timers.xml
 create mode 100644 app/src/main/res/values/prefs_world_clock.xml

diff --git a/app/src/main/java/com/philliphsu/clock2/settings/SettingsActivity.java b/app/src/main/java/com/philliphsu/clock2/settings/SettingsActivity.java
index 5ffbc33..2bd31ac 100644
--- a/app/src/main/java/com/philliphsu/clock2/settings/SettingsActivity.java
+++ b/app/src/main/java/com/philliphsu/clock2/settings/SettingsActivity.java
@@ -9,18 +9,6 @@ import com.philliphsu.clock2.R;
  * Created by Phillip Hsu on 6/6/2016.
  */
 public class SettingsActivity extends BaseActivity {
-    /*
-     * TODO: Define these keys as string resources instead and then delete these.
-     * TODO: Move the existing string resources for the preferences below from strings.xml to prefs.xml
-     */
-    // World Clock preference keys
-    public static final String KEY_PREF_SHOW_TIME_OFFSETS_FROM = "pref_show_time_offsets_from";
-    // Alarms preference keys
-    public static final String KEY_PREF_TIME_PICKER_STYLE = "pref_time_picker_style";
-    public static final String KEY_PREF_SNOOZE_DURATION = "pref_snooze_duration";
-    public static final String KEY_PREF_FIRST_DAY_OF_WEEK = "pref_first_day_of_week";
-    // Timers preference keys
-    public static final String KEY_PREF_TIMER_RINGTONE = "pref_timer_ringtone";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java b/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
index 4b51af9..1e6eb1a 100644
--- a/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
@@ -23,8 +23,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
         // Set ringtone summary
-        setSummary(getPreferenceScreen().getSharedPreferences(),
-                SettingsActivity.KEY_PREF_TIMER_RINGTONE);
+        setSummary(getPreferenceScreen().getSharedPreferences(), getString(R.string.key_timer_ringtone));
         findPreference(getString(R.string.key_alarm_volume))
                 .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
diff --git a/app/src/main/res/values/prefs.xml b/app/src/main/res/values/prefs_alarms.xml
similarity index 60%
rename from app/src/main/res/values/prefs.xml
rename to app/src/main/res/values/prefs_alarms.xml
index a7e31de..b91e93f 100644
--- a/app/src/main/res/values/prefs.xml
+++ b/app/src/main/res/values/prefs_alarms.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="title_category_alarms">Alarms</string>
+
+    <!-- Time picker style -->
+    <string name="key_time_picker_style">key_time_picker_style</string>
+    <string name="title_time_picker_style">Time picker style</string>
+    <string name="number_pad">Number pad</string>
+    <string name="radial_clock">Radial clock</string>
+    <string-array name="array_time_picker_styles">
+        <item>@string/number_pad</item>
+        <item>@string/radial_clock</item>
+    </string-array>
+
     <!-- Silence after -->
     <string name="key_silence_after">key_silence_after</string>
     <string name="title_silence_after">Silence after</string>
-
+    <!-- Snooze duration -->
+    <string name="key_snooze_duration">key_snooze_duration</string>
+    <string name="title_snooze_duration">Snooze duration</string>
     <!-- Durations for silence after & snooze duration -->
     <string-array name="entries_duration">
         <item>1 minute</item>
@@ -51,4 +65,16 @@
         <item>7</item>
         <item>8</item>
     </string-array>
+
+    <!-- First day of week -->
+    <string name="key_first_day_of_week">key_first_day_of_week</string>
+    <string name="title_first_day_of_week">First day of week</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+    <string name="monday">Monday</string>
+    <string-array name="array_first_day_of_week">
+        <item>@string/saturday</item>
+        <item>@string/sunday</item>
+        <item>@string/monday</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/prefs_timers.xml b/app/src/main/res/values/prefs_timers.xml
new file mode 100644
index 0000000..0d0555b
--- /dev/null
+++ b/app/src/main/res/values/prefs_timers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_category_timers">Timers</string>
+
+    <string name="key_timer_ringtone">key_timer_ringtone</string>
+    <string name="title_timer_ringtone">Ringtone</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/prefs_world_clock.xml b/app/src/main/res/values/prefs_world_clock.xml
new file mode 100644
index 0000000..0012983
--- /dev/null
+++ b/app/src/main/res/values/prefs_world_clock.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_category_world_clock">World Clock</string>
+
+    <string name="key_show_time_offsets_from">key_show_time_offsets_from</string>
+    <string name="title_show_time_offsets_from">Show time offsets from</string>
+    <string name="local_time">Local time</string>
+    <string name="gmt">GMT</string>
+    <string-array name="array_show_time_offsets_from">
+        <item>@string/local_time</item>
+        <item>@string/gmt</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 83a5340..075615b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,40 +49,7 @@
     <string name="snackbar_undo_item_deleted">Undo</string>
     <!-- ======================================================================================= -->
 
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <string name="title_activity_settings">Settings</string>
-    <!-- World Clock -->
-    <string name="pref_category_world_clock">World Clock</string>
-    <string name="pref_show_time_offsets_from">Show time offsets from</string>
-    <string name="pref_show_time_offsets_from_local">Local time</string>
-    <string name="pref_show_time_offsets_from_gmt">GMT</string>
-    <string-array name="pref_show_time_offsets_from_array">
-        <item>@string/pref_show_time_offsets_from_local</item>
-        <item>@string/pref_show_time_offsets_from_gmt</item>
-    </string-array>
-    <!-- Alarms -->
-    <string name="pref_category_alarms">Alarms</string>
-    <string name="pref_time_picker_style">Time picker style</string>
-    <string name="pref_time_picker_style_number_pad">Number pad</string>
-    <string name="pref_time_picker_style_radial_clock">Radial clock</string>
-    <string-array name="pref_time_picker_style_array">
-        <item>@string/pref_time_picker_style_number_pad</item>
-        <item>@string/pref_time_picker_style_radial_clock</item>
-    </string-array>
-    <string name="pref_snooze_duration">Snooze duration</string>
-    <string name="pref_first_day_of_week">First day of week</string>
-    <string name="pref_first_day_of_week_saturday">Saturday</string>
-    <string name="pref_first_day_of_week_sunday">Sunday</string>
-    <string name="pref_first_day_of_week_monday">Monday</string>
-    <string-array name="pref_first_day_of_week_array">
-        <item>@string/pref_first_day_of_week_saturday</item>
-        <item>@string/pref_first_day_of_week_sunday</item>
-        <item>@string/pref_first_day_of_week_monday</item>
-    </string-array>
-    <!-- Timers -->
-    <string name="pref_category_timers">Timers</string>
-    <string name="pref_timer_ringtone">Ringtone</string>
-    <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
 
     <string name="sun">Sun</string>
     <string name="mon">Mon</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 34b8457..d0e96c0 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory android:title="@string/pref_category_world_clock">
+    <PreferenceCategory android:title="@string/title_category_world_clock">
         <ListPreference
-            android:key="pref_show_time_offsets_from"
-            android:title="@string/pref_show_time_offsets_from"
-            android:dialogTitle="@string/pref_show_time_offsets_from"
-            android:entries="@array/pref_show_time_offsets_from_array"
-            android:entryValues="@array/pref_show_time_offsets_from_array"
-            android:defaultValue="@string/pref_show_time_offsets_from_local"
+            android:key="@string/key_show_time_offsets_from"
+            android:title="@string/title_show_time_offsets_from"
+            android:dialogTitle="@string/title_show_time_offsets_from"
+            android:entries="@array/array_show_time_offsets_from"
+            android:entryValues="@array/array_show_time_offsets_from"
+            android:defaultValue="@string/local_time"
             android:summary="%s"/>
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_category_alarms">
+    <PreferenceCategory android:title="@string/title_category_alarms">
         <ListPreference
-            android:key="pref_time_picker_style"
-            android:title="@string/pref_time_picker_style"
-            android:dialogTitle="@string/pref_time_picker_style"
-            android:entries="@array/pref_time_picker_style_array"
-            android:entryValues="@array/pref_time_picker_style_array"
-            android:defaultValue="@string/pref_time_picker_style_number_pad"
+            android:key="@string/key_time_picker_style"
+            android:title="@string/title_time_picker_style"
+            android:dialogTitle="@string/title_time_picker_style"
+            android:entries="@array/array_time_picker_styles"
+            android:entryValues="@array/array_time_picker_styles"
+            android:defaultValue="@string/number_pad"
             android:summary="%s"/>
         <ListPreference
             android:key="@string/key_silence_after"
@@ -29,9 +29,9 @@
             android:defaultValue="1"
             android:summary="%s"/>
         <ListPreference
-            android:key="pref_snooze_duration"
-            android:title="@string/pref_snooze_duration"
-            android:dialogTitle="@string/pref_snooze_duration"
+            android:key="@string/key_snooze_duration"
+            android:title="@string/title_snooze_duration"
+            android:dialogTitle="@string/title_snooze_duration"
             android:entries="@array/entries_duration"
             android:entryValues="@array/values_duration"
             android:defaultValue="1"
@@ -48,18 +48,18 @@
             android:defaultValue="2"
             android:summary="%s"/>
         <ListPreference
-            android:key="pref_first_day_of_week"
-            android:title="@string/pref_first_day_of_week"
-            android:dialogTitle="@string/pref_first_day_of_week"
-            android:entries="@array/pref_first_day_of_week_array"
-            android:entryValues="@array/pref_first_day_of_week_array"
-            android:defaultValue="@string/pref_first_day_of_week_sunday"
+            android:key="@string/key_first_day_of_week"
+            android:title="@string/title_first_day_of_week"
+            android:dialogTitle="@string/title_first_day_of_week"
+            android:entries="@array/array_first_day_of_week"
+            android:entryValues="@array/array_first_day_of_week"
+            android:defaultValue="@string/sunday"
             android:summary="%s"/>
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/pref_category_timers">
+    <PreferenceCategory android:title="@string/title_category_timers">
         <RingtonePreference
-            android:key="pref_timer_ringtone"
-            android:title="@string/pref_timer_ringtone"
+            android:key="@string/key_timer_ringtone"
+            android:title="@string/title_timer_ringtone"
             android:ringtoneType="alarm"
             android:defaultValue="content://settings/system/alarm_alert"/>
     </PreferenceCategory>