archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reorganized prefs, fixed some theme bugs

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 7f51ddbc46
commit b9c42e5860
5 changed files with 103 additions and 95 deletions
Show Stats Download Patch File Download Diff File

2
api/src/com/todoroo/andlib/utility/Preferences.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class Preferences {
*/ */
public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) { public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) {
String key = r.getString(keyResource); String key = r.getString(keyResource);
if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof Boolean)) if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof String))
editor.putString(key, value); editor.putString(key, value);
} }

3
astrid/res/values/keys.xml
Unescape Escape View File

@ -69,6 +69,9 @@
<!-- account status section key --> <!-- account status section key -->
<string name="p_account">account</string> <string name="p_account">account</string>
<!-- list view section key -->
<string name="p_list_view">p_list_view</string>
<!-- simple input box style --> <!-- simple input box style -->
<string name="p_simple_input_boxes">simple_input_boxes</string> <string name="p_simple_input_boxes">simple_input_boxes</string>

5
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -664,7 +664,7 @@
<!-- slide 34c: Preference: Task List Show Notes --> <!-- slide 34c: Preference: Task List Show Notes -->
<string name="EPr_showNotes_title">Show notes in task</string> <string name="EPr_showNotes_title">Show notes in task</string>
<!-- slide 30e: Preference: Beast mode (auto-expand edit page) --> <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
<string name="EPr_beastMode_title">Customize task edit screen</string> <string name="EPr_beastMode_title">Task edit screen</string>
<!-- slide 35h --> <!-- slide 35h -->
<string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string> <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
<!-- slide 35j --> <!-- slide 35j -->
@ -717,6 +717,9 @@
<!-- Preference: menu items --> <!-- Preference: menu items -->
<string name="EPr_menu_items">Menu items</string> <string name="EPr_menu_items">Menu items</string>
<!-- Preference: list view -->
<string name="EPr_list_view">List view</string>
<!-- Preference: task edit comments --> <!-- Preference: task edit comments -->
<string name="EPr_show_task_edit_comments">Show comments in task edit</string> <string name="EPr_show_task_edit_comments">Show comments in task edit</string>

185
astrid/res/xml/preferences.xml
Unescape Escape View File

@ -28,6 +28,18 @@
android:title="@string/EPr_appearance_header" android:title="@string/EPr_appearance_header"
android:summary="@string/EPr_appearance_summary"> android:summary="@string/EPr_appearance_summary">
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme"
android:entries="@array/EPr_themes"
android:entryValues="@array/EPr_theme_settings"
android:title="@string/EPr_theme_title" />
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme_widget"
android:entries="@array/EPr_themes_widget"
android:entryValues="@array/EPr_theme_widget_settings"
android:title="@string/EPr_theme_widget_title" />
<PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs"> <PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
<com.todoroo.astrid.ui.MultilineListPreference <com.todoroo.astrid.ui.MultilineListPreference
@ -56,79 +68,95 @@
<PreferenceScreen android:title="@string/EPr_beastMode_title" <PreferenceScreen android:title="@string/EPr_beastMode_title"
android:key="@string/p_beastMode"/> android:key="@string/p_beastMode"/>
<PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items"> <PreferenceScreen android:title="@string/EPr_list_view" android:key="@string/p_list_view">
<com.todoroo.astrid.ui.MultilineCheckboxPreference <PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items">
android:key="@string/p_show_menu_search" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/TLA_menu_search" android:key="@string/p_show_menu_search"
android:defaultValue="true" /> android:title="@string/TLA_menu_search"
<com.todoroo.astrid.ui.MultilineCheckboxPreference android:defaultValue="true" />
android:key="@string/p_show_menu_friends" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/TLA_menu_friends" android:key="@string/p_show_menu_friends"
android:defaultValue="true"/> android:title="@string/TLA_menu_friends"
<com.todoroo.astrid.ui.MultilineCheckboxPreference android:defaultValue="true"/>
android:key="@string/p_show_featured_lists" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/EPr_show_featured_lists" android:key="@string/p_show_featured_lists"
android:defaultValue="true"/> android:title="@string/EPr_show_featured_lists"
<com.todoroo.astrid.ui.MultilineCheckboxPreference android:defaultValue="true"/>
android:key="@string/p_show_menu_sync" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/TLA_menu_sync" android:key="@string/p_show_menu_sync"
android:defaultValue="true"/> android:title="@string/TLA_menu_sync"
<com.todoroo.astrid.ui.MultilineCheckboxPreference android:defaultValue="true"/>
android:key="@string/p_show_menu_sort" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/TLA_menu_sort" android:key="@string/p_show_menu_sort"
android:defaultValue="true"/> android:title="@string/TLA_menu_sort"
<com.todoroo.astrid.ui.MultilineCheckboxPreference android:defaultValue="true"/>
android:key="@string/p_show_menu_addons" <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:title="@string/TLA_menu_addons" android:key="@string/p_show_menu_addons"
android:defaultValue="true"/> android:title="@string/TLA_menu_addons"
</PreferenceScreen> android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_use_filters"
android:title="@string/EPr_use_filters_title"
android:summary="@string/EPr_use_filters_subtitle"
android:defaultValue="true"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show"> <PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show">
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_my_tasks_filter" android:key="@string/p_show_my_tasks_filter"
android:title="@string/BFE_Active" android:title="@string/BFE_Active"
android:defaultValue="true" android:defaultValue="true"
android:enabled="false" /> android:enabled="false" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_today_filter" android:key="@string/p_show_today_filter"
android:title="@string/today" android:title="@string/today"
android:defaultValue="true"/> android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_recently_modified_filter" android:key="@string/p_show_recently_modified_filter"
android:title="@string/BFE_Recent" android:title="@string/BFE_Recent"
android:defaultValue="true"/> android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_ive_assigned_filter" android:key="@string/p_show_ive_assigned_filter"
android:title="@string/BFE_Assigned" android:title="@string/BFE_Assigned"
android:defaultValue="true"/> android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_not_in_list_filter" android:key="@string/p_show_not_in_list_filter"
android:title="@string/tag_FEx_untagged" android:title="@string/tag_FEx_untagged"
android:defaultValue="true"/> android:defaultValue="true"/>
</PreferenceScreen>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_quickadd_controls"
android:title="@string/EPr_show_quickadd_controls"
android:defaultValue="true" />
<CheckBoxPreference
android:key="@string/p_swipe_lists_enabled"
android:title="@string/EPr_swipe_lists_performance_title"
android:defaultValue="false"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_list_members"
android:title="@string/EPr_show_list_members_title"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputEnabled"
android:title="@string/EPr_voiceInputEnabled_title"
android:defaultValue="true" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputCreatesTask"
android:title="@string/EPr_voiceInputCreatesTask_title"
android:dependency="@string/p_voiceInputEnabled"
android:defaultValue="false" />
</PreferenceScreen> </PreferenceScreen>
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme"
android:entries="@array/EPr_themes"
android:entryValues="@array/EPr_theme_settings"
android:title="@string/EPr_theme_title" />
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme_widget"
android:entries="@array/EPr_themes_widget"
android:entryValues="@array/EPr_theme_widget_settings"
android:title="@string/EPr_theme_widget_title" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_simple_input_boxes" android:key="@string/p_simple_input_boxes"
android:title="@string/EPr_simple_input_boxes" android:title="@string/EPr_simple_input_boxes"
android:defaultValue="false"/> android:defaultValue="false"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_quickadd_controls"
android:title="@string/EPr_show_quickadd_controls"
android:defaultValue="true" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_showSmartConfirmation_key" android:key="@string/p_showSmartConfirmation_key"
android:title="@string/EPr_showSmartConfirmation_title" android:title="@string/EPr_showSmartConfirmation_title"
@ -139,27 +167,11 @@
android:title="@string/EPr_ideaAuto_title" android:title="@string/EPr_ideaAuto_title"
android:defaultValue="true" /> android:defaultValue="true" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_use_filters"
android:title="@string/EPr_use_filters_title"
android:summary="@string/EPr_use_filters_subtitle"
android:defaultValue="true"/>
<CheckBoxPreference <CheckBoxPreference
android:title="@string/EPr_force_phone_layout" android:title="@string/EPr_force_phone_layout"
android:key="@string/p_force_phone_layout" android:key="@string/p_force_phone_layout"
android:defaultValue="false"/> android:defaultValue="false"/>
<CheckBoxPreference
android:key="@string/p_swipe_lists_enabled"
android:title="@string/EPr_swipe_lists_performance_title"
android:defaultValue="false"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_list_members"
android:title="@string/EPr_show_list_members_title"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference <com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_task_edit_comments" android:key="@string/p_show_task_edit_comments"
android:title="@string/EPr_show_task_edit_comments" android:title="@string/EPr_show_task_edit_comments"
@ -168,17 +180,6 @@
<CheckBoxPreference <CheckBoxPreference
android:key="@string/p_use_contact_picker" android:key="@string/p_use_contact_picker"
android:title="@string/EPr_use_contact_picker"/> android:title="@string/EPr_use_contact_picker"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputEnabled"
android:title="@string/EPr_voiceInputEnabled_title"
android:defaultValue="true" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_voiceInputCreatesTask"
android:title="@string/EPr_voiceInputCreatesTask_title"
android:dependency="@string/p_voiceInputEnabled"
android:defaultValue="false" />
</PreferenceScreen> </PreferenceScreen>

3
astrid/src/com/todoroo/astrid/service/ThemeService.java
Unescape Escape View File

@ -184,7 +184,8 @@ public class ThemeService {
} }
public static int getDrawable(int lightDrawable, int alter) { public static int getDrawable(int lightDrawable, int alter) {
boolean darkTheme = currentTheme == R.style.Theme || currentTheme == R.style.Theme_Transparent; int theme = getUnsimplifiedTheme();
boolean darkTheme = theme == R.style.Theme || theme == R.style.Theme_Transparent;
switch(alter) { switch(alter) {
case FLAG_FORCE_DARK: case FLAG_FORCE_DARK:
darkTheme = true; darkTheme = true;

Write Preview
Loading…
Cancel
Save