hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved preference strings from strings.xml to their own category file

Browse Source
This commit is contained in:
Phillip Hsu 2016-06-06 21:24:44 -07:00
parent a4bfce7874
commit 4b8bbcf5f2
7 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/philliphsu/clock2/settings/SettingsActivity.java
View File

@ -9,18 +9,6 @@ import com.philliphsu.clock2.R;
* Created by Phillip Hsu on 6/6/2016. * Created by Phillip Hsu on 6/6/2016.
*/ */
public class SettingsActivity extends BaseActivity { 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 @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

3
app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
View File

@ -23,8 +23,7 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
// Set ringtone summary // Set ringtone summary
setSummary(getPreferenceScreen().getSharedPreferences(), setSummary(getPreferenceScreen().getSharedPreferences(), getString(R.string.key_timer_ringtone));
SettingsActivity.KEY_PREF_TIMER_RINGTONE);
findPreference(getString(R.string.key_alarm_volume)) findPreference(getString(R.string.key_alarm_volume))
.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override @Override

28
app/src/main/res/values/prefs.xml → app/src/main/res/values/prefs_alarms.xml
View File

@ -1,9 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <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 --> <!-- Silence after -->
<string name="key_silence_after">key_silence_after</string> <string name="key_silence_after">key_silence_after</string>
<string name="title_silence_after">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 --> <!-- Durations for silence after & snooze duration -->
<string-array name="entries_duration"> <string-array name="entries_duration">
<item>1 minute</item> <item>1 minute</item>
@ -51,4 +65,16 @@
<item>7</item> <item>7</item>
<item>8</item> <item>8</item>
</string-array> </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> </resources>

7
app/src/main/res/values/prefs_timers.xml Normal file
View File

@ -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>

13
app/src/main/res/values/prefs_world_clock.xml Normal file
View File

@ -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>

33
app/src/main/res/values/strings.xml
View File

@ -49,40 +49,7 @@
<string name="snackbar_undo_item_deleted">Undo</string> <string name="snackbar_undo_item_deleted">Undo</string>
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~ Settings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<string name="title_activity_settings">Settings</string> <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="sun">Sun</string>
<string name="mon">Mon</string> <string name="mon">Mon</string>

52
app/src/main/res/xml/preferences.xml
View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> 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 <ListPreference
android:key="pref_show_time_offsets_from" android:key="@string/key_show_time_offsets_from"
android:title="@string/pref_show_time_offsets_from" android:title="@string/title_show_time_offsets_from"
android:dialogTitle="@string/pref_show_time_offsets_from" android:dialogTitle="@string/title_show_time_offsets_from"
android:entries="@array/pref_show_time_offsets_from_array" android:entries="@array/array_show_time_offsets_from"
android:entryValues="@array/pref_show_time_offsets_from_array" android:entryValues="@array/array_show_time_offsets_from"
android:defaultValue="@string/pref_show_time_offsets_from_local" android:defaultValue="@string/local_time"
android:summary="%s"/> android:summary="%s"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_category_alarms"> <PreferenceCategory android:title="@string/title_category_alarms">
<ListPreference <ListPreference
android:key="pref_time_picker_style" android:key="@string/key_time_picker_style"
android:title="@string/pref_time_picker_style" android:title="@string/title_time_picker_style"
android:dialogTitle="@string/pref_time_picker_style" android:dialogTitle="@string/title_time_picker_style"
android:entries="@array/pref_time_picker_style_array" android:entries="@array/array_time_picker_styles"
android:entryValues="@array/pref_time_picker_style_array" android:entryValues="@array/array_time_picker_styles"
android:defaultValue="@string/pref_time_picker_style_number_pad" android:defaultValue="@string/number_pad"
android:summary="%s"/> android:summary="%s"/>
<ListPreference <ListPreference
android:key="@string/key_silence_after" android:key="@string/key_silence_after"
@ -29,9 +29,9 @@
android:defaultValue="1" android:defaultValue="1"
android:summary="%s"/> android:summary="%s"/>
<ListPreference <ListPreference
android:key="pref_snooze_duration" android:key="@string/key_snooze_duration"
android:title="@string/pref_snooze_duration" android:title="@string/title_snooze_duration"
android:dialogTitle="@string/pref_snooze_duration" android:dialogTitle="@string/title_snooze_duration"
android:entries="@array/entries_duration" android:entries="@array/entries_duration"
android:entryValues="@array/values_duration" android:entryValues="@array/values_duration"
android:defaultValue="1" android:defaultValue="1"
@ -48,18 +48,18 @@
android:defaultValue="2" android:defaultValue="2"
android:summary="%s"/> android:summary="%s"/>
<ListPreference <ListPreference
android:key="pref_first_day_of_week" android:key="@string/key_first_day_of_week"
android:title="@string/pref_first_day_of_week" android:title="@string/title_first_day_of_week"
android:dialogTitle="@string/pref_first_day_of_week" android:dialogTitle="@string/title_first_day_of_week"
android:entries="@array/pref_first_day_of_week_array" android:entries="@array/array_first_day_of_week"
android:entryValues="@array/pref_first_day_of_week_array" android:entryValues="@array/array_first_day_of_week"
android:defaultValue="@string/pref_first_day_of_week_sunday" android:defaultValue="@string/sunday"
android:summary="%s"/> android:summary="%s"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_category_timers"> <PreferenceCategory android:title="@string/title_category_timers">
<RingtonePreference <RingtonePreference
android:key="pref_timer_ringtone" android:key="@string/key_timer_ringtone"
android:title="@string/pref_timer_ringtone" android:title="@string/title_timer_ringtone"
android:ringtoneType="alarm" android:ringtoneType="alarm"
android:defaultValue="content://settings/system/alarm_alert"/> android:defaultValue="content://settings/system/alarm_alert"/>
</PreferenceCategory> </PreferenceCategory>