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

Started reorganizing the settings page and main menu

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 84d55eeb32
commit 12f7da7bf8
5 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -138,7 +138,7 @@
<string name="TLA_menu_tutorial">Tutorial</string>
<!-- Menu: Settings -->
<string name="TLA_menu_settings">Settings</string>
<string name="TLA_menu_settings">Account &amp; Settings</string>
<!-- slide 30b: Menu: Support -->
<string name="TLA_menu_support">Support</string>
@ -574,6 +574,15 @@
<!-- slide 30i: Preference Category: Appearance Title -->
<string name="EPr_appearance_header">Appearance</string>
<!-- Preference Category: Appearance Summary -->
<string name="EPr_appearance_summary">Themes, Widgets, Task Rows, Edit Screen</string>
<!-- FAQ Preference title -->
<string name="EPr_faq_title">FAQ</string>
<!-- Support preferences summary -->
<string name="EPr_support_summary">Tutorial, FAQ, About Astrid</string>
<!-- slide 34a: Preference: Task List Font Size Title -->
<string name="EPr_fontSize_title">Task List Size</string>

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

@ -8,12 +8,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/EPr_title">
<PreferenceScreen android:title="@string/p_about" android:key="@string/p_about" />
<PreferenceScreen android:title="@string/welcome_setting" android:key="@string/p_tutorial"/>
<PreferenceScreen android:title="@string/p_help" android:key="@string/p_help"/>
<PreferenceScreen android:title="@string/p_help" android:summary="@string/EPr_support_summary">
<PreferenceScreen android:title="@string/p_about" android:key="@string/p_about" />
<PreferenceScreen android:title="@string/welcome_setting" android:key="@string/p_tutorial"/>
<PreferenceScreen android:title="@string/EPr_faq_title" android:key="@string/p_help"/>
</PreferenceScreen>
<PreferenceCategory
android:title="@string/EPr_appearance_header">
<PreferenceScreen
android:title="@string/EPr_appearance_header"
android:summary="@string/EPr_appearance_summary">
<PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
@ -48,7 +51,8 @@
</PreferenceScreen>
<PreferenceScreen android:title="" android:key="@string/p_beastMode"/>
<PreferenceScreen android:title="@string/EPr_beastMode_title"
android:key="@string/p_beastMode"/>
<com.todoroo.astrid.ui.MultilineListPreference
android:key="@string/p_theme"
@ -72,7 +76,7 @@
android:title="@string/EPr_ideaAuto_title"
android:defaultValue="true" />
</PreferenceCategory>
</PreferenceScreen>
<PreferenceCategory

7
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -81,8 +81,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
private static final String SUPPORT_URL = "http://blog.astrid.com/topics/support/android"; //$NON-NLS-1$
private static final int APPEARANCE_PREFERENCE = 3;
private static final int POWER_PACK_PREFERENCE = 4;
private static final int APPEARANCE_PREFERENCE = 1;
private static final int POWER_PACK_PREFERENCE = 2;
private static final int REQUEST_CODE_SYNC = 0;
private static final int REQUEST_CODE_LABS = 1;
@ -155,9 +155,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
});
PreferenceCategory appearance = (PreferenceCategory) screen.getPreference(APPEARANCE_PREFERENCE);
PreferenceScreen appearance = (PreferenceScreen) screen.getPreference(APPEARANCE_PREFERENCE);
Preference beastMode = appearance.getPreference(1);
beastMode.setTitle(r.getString(R.string.EPr_beastMode_title));
beastMode.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {

8
astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -434,16 +434,16 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
tla.getMainMenuPopover().clear();
}
// --- sync
if (tla == null || tla.getTaskEditFragment() == null)
addSyncRefreshMenuItem(menu, isTablet ? ThemeService.FLAG_INVERT : 0);
// --- sort
if (allowResorting()) {
addMenuItem(menu, R.string.TLA_menu_sort,
ThemeService.getDrawable(R.drawable.icn_menu_sort_by_size, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_SORT_ID, false);
}
// --- sync
if (tla == null || tla.getTaskEditFragment() == null)
addSyncRefreshMenuItem(menu, isTablet ? ThemeService.FLAG_INVERT : 0);
// --- new filter
addMenuItem(menu, R.string.FLA_new_filter,
ThemeService.getDrawable(R.drawable.icn_menu_filters, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_NEW_FILTER_ID, false);

7
astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
Unescape Escape View File

@ -107,6 +107,10 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
private void addFixedItems() {
int themeFlags = isTablet ? ThemeService.FLAG_FORCE_DARK : 0;
addMenuItem(R.string.TLA_menu_search,
ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),
MAIN_MENU_ITEM_SEARCH, null, topFixed);
addMenuItem(R.string.TLA_menu_lists,
ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
@ -121,9 +125,6 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
ThemeService.getDrawable(R.drawable.icn_featured_lists, themeFlags),
MAIN_MENU_ITEM_FEATURED_LISTS, null, topFixed);
addMenuItem(R.string.TLA_menu_search,
ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),
MAIN_MENU_ITEM_SEARCH, null, topFixed);
addMenuItem(R.string.TLA_menu_settings,
ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item

Write Preview
Loading…
Cancel
Save