diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 4c86a1a03..0bf3c4544 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -169,9 +169,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList if(!Preferences.getBoolean(R.string.p_show_menu_sync, true)) { menu.findItem(R.id.menu_sync).setVisible(false); } - if(Preferences.getBoolean(R.string.p_use_filters, false)) { - menu.findItem(R.id.menu_new_filter).setVisible(true); - } return true; } diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index a82fd7670..fd40a9f47 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -66,13 +66,9 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr private Filter[] buildSavedFilters(Context context, Resources r) { int themeFlags = ThemeService.getFilterThemeFlags(); - boolean useCustomFilters = Preferences.getBoolean(R.string.p_use_filters, true); StoreObjectDao dao = PluginServices.getStoreObjectDao(); - TodorooCursor cursor = null; - if (useCustomFilters) { - cursor = dao.query(Query.select(StoreObject.PROPERTIES).where( - StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME))); - } + TodorooCursor cursor = dao.query(Query.select(StoreObject.PROPERTIES).where( + StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME))); try { ArrayList list = new ArrayList<>(); @@ -90,7 +86,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr list.add(recent); } - if (useCustomFilters && cursor != null) { + if (cursor != null) { StoreObject savedFilter = new StoreObject(); for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { savedFilter.readFromCursor(cursor); diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 5bb991abd..a92768d46 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -75,8 +75,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_calendar_reminders, true); - setPreference(prefs, editor, r, R.string.p_use_filters, false); - setPreference(prefs, editor, r, R.string.p_use_dark_theme, false); setPreference(prefs, editor, r, R.string.p_force_phone_layout, false); diff --git a/astrid/src/main/res/menu/task_list_activity.xml b/astrid/src/main/res/menu/task_list_activity.xml index 91635373a..95d1a123c 100644 --- a/astrid/src/main/res/menu/task_list_activity.xml +++ b/astrid/src/main/res/menu/task_list_activity.xml @@ -43,8 +43,7 @@ android:id="@+id/menu_new_filter" android:showAsAction="never" android:title="@string/FLA_new_filter" - android:icon="@drawable/icn_menu_filters" - android:visible="false"/> + android:icon="@drawable/icn_menu_filters"/> Einzeilig, nur Titel Zeilenart: %s - Filter nutzen - Hiermit können Sie benutzerdefinierte Filter erstellen Erweiterte Einstellungen für Schnelleingabe Verstecke den +-Knopf Menüeinträge diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 8e06d9ec0..54d8f5388 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -234,8 +234,6 @@ Single line title only Estilo de fila: %s - Usar filtros - Permite crear filtros personalizados Controles avanzados de adiciona rápida Ocultar botón de adición Objetos del menú diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index c7d709ead..bf59a326c 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -230,8 +230,6 @@ Titre sur une seule ligne Style de ligne : %s - Utiliser des filtres - Permet la création de filtres personnalisés Contrôles d\'ajouts rapides avancés Masquer le bouton \"+\" Eléments de menu diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 3d7e35b3a..e459f7ca7 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -231,8 +231,6 @@ שורת כותרת פשוטה בלבד סגנון שורה: %s - השתמש בְּמַסְנְנִים - מאפשר לך ליצור מַסְנְנִים מותאמים אישית בקרת הוספה מהירה מתקדם הסתר את כפתור ה-פלוס פריטי תפריט diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 1a03c1a5a..adcef3b8c 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -237,8 +237,6 @@ 제목을 한줄에만 가로줄 스타일: %s - 필터 사용하기 - 사용자 필터를 만들어 봅시다 고급 빠른추가 조정 플러스 버튼 감추기 메뉴 항목 diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index adfb7482f..b64dd37b0 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -233,8 +233,6 @@ Enkele regel enkel titel Regel stijl %s - Gebruik filters - Laat je aangepaste filters creëren Geavanceerde snel toevoegen controls Verberg plus knop Lijst weergave diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index f85c4970c..56d23e74e 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -224,8 +224,6 @@ Tytuł tylko w jednej linii Styl wiersza: %s - Użyj filtrów - Pozwala stworzyć własne filtry Zaawansowane kontrolki szybkiego dodawania Pozycje menu Widok listy diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index c0b38026e..cae0ce601 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -228,8 +228,6 @@ В одну линию с заголовками Стиль строки: %s - Использовать фильтры - Позволяет создавать настраиваемые фильтры Расширенные возможности быстрого добавления Элементы меню Списком diff --git a/astrid/src/main/res/values-sl-rSI/strings.xml b/astrid/src/main/res/values-sl-rSI/strings.xml index f8e98bd75..dbee941cc 100644 --- a/astrid/src/main/res/values-sl-rSI/strings.xml +++ b/astrid/src/main/res/values-sl-rSI/strings.xml @@ -237,8 +237,6 @@ Enovrstični naziv Slog vrstice:%s - Uporabi filtre - Omogoči filtre po meri Napredni kontrolniki za hitro dodajanje Skrij gumb s plusom Predmeti na seznamu diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 98239c3ec..aaf9e50c8 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -232,8 +232,6 @@ Title only Стиль стрічки: %s - Використовувати фільтри - Дозволяє створювати власні фільтри Розширені можливості швидкого додавання Прибрати кнопку плюс Елементи меню diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index 1f42273e9..ba7637198 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -294,9 +294,6 @@ p_end_at_deadline - - p_use_filters - -1 diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 2fb8c96df..e2168a6ba 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -522,10 +522,6 @@ Row style: %s - - Use filters - Lets you create custom filters - Advanced quickadd controls diff --git a/astrid/src/main/res/xml/preferences.xml b/astrid/src/main/res/xml/preferences.xml index c44001b05..39866984d 100644 --- a/astrid/src/main/res/xml/preferences.xml +++ b/astrid/src/main/res/xml/preferences.xml @@ -95,11 +95,6 @@ android:key="@string/p_show_menu_sort" android:title="@string/TLA_menu_sort" android:defaultValue="true"/> -