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

Remove social filters, people menu item

Browse Source
pull/14/head
Alex Baker 11 years ago
parent 5f8c0b2d05
commit a353753ccf
10 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File

1
astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
Unescape Escape View File

@ -448,7 +448,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
@Override
public void performChanges() {
Preferences.setBoolean(R.string.p_show_friends_view, true);
}
}

6
astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
Unescape Escape View File

@ -68,12 +68,6 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
filters.add(getTodayFilter(r));
}
if (Preferences.getBoolean(R.string.p_show_waiting_on_me_filter, true) &&
PluginServices.getWaitingOnMeDao().count(Query.select(WaitingOnMe.ID).where(Criterion.and(WaitingOnMe.DELETED_AT.eq(0),
Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1))))) > 0) {
filters.add(getWaitingOnMeFilter(r));
}
// transmit filter list
return filters.toArray(new FilterListItem[filters.size()]);
}

4
astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
Unescape Escape View File

@ -100,10 +100,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
list.add(recent);
}
if (Preferences.getBoolean(R.string.p_show_ive_assigned_filter, true)) {
list.add(getAssignedByMeFilter(r));
}
if (useCustomFilters && cursor != null) {
StoreObject savedFilter = new StoreObject();
for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {

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

@ -53,9 +53,6 @@
<!-- calendar reminders preference -->
<string name="p_calendar_reminders">p_calendar_reminder</string>
<!-- show friends view preference -->
<string name="p_show_friends_view">show_friends_view</string>
<!-- force tablets to use phone layout -->
<string name="p_force_phone_layout">force_phone_layout</string>
@ -67,9 +64,7 @@
<string name="p_filters_to_show">p_filters_to_show</string>
<string name="p_show_my_tasks_filter">p_show_my_tasks_f</string>
<string name="p_show_today_filter">p_show_today_f</string>
<string name="p_show_waiting_on_me_filter">p_show_waiting_on_me_f</string>
<string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
<string name="p_show_ive_assigned_filter">p_show_assigned_f</string>
<string name="p_show_not_in_list_filter">p_show_no_list_f</string>
<!-- show quickadd controls -->
@ -84,7 +79,6 @@
<!-- menu items to show -->
<string name="p_menu_items">p_menu_items</string>
<string name="p_show_menu_search">p_show_menu_search</string>
<string name="p_show_menu_friends">p_show_menu_friends</string>
<string name="p_show_menu_sync">p_show_menu_sync</string>
<string name="p_show_menu_sort">p_show_menu_sort</string>

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

@ -89,10 +89,6 @@
android:key="@string/p_show_menu_search"
android:title="@string/TLA_menu_search"
android:defaultValue="true" />
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_menu_friends"
android:title="@string/TLA_menu_friends"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_menu_sync"
android:title="@string/TLA_menu_sync"
@ -118,18 +114,10 @@
android:key="@string/p_show_today_filter"
android:title="@string/today"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_waiting_on_me_filter"
android:title="@string/BFE_waiting_on_me"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_recently_modified_filter"
android:title="@string/BFE_Recent"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_ive_assigned_filter"
android:title="@string/BFE_Assigned"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_not_in_list_filter"
android:title="@string/tag_FEx_untagged"

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

@ -504,8 +504,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener(
new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite, StatisticsConstants.PREFS_RESET_LITE));
int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_friends,
R.string.p_show_menu_sync, R.string.p_show_menu_sort,
int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_sync, R.string.p_show_menu_sort,
};
for (int key : menuPrefs) {
findPreference(getString(key)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));

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

@ -119,12 +119,6 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
if (Preferences.getBoolean(R.string.p_show_friends_view, false) && Preferences.getBoolean(R.string.p_show_menu_friends, true)) {
addMenuItem(R.string.TLA_menu_friends,
ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
MAIN_MENU_ITEM_FRIENDS, null, topFixed);
}
addMenuItem(R.string.TLA_menu_settings,
ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item

3
astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
Unescape Escape View File

@ -99,13 +99,10 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
setPreference(prefs, editor, r, R.string.p_rmd_persistent, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_search, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_friends, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_sync, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);

3
astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
Unescape Escape View File

@ -95,13 +95,10 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_search, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_friends, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_sync, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);

1
astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
Unescape Escape View File

@ -89,7 +89,6 @@ public class AstridPreferences {
} finally {
users.close();
}
Preferences.setBoolean(R.string.p_show_friends_view, showFriends);
}
private static void setShowFeaturedLists() {

Write Preview
Loading…
Cancel
Save