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

Enable custom filters

Browse Source
pull/73/head
Alex Baker 11 years ago
parent 4491e51b29
commit 8cfe6b9bdc
17 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -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;
}

10
astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
Unescape Escape View File

@ -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<StoreObject> cursor = null;
if (useCustomFilters) {
cursor = dao.query(Query.select(StoreObject.PROPERTIES).where(
StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
}
TodorooCursor<StoreObject> cursor = dao.query(Query.select(StoreObject.PROPERTIES).where(
StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
try {
ArrayList<Filter> 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);

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

@ -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);

3
astrid/src/main/res/menu/task_list_activity.xml
Unescape Escape View File

@ -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"/>
<item
android:id="@+id/menu_settings"
android:showAsAction="never"

2
astrid/src/main/res/values-de/strings.xml
Unescape Escape View File

@ -225,8 +225,6 @@
<item>Einzeilig, nur Titel</item>
</string-array>
<string name="EPr_task_row_style_title">Zeilenart: %s</string>
<string name="EPr_use_filters_title">Filter nutzen</string>
<string name="EPr_use_filters_subtitle">Hiermit können Sie benutzerdefinierte Filter erstellen</string>
<string name="EPr_show_quickadd_controls">Erweiterte Einstellungen für Schnelleingabe</string>
<string name="EPr_hide_plus_button">Verstecke den +-Knopf</string>
<string name="EPr_menu_items">Menüeinträge</string>

2
astrid/src/main/res/values-es/strings.xml
Unescape Escape View File

@ -234,8 +234,6 @@
<item>Single line title only</item>
</string-array>
<string name="EPr_task_row_style_title">Estilo de fila: %s</string>
<string name="EPr_use_filters_title">Usar filtros</string>
<string name="EPr_use_filters_subtitle">Permite crear filtros personalizados</string>
<string name="EPr_show_quickadd_controls">Controles avanzados de adiciona rápida</string>
<string name="EPr_hide_plus_button">Ocultar botón de adición</string>
<string name="EPr_menu_items">Objetos del menú</string>

2
astrid/src/main/res/values-fr/strings.xml
Unescape Escape View File

@ -230,8 +230,6 @@
<item>Titre sur une seule ligne</item>
</string-array>
<string name="EPr_task_row_style_title">Style de ligne : %s</string>
<string name="EPr_use_filters_title">Utiliser des filtres</string>
<string name="EPr_use_filters_subtitle">Permet la création de filtres personnalisés</string>
<string name="EPr_show_quickadd_controls">Contrôles d\'ajouts rapides avancés</string>
<string name="EPr_hide_plus_button">Masquer le bouton \"+\"</string>
<string name="EPr_menu_items">Eléments de menu</string>

2
astrid/src/main/res/values-iw/strings.xml
Unescape Escape View File

@ -231,8 +231,6 @@
<item>שורת כותרת פשוטה בלבד</item>
</string-array>
<string name="EPr_task_row_style_title">סגנון שורה: %s</string>
<string name="EPr_use_filters_title">השתמש בְּמַסְנְנִים</string>
<string name="EPr_use_filters_subtitle">מאפשר לך ליצור מַסְנְנִים מותאמים אישית</string>
<string name="EPr_show_quickadd_controls">בקרת הוספה מהירה מתקדם</string>
<string name="EPr_hide_plus_button">הסתר את כפתור ה-פלוס</string>
<string name="EPr_menu_items">פריטי תפריט</string>

2
astrid/src/main/res/values-ko/strings.xml
Unescape Escape View File

@ -237,8 +237,6 @@
<item>제목을 한줄에만</item>
</string-array>
<string name="EPr_task_row_style_title">가로줄 스타일: %s</string>
<string name="EPr_use_filters_title">필터 사용하기</string>
<string name="EPr_use_filters_subtitle">사용자 필터를 만들어 봅시다</string>
<string name="EPr_show_quickadd_controls">고급 빠른추가 조정</string>
<string name="EPr_hide_plus_button">플러스 버튼 감추기</string>
<string name="EPr_menu_items">메뉴 항목</string>

2
astrid/src/main/res/values-nl/strings.xml
Unescape Escape View File

@ -233,8 +233,6 @@
<item>Enkele regel enkel titel</item>
</string-array>
<string name="EPr_task_row_style_title">Regel stijl %s</string>
<string name="EPr_use_filters_title">Gebruik filters</string>
<string name="EPr_use_filters_subtitle">Laat je aangepaste filters creëren</string>
<string name="EPr_show_quickadd_controls">Geavanceerde snel toevoegen controls</string>
<string name="EPr_hide_plus_button">Verberg plus knop</string>
<string name="EPr_list_view">Lijst weergave</string>

2
astrid/src/main/res/values-pl/strings.xml
Unescape Escape View File

@ -224,8 +224,6 @@
<item>Tytuł tylko w jednej linii</item>
</string-array>
<string name="EPr_task_row_style_title">Styl wiersza: %s</string>
<string name="EPr_use_filters_title">Użyj filtrów</string>
<string name="EPr_use_filters_subtitle">Pozwala stworzyć własne filtry</string>
<string name="EPr_show_quickadd_controls">Zaawansowane kontrolki szybkiego dodawania</string>
<string name="EPr_menu_items">Pozycje menu</string>
<string name="EPr_list_view">Widok listy</string>

2
astrid/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -228,8 +228,6 @@
<item>В одну линию с заголовками</item>
</string-array>
<string name="EPr_task_row_style_title">Стиль строки: %s</string>
<string name="EPr_use_filters_title">Использовать фильтры</string>
<string name="EPr_use_filters_subtitle">Позволяет создавать настраиваемые фильтры</string>
<string name="EPr_show_quickadd_controls">Расширенные возможности быстрого добавления</string>
<string name="EPr_menu_items">Элементы меню</string>
<string name="EPr_list_view">Списком</string>

2
astrid/src/main/res/values-sl-rSI/strings.xml
Unescape Escape View File

@ -237,8 +237,6 @@
<item>Enovrstični naziv</item>
</string-array>
<string name="EPr_task_row_style_title">Slog vrstice:%s</string>
<string name="EPr_use_filters_title">Uporabi filtre</string>
<string name="EPr_use_filters_subtitle">Omogoči filtre po meri</string>
<string name="EPr_show_quickadd_controls">Napredni kontrolniki za hitro dodajanje</string>
<string name="EPr_hide_plus_button">Skrij gumb s plusom</string>
<string name="EPr_menu_items">Predmeti na seznamu</string>

2
astrid/src/main/res/values-uk/strings.xml
Unescape Escape View File

@ -232,8 +232,6 @@
<item>Title only</item>
</string-array>
<string name="EPr_task_row_style_title">Стиль стрічки: %s</string>
<string name="EPr_use_filters_title">Використовувати фільтри</string>
<string name="EPr_use_filters_subtitle">Дозволяє створювати власні фільтри</string>
<string name="EPr_show_quickadd_controls">Розширені можливості швидкого додавання</string>
<string name="EPr_hide_plus_button">Прибрати кнопку плюс</string>
<string name="EPr_menu_items">Елементи меню</string>

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

@ -294,9 +294,6 @@
<!-- on calendar end at dealline if true, start at deadline if false -->
<string name="p_end_at_deadline">p_end_at_deadline</string>
<!-- whether custom filters are enabled -->
<string name="p_use_filters">p_use_filters</string>
<string-array name="EPr_default_addtocalendar_values">
<!-- addtocalendar: labels that map EPr_default_addtocalendar items to calendar selection in settings. -->
<item>-1</item>

4
astrid/src/main/res/values/strings-core.xml
Unescape Escape View File

@ -522,10 +522,6 @@
<!-- task row style title (%s -> style) -->
<string name="EPr_task_row_style_title">Row style: %s</string>
<!-- Preference: custom filters enabled -->
<string name="EPr_use_filters_title">Use filters</string>
<string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
<!-- Preference: simple input box style -->
<string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>

5
astrid/src/main/res/xml/preferences.xml
Unescape Escape View File

@ -95,11 +95,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_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">

Write Preview
Loading…
Cancel
Save