From 2276165cf0692009e7c58139ddb72cb4c62ae824 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 28 Nov 2011 19:33:54 +1300
Subject: [PATCH] Tidy up preferences menus.

---
 res/values/strings.xml       |   4 +
 res/xml/main_preferences.xml | 213 ++++++++++++++++++++-----------------------
 2 files changed, 105 insertions(+), 112 deletions(-)
 rewrite res/xml/main_preferences.xml (76%)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e44fb6..4c1388d 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,6 +230,8 @@
 	<string name="serverValidationSuccess">Server validation was successful.</string>
 	<string name="authenticationFailed">Unable to authenticate with server.</string>
 	<string name="WeekViewPreferences">Week View settings</string>
+	<string name="AlarmPreferences">Alarm settings</string>
+	<string name="GeneralPreferences">General settings</string>
 	<string name="checkServer">Validating server</string>
 	<string name="checkServer_Connecting">Connecting to server please wait...</string>
 	<string name="checkServer_Internet">Checking internet connectivity</string>
@@ -290,4 +292,6 @@
 	<string name="aCal_IRC_Channel">You can chat with the aCal authors on IRC in the &lt;a href="irc://irc.oftc.net/#acal">"#acal on irc.oftc.net&lt;/a></string>
 	<string name="aCal_Mailing_Lists">The &lt;em>aCal&lt;/em> mailing lists are public and you can subscribe at &lt;a href="http://lists.acal.me/">lists.acal.me&lt;/a>. There are archives there too.</string>
 	<string name="aCal_is_Free_Software">aCal is "Free Software" (that\'s "free" as in "freedom") which is licensed under the General Public License v3 or later.  You can download &lt;a href="http://gitorious.org/acal">the source code for aCal from Gitorious&lt;/a></string>
+	<string name="TaskMarkedComplete">Task marked as completed.</string>
+	<string name="TaskDeleted">Task was deleted.</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml
dissimilarity index 76%
index 31874e7..29c1a52 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/main_preferences.xml
@@ -1,112 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-  xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<ListPreference 
-		android:key="@string/firstDayOfWeek" 
-		android:title="@string/firstDayOfWeek" 
-		android:summary="@string/theDayEachWeekStartsWith" 
-		android:selectable="true" 
-		android:entries="@array/DaysOfWeek" 
-		android:entryValues="@array/DaysOfWeekOrdinal"
-		android:enabled="true" 
-		android:defaultValue="@string/Monday">
-	</ListPreference>
-	
-	<ListPreference
-		android:key="@string/YearViewSize_PrefKey"
-		android:title="@string/YearViewSize_PrefTitle"
-		android:summary="@string/YearViewSize_PrefSummary"
-		android:selectable="true"
-		android:entries="@array/YearViewSize_PrefEntries"
-		android:entryValues="@array/YearViewSize_PrefEntries"
-		android:enabled="true"
-		android:defaultValue="6">
-	</ListPreference>
-	
-	<EditTextPreference
-	android:key="@string/prefSnoozeDuration"
-		android:title="@string/Snooze_PrefTitle"
-		android:summary="@string/Snooze_PrefSummary"
-		android:selectable="true"
-		android:enabled="true"
-		android:defaultValue="10"/>
-
-	<CheckBoxPreference
-		android:key="@string/prefTwelveTwentyfour"
-		android:title="@string/TwelveTwentyfour_PrefTitle"
-		android:summaryOn="@string/TwelveTwentyfour_OnSummary"
-		android:summaryOff="@string/TwelveTwentyfour_OffSummary"/>
-	
-	<!-- This Preference is dynamically populated in AcalPreferences.java-->
-	<ListPreference
-		android:key="@string/DefaultCollection_PrefKey"
-		android:title="@string/DefaultCollection_PrefTitle"
-		android:summary="@string/DefaultCollection_PrefSummary"
-		android:selectable="false"
-		android:enabled="false">
-	</ListPreference>
-	
-	<ListPreference
-		android:key="@string/DefaultAlarmTone_PrefKey"
-		android:title="@string/DefaultAlarmTone_PrefTitle"
-		android:summary="@string/DefaultAlarmTone_PrefSummary"
-		android:selectable="false"
-		android:enabled="false">
-	</ListPreference>
-
-	<ListPreference
-		android:key="@string/AlarmVolumeType_PrefKey"
-		android:title="@string/AlarmVolumeType_PrefTitle"
-		android:summary="@string/AlarmVolumeType_PrefSummary"
-		android:selectable="true"
-		android:entries="@array/AlarmVolumeType_PrefEntries"
-		android:entryValues="@array/AlarmVolumeType_PrefValues"
-		android:enabled="true"
-		android:defaultValue="ALARM">
-	</ListPreference>
-
-	<CheckBoxPreference
-		android:key="@string/prefDefaultView"
-		android:title="aCal Opens in Week View"
-		android:summaryOff="Month View"
-		android:summaryOn="Week View"
-		/>
-
-	<PreferenceScreen android:title="@string/WeekViewPreferences">
-		<com.morphoss.acal.TimePickerPreference
-			android:key="@string/prefWorkdayStart"
-			android:title="@string/prefWorkdayStart_Title"
-			android:summary="@string/prefWorkdayStart_Summary"
-			android:selectable="true"
-			android:enabled="true"
-			android:defaultValue="9:00"/>
-	
-		<com.morphoss.acal.TimePickerPreference
-			android:key="@string/prefWorkdayFinish"
-			android:title="@string/prefWorkdayFinish_Title"
-			android:summary="@string/prefWorkdayFinish_Summary"
-			android:selectable="true"
-			android:enabled="true"
-			android:defaultValue="17:00"/>
-	
-		<EditTextPreference
-			android:key="@string/prefWeekViewLinesPerHour"
-			android:title="@string/prefWeekViewLinesPerHour_Title"
-			android:summary="@string/prefWeekViewLinesPerHour_Summary"
-			android:selectable="true"
-			android:enabled="true"
-			android:inputType="numberDecimal"
-			android:defaultValue="1.7"/>
-	
-		<EditTextPreference
-			android:key="@string/prefWeekViewDayWidth"
-			android:title="@string/prefWeekViewDayWidth_Title"
-			android:summary="@string/prefWeekViewDayWidth_Summary"
-			android:selectable="true"
-			android:enabled="true"
-			android:inputType="number"
-			android:defaultValue="70"/>
-	</PreferenceScreen>
-
-</PreferenceScreen>
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+	<PreferenceScreen android:title="@string/GeneralPreferences" >
+		<CheckBoxPreference
+			android:key="@string/prefDefaultView"
+			android:summaryOff="Month View"
+			android:summaryOn="Week View"
+			android:title="aCal Opens in Week View" />
+		<CheckBoxPreference
+			android:key="@string/prefTwelveTwentyfour"
+			android:summaryOff="@string/TwelveTwentyfour_OffSummary"
+			android:summaryOn="@string/TwelveTwentyfour_OnSummary"
+			android:title="@string/TwelveTwentyfour_PrefTitle" />
+		<!-- This Preference is dynamically populated in AcalPreferences.java -->
+		<ListPreference
+			android:enabled="false"
+			android:key="@string/DefaultCollection_PrefKey"
+			android:selectable="false"
+			android:summary="@string/DefaultCollection_PrefSummary"
+			android:title="@string/DefaultCollection_PrefTitle" >
+		</ListPreference>
+		<ListPreference
+			android:defaultValue="@string/Monday"
+			android:enabled="true"
+			android:entries="@array/DaysOfWeek"
+			android:entryValues="@array/DaysOfWeekOrdinal"
+			android:key="@string/firstDayOfWeek"
+			android:selectable="true"
+			android:summary="@string/theDayEachWeekStartsWith"
+			android:title="@string/firstDayOfWeek" >
+		</ListPreference>
+		<ListPreference
+			android:defaultValue="6"
+			android:enabled="true"
+			android:entries="@array/YearViewSize_PrefEntries"
+			android:entryValues="@array/YearViewSize_PrefEntries"
+			android:key="@string/YearViewSize_PrefKey"
+			android:selectable="true"
+			android:summary="@string/YearViewSize_PrefSummary"
+			android:title="@string/YearViewSize_PrefTitle" >
+		</ListPreference>
+	</PreferenceScreen>
+	<PreferenceScreen android:title="@string/AlarmPreferences" >
+		<EditTextPreference
+			android:defaultValue="10"
+			android:enabled="true"
+			android:key="@string/prefSnoozeDuration"
+			android:selectable="true"
+			android:summary="@string/Snooze_PrefSummary"
+			android:title="@string/Snooze_PrefTitle" />
+		<ListPreference
+			android:enabled="false"
+			android:key="@string/DefaultAlarmTone_PrefKey"
+			android:selectable="false"
+			android:summary="@string/DefaultAlarmTone_PrefSummary"
+			android:title="@string/DefaultAlarmTone_PrefTitle" >
+		</ListPreference>
+		<ListPreference
+			android:defaultValue="ALARM"
+			android:enabled="true"
+			android:entries="@array/AlarmVolumeType_PrefEntries"
+			android:entryValues="@array/AlarmVolumeType_PrefValues"
+			android:key="@string/AlarmVolumeType_PrefKey"
+			android:selectable="true"
+			android:summary="@string/AlarmVolumeType_PrefSummary"
+			android:title="@string/AlarmVolumeType_PrefTitle" >
+		</ListPreference>
+	</PreferenceScreen>
+	<PreferenceScreen android:title="@string/WeekViewPreferences" >
+		<com.morphoss.acal.TimePickerPreference
+			android:defaultValue="9:00"
+			android:enabled="true"
+			android:key="@string/prefWorkdayStart"
+			android:selectable="true"
+			android:summary="@string/prefWorkdayStart_Summary"
+			android:title="@string/prefWorkdayStart_Title" />
+		<com.morphoss.acal.TimePickerPreference
+			android:defaultValue="17:00"
+			android:enabled="true"
+			android:key="@string/prefWorkdayFinish"
+			android:selectable="true"
+			android:summary="@string/prefWorkdayFinish_Summary"
+			android:title="@string/prefWorkdayFinish_Title" />
+		<EditTextPreference
+			android:defaultValue="1.7"
+			android:enabled="true"
+			android:inputType="numberDecimal"
+			android:key="@string/prefWeekViewLinesPerHour"
+			android:selectable="true"
+			android:summary="@string/prefWeekViewLinesPerHour_Summary"
+			android:title="@string/prefWeekViewLinesPerHour_Title" />
+		<EditTextPreference
+			android:defaultValue="70"
+			android:enabled="true"
+			android:inputType="number"
+			android:key="@string/prefWeekViewDayWidth"
+			android:selectable="true"
+			android:summary="@string/prefWeekViewDayWidth_Summary"
+			android:title="@string/prefWeekViewDayWidth_Title" />
+	</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
-- 
2.11.4.GIT