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

Removed the addons menu item

Browse Source
pull/14/head
Sam Bosley 11 years ago
parent 3118803617
commit 487128e6f2
30 changed files with 2 additions and 85 deletions
Show Stats Download Patch File Download Diff File

1
astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java
Unescape Escape View File

@ -38,7 +38,6 @@ public class PeopleFilterMode implements FilterModeSpec {
private static final int[] FORBIDDEN_MENU_ITEMS = {
TaskListFragment.MENU_NEW_FILTER_ID,
TaskListFragment.MENU_ADDONS_ID,
MainMenuPopover.MAIN_MENU_ITEM_FRIENDS
};

1
astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
Unescape Escape View File

@ -20,7 +20,6 @@ public class FeaturedListFilterMode implements FilterModeSpec {
private static final int[] FORBIDDEN_MENU_ITEMS = {
TaskListFragment.MENU_NEW_FILTER_ID,
TaskListFragment.MENU_ADDONS_ID,
MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS
};

1
astrid/res/values-ca/strings.xml
Unescape Escape View File

@ -125,7 +125,6 @@
<string name="ENA_refresh_comments">Actualitza els comentaris</string>
<string name="TLA_no_items">No teniu tasques! \n Voleu afegir alguna cosa?</string>
<string name="TLA_no_items_person">En/na %s no ha\ncompartit cap tasca amb vós</string>
<string name="TLA_menu_addons">Complements</string>
<string name="TLA_menu_sort">Ordenació i subtasques</string>
<string name="TLA_menu_sync">Sincronitza ara</string>
<string name="TLA_menu_search">Cerca</string>

1
astrid/res/values-cs/strings.xml
Unescape Escape View File

@ -124,7 +124,6 @@
<string name="ENA_refresh_comments">Obnovit komentáře</string>
<string name="TLA_no_items">Žádné úkoly!</string>
<string name="TLA_no_items_person">%s s vámi\nnesdílí žádné úkoly</string>
<string name="TLA_menu_addons">Doplňky</string>
<string name="TLA_menu_sort">Třídit &amp; skryté</string>
<string name="TLA_menu_sync">Sychronizovat</string>
<string name="TLA_menu_search">Hledat</string>

1
astrid/res/values-da/strings.xml
Unescape Escape View File

@ -85,7 +85,6 @@
<string name="DLG_eula_title">Astrid Brugsbetingelser</string>
<string name="DLG_loading">Indlæser...</string>
<string name="WID_dateButtonUnset">Tryk for at indstille</string>
<string name="TLA_menu_addons">Tilføjelser</string>
<string name="TLA_menu_sort">Sorter &amp; skjulte</string>
<string name="TLA_menu_settings">Opsætning</string>
<string name="TLA_custom">Tilpasset</string>

3
astrid/res/values-de/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s hat noch\nkeine Aufgaben geteilt</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Add-Ons</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sortieren</string>

3
astrid/res/values-es/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s no tiene\ntareas compartidas contigo</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Complementos</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-fr/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s n\'a aucune tâche partagée avec vous</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Extensions</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-it/strings.xml
Unescape Escape View File

@ -603,9 +603,6 @@ condividerle e delegarle ad altri.</string>
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s non ha attività\ncondivise con te.</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Componenti aggiuntivi</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-iw/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s אינו משתף עמך אף משימה</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">תוספים</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">מיון</string>

3
astrid/res/values-ja/strings.xml
Unescape Escape View File

@ -605,9 +605,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">アドオン</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-ko/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s 님은 당신과 공유한 일정이 없습니다</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">확장기능</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

1
astrid/res/values-nb/strings.xml
Unescape Escape View File

@ -49,7 +49,6 @@
<string name="DLG_eula_title">Astrid Brukervilkår</string>
<string name="DLG_loading">Laster ...</string>
<string name="WID_dateButtonUnset">Klikk for å sette</string>
<string name="TLA_menu_addons">Tillegg</string>
<string name="TLA_menu_sort">Sorter &amp; Skjult</string>
<string name="TLA_menu_settings">Innstillinger</string>
<string name="TLA_custom">Egendefinert</string>

3
astrid/res/values-nl/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s heeft geen\ntaken met je gedeeld</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Uitbreidingen</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sorteren</string>

3
astrid/res/values-pl/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s nie posiada \nzadań współdzielonych z Tobą</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Dodatki</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s não tem</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Complementos</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-ru/strings.xml
Unescape Escape View File

@ -605,9 +605,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s пока не открыл вам\nсвоих задач</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Расширения</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-sv/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s delar\ninga uppgifter med dig</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Tillägg</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

1
astrid/res/values-th/strings.xml
Unescape Escape View File

@ -33,7 +33,6 @@
<string name="DLG_loading">กำลังโหลด...</string>
<string name="WID_dateButtonUnset">คลิก เพื่อตั้งค่า</string>
<string name="TLA_no_items">ไม่มีแผนงานใดๆ !</string>
<string name="TLA_menu_addons">ส่วนเสริม</string>
<string name="TLA_menu_sort">Sort &amp; Hidden</string>
<string name="TLA_custom">ปรับแต่ง</string>
<string-array name="TLA_filters">

3
astrid/res/values-tr/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s kişisi sizinle\ngörev paylaşmıyor</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Eklentiler</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s 没有 \n与您分享的任务</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">扩展程序</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

3
astrid/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -602,9 +602,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
<string name="TLA_no_items_person">%s 沒有 \n與您分享的任務工作</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">附加程式</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

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

@ -93,7 +93,6 @@
<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>
<string name="p_show_menu_addons">p_show_menu_addons</string>
<string-array name="TEA_reminder_random_hours">
<!-- values (in hours) associated with items above. -->

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

@ -104,9 +104,6 @@
<!-- Task List: Displayed instead of list when no items present in people view (%s-> person's name) -->
<string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
<!-- Menu: Add-ons -->
<string name="TLA_menu_addons">Add-ons</string>
<!-- Menu: Adjust Sort and Hidden Task Settings -->
<string name="TLA_menu_sort">Sort</string>

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

@ -117,10 +117,6 @@
android:key="@string/p_show_menu_sort"
android:title="@string/TLA_menu_sort"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_show_menu_addons"
android:title="@string/TLA_menu_addons"
android:defaultValue="true"/>
<com.todoroo.astrid.ui.MultilineCheckboxPreference
android:key="@string/p_use_filters"
android:title="@string/EPr_use_filters_title"

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

@ -655,7 +655,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
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, R.string.p_show_menu_addons
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));

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

@ -109,7 +109,6 @@ import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.timers.TimerPlugin;
import com.todoroo.astrid.ui.QuickAddBar;
import com.todoroo.astrid.utility.AstridPreferences;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.utility.Flags;
import com.todoroo.astrid.welcome.HelpInfoPopover;
import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
@ -141,7 +140,6 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
// --- menu codes
public static final int MENU_ADDONS_ID = R.string.TLA_menu_addons;
protected static final int MENU_SETTINGS_ID = R.string.TLA_menu_settings;
public static final int MENU_SORT_ID = R.string.TLA_menu_sort;
protected static final int MENU_SYNC_ID = R.string.TLA_menu_sync;
@ -519,11 +517,6 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
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);
// --- addons
if(Constants.MARKET_STRATEGY.showAddonMenu() && Preferences.getBoolean(R.string.p_show_menu_addons, true))
addMenuItem(menu, R.string.TLA_menu_addons,
ThemeService.getDrawable(R.drawable.icn_menu_plugins, isTablet ? ThemeService.FLAG_FORCE_DARK : 0), MENU_ADDONS_ID, false);
// ask about plug-ins
Intent queryIntent = new Intent(
AstridApiConstants.ACTION_TASK_LIST_MENU);
@ -1300,13 +1293,6 @@ public class TaskListFragment extends SherlockListFragment implements OnScrollLi
public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
Activity activity = getActivity();
switch(id) {
case MENU_ADDONS_ID:
if (activity != null) {
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_ADDONS);
intent = new Intent(activity, AddOnActivity.class);
startActivityForResult(intent, ACTIVITY_ADDONS);
return true;
}
case MENU_SORT_ID:
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT);
if (activity != null) {

7
astrid/src/com/todoroo/astrid/service/MarketStrategy.java
Unescape Escape View File

@ -32,13 +32,6 @@ public abstract class MarketStrategy {
return true;
}
/**
* @return true if addons should be shown
*/
public boolean showAddonMenu() {
return true;
}
public int[] excludedSettings() {
return null;
}

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

@ -111,7 +111,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
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);
setPreference(prefs, editor, r, R.string.p_show_menu_addons, true, ifUnset);
setPreference(prefs, editor, r, R.string.p_calendar_reminders, true, ifUnset);

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

@ -110,7 +110,6 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
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);
setPreference(prefs, editor, r, R.string.p_show_menu_addons, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_show_quickadd_controls, true, ifUnset);
@ -121,7 +120,7 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
setPreference(prefs, editor, r, R.string.p_hide_plus_button, ABChooser.readChoiceForTest(ABTests.AB_HIDE_PLUS_BUTTON) > 0, ifUnset);
extras.setExtras(context, prefs, editor, r, ifUnset);

Write Preview
Loading…
Cancel
Save