From a94f94e71f9969dce5559391f90d2bb89df29c70 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 18 Jun 2015 13:52:10 -0500 Subject: [PATCH] Add tags and filters from nav drawer --- src/main/AndroidManifest.xml | 5 - .../astrid/actfm/TagSettingsActivity.java | 8 ++ .../actfm/TagSettingsActivityTablet.java | 14 --- .../astrid/activity/TaskListActivity.java | 22 +--- .../todoroo/astrid/adapter/FilterAdapter.java | 23 +++- .../org/tasks/injection/ActivityModule.java | 2 - .../tasks/ui/NavigationDrawerFragment.java | 16 +++ .../res/drawable-hdpi/ic_add_black_24dp.png | Bin 0 -> 124 bytes .../res/drawable-hdpi/ic_add_white_24dp.png | Bin 0 -> 127 bytes .../res/drawable-xhdpi/ic_add_black_24dp.png | Bin 0 -> 108 bytes .../res/drawable-xhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes .../res/drawable-xxhdpi/ic_add_black_24dp.png | Bin 0 -> 114 bytes .../res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes src/main/res/drawable/ic_add_black_24dp.png | Bin 0 -> 86 bytes src/main/res/drawable/ic_add_white_24dp.png | Bin 0 -> 88 bytes src/main/res/layout/tag_settings_activity.xml | 107 ++++++++++-------- src/main/res/menu/task_list_activity.xml | 8 -- src/main/res/values-ar/strings.xml | 1 - src/main/res/values-bg-rBG/strings.xml | 1 - src/main/res/values-ca/strings.xml | 1 - src/main/res/values-cs/strings.xml | 1 - src/main/res/values-da/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-es/strings.xml | 1 - src/main/res/values-fi/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-iw/strings.xml | 1 - src/main/res/values-ja/strings.xml | 1 - src/main/res/values-ko/strings.xml | 1 - src/main/res/values-nb/strings.xml | 1 - src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 1 - src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values-pt/strings.xml | 1 - src/main/res/values-ru/strings.xml | 1 - src/main/res/values-sk/strings.xml | 1 - src/main/res/values-sl-rSI/strings.xml | 1 - src/main/res/values-sv/strings.xml | 1 - src/main/res/values-tr/strings.xml | 1 - src/main/res/values-uk/strings.xml | 1 - src/main/res/values-zh-rCN/strings.xml | 1 - src/main/res/values-zh-rTW/strings.xml | 1 - src/main/res/values/attrs.xml | 1 + src/main/res/values/strings-core.xml | 3 - src/main/res/values/strings-tags.xml | 2 + src/main/res/values/styles.xml | 2 + 48 files changed, 108 insertions(+), 132 deletions(-) delete mode 100644 src/main/java/com/todoroo/astrid/actfm/TagSettingsActivityTablet.java create mode 100644 src/main/res/drawable-hdpi/ic_add_black_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_add_black_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_add_black_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_add_white_24dp.png create mode 100644 src/main/res/drawable/ic_add_black_24dp.png create mode 100644 src/main/res/drawable/ic_add_white_24dp.png diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index bcaa24d93..2371e9975 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -375,11 +375,6 @@ android:name="com.todoroo.astrid.actfm.TagSettingsActivity" android:windowSoftInputMode="stateHidden" /> - - settingsComponent = preferences.useTabletLayout() ? TagSettingsActivityTablet.class : TagSettingsActivity.class; - return new Intent(this, settingsComponent); - } - @Override public void onTaskListItemClicked(long taskId) { if (fragmentLayout != LAYOUT_SINGLE) { @@ -446,16 +436,6 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), tlf.getSort()); dialog.show(); return true; - case R.id.menu_new_filter: - Intent intent = new Intent(this, CustomFilterActivity.class); - startActivityForResult(intent, TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER); - return true; - case R.id.menu_new_list: - startActivityForResult(newTagDialog(), NavigationDrawerFragment.REQUEST_NEW_LIST); - if (!preferences.useTabletLayout()) { - AndroidUtilities.callOverridePendingTransition(this, R.anim.slide_left_in, R.anim.slide_left_out); - } - return true; default: return super.onOptionsItemSelected(item); } diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 846b5c86a..2c9d27125 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -18,11 +18,13 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import com.todoroo.astrid.actfm.TagSettingsActivity; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; +import com.todoroo.astrid.core.CustomFilterActivity; import org.tasks.R; import org.tasks.activities.DonationActivity; @@ -33,6 +35,7 @@ import org.tasks.filters.NavigationDrawerSubheader; import org.tasks.filters.NavigationDrawerSeparator; import org.tasks.preferences.BasicPreferences; import org.tasks.preferences.HelpAndFeedbackActivity; +import org.tasks.ui.NavigationDrawerFragment; import java.util.List; @@ -226,10 +229,12 @@ public class FilterAdapter extends ArrayAdapter { } public void addSubMenu(final int titleResource, List filters) { - if (filters.size() > 0) { - add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource))); + if (filters.isEmpty()) { + return; } + add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource))); + for (FilterListItem filterListItem : filters) { add(filterListItem); } @@ -249,6 +254,20 @@ public class FilterAdapter extends ArrayAdapter { if (navigationDrawer) { add(new NavigationDrawerSeparator()); + add(new NavigationDrawerAction( + activity.getResources().getString(R.string.new_tag), + getResource(activity, R.attr.ic_action_new_tag), + new Intent(activity, TagSettingsActivity.class), + NavigationDrawerFragment.REQUEST_NEW_LIST)); + + add(new NavigationDrawerAction( + activity.getResources().getString(R.string.FLA_new_filter), + getResource(activity, R.attr.ic_action_new_tag), + new Intent(activity, CustomFilterActivity.class), + TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER)); + + add(new NavigationDrawerSeparator()); + add(new NavigationDrawerAction( activity.getResources().getString(R.string.TLA_menu_settings), getResource(activity, R.attr.ic_action_settings), diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java index b08d002d4..2244e1e50 100644 --- a/src/main/java/org/tasks/injection/ActivityModule.java +++ b/src/main/java/org/tasks/injection/ActivityModule.java @@ -3,7 +3,6 @@ package org.tasks.injection; import android.app.Activity; import com.todoroo.astrid.actfm.TagSettingsActivity; -import com.todoroo.astrid.actfm.TagSettingsActivityTablet; import com.todoroo.astrid.activity.BeastModePreferences; import com.todoroo.astrid.activity.FilterShortcutActivity; import com.todoroo.astrid.activity.ShareLinkActivity; @@ -54,7 +53,6 @@ import dagger.Provides; TaskEditActivity.class, ShareLinkActivity.class, TagSettingsActivity.class, - TagSettingsActivityTablet.class, CustomFilterActivity.class, MissedCallActivity.class, CalendarAlarmListCreator.class, diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index a71bf5ada..18bdbac33 100644 --- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -18,6 +18,9 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ListView; +import com.todoroo.astrid.actfm.TagSettingsActivity; +import com.todoroo.astrid.activity.AstridActivity; +import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.AstridApiConstants; @@ -110,6 +113,19 @@ public class NavigationDrawerFragment extends InjectingFragment { getActivity().finish(); getActivity().startActivity(getActivity().getIntent()); } + } else if ((requestCode == NavigationDrawerFragment.REQUEST_NEW_LIST || + requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) && + resultCode == Activity.RESULT_OK) { + if(data == null) { + return; + } + + Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER); + if (newList != null) { + getActivity().getIntent().putExtra(TaskListActivity.TOKEN_SWITCH_TO_FILTER, newList); + clear(); + } + } else { super.onActivityResult(requestCode, resultCode, data); } diff --git a/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/src/main/res/drawable-hdpi/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c04b523c482b77824608a836515e865579f8b00c GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;v!{z=NCji^0d}{88U+a%3{LE) zc(W3I@VD?TX6u!5iTdQ+%zl7P_JBaSLWcds4UNy(0^e=DSmGkkBjwV6s9vOpiQ(Iw WlC8ByowtC-F?hQAxvX|k0wldT1B8K;o2QFoh{y5d1PRu~4CX)Hf7s8+ zA**4&;-Ni!J6N0?fLsPoS3j3^P6p=fS?83{ F1OO~S9V-9; literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdced8fce76a0f9a527388935adecebf63d0dae GIT binary patch literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/res/drawable/ic_add_black_24dp.png b/src/main/res/drawable/ic_add_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..23bf119211e02b139ad2e0961bc71662ce1caf1e GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx*_&aj!VDzSo@fq7N>%r!;1bAd`3JYD@<);T3K0RTZ}7R&$u literal 0 HcmV?d00001 diff --git a/src/main/res/layout/tag_settings_activity.xml b/src/main/res/layout/tag_settings_activity.xml index 1f485bfb6..d466cace6 100644 --- a/src/main/res/layout/tag_settings_activity.xml +++ b/src/main/res/layout/tag_settings_activity.xml @@ -1,60 +1,67 @@ - - - - + + + + + + + android:layout_height="0dp" + android:layout_weight="100" + android:padding="10dip" + android:paddingTop="0dip" > - - - - - + android:orientation="vertical" > - - - + + + + + + - - - - + android:layout_below="@id/tag_label" + android:layout_marginTop="14dip" + android:padding="10dip" + android:paddingBottom="14dip" > + + + + + + + + diff --git a/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml index 8613c4ce8..4b1f4ec5b 100644 --- a/src/main/res/menu/task_list_activity.xml +++ b/src/main/res/menu/task_list_activity.xml @@ -23,12 +23,4 @@ android:title="@string/gtasks_GTA_clear_completed" android:visible="false" tasks:showAsAction="never" /> - - \ No newline at end of file diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 07f8cda82..cbf2f4dd8 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -45,7 +45,6 @@ بواسطة التعديل الأخير مره واحده فقط دائماً - قائمة جديدة لم يتم اختيار فلتر! ارجو اختيار فلتر او قائمة اسم المهمة تعيين تاريخ الاستحقاق diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 2b2717579..434ce66da 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -67,7 +67,6 @@ Винаги Съвпада с \'%s\' Нов филтър - Нов списък Няма избран филтър! Моля изберете филтър или списък. Име на задачата Приоритет diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 716867b4c..30741c4f4 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -62,7 +62,6 @@ Sempre Coincidència \'%s\' Filtre nou - Llista nova No heu seleccionat cap filtre. Seleccioneu un filtre o una llista. Resum de la tasca Importància diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index a38323b0e..99e3853aa 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -64,7 +64,6 @@ Vždy Hledanému \'%s\' odpovídá: Nový Filtr - Nový seznam Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam. Souhrn úkolu Důležitost diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 770eeece3..30579a255 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -57,7 +57,6 @@ Altid Matcher \'%s\' Nyt filter - Ny liste Der er ikke valgt et filter! Vælg venligst et filter eller en liste. Opgave Overskrift Vigtighed diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index d6f3a7c29..81033d67a 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -63,7 +63,6 @@ Immer Übereinstimmung mit %s Neuer Filter - Neue Liste Kein Filter ausgewählt! Bitte Filter oder Liste auswählen. Aufgabenname Priorität diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index bc33ea57c..fa7e59464 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -62,7 +62,6 @@ Πάντα Ταιριάζουν \'%s\' Νέο φίλτρο - Νέα λίστα Δεν επιλέχθηκε φίλτρο! Παρακαλώ επιλέξτε ενα φίλτρο η μια λίστα Όνομα καθήκοντος Προτεραιότητα diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index f46e6debc..f82359ea6 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -64,7 +64,6 @@ Siempre Coincidencias con \'%s\' Nuevo filtro - Nueva lista No hay filtro seleccionado! Por favor seleccione un filtro o lista. Nombre de la tarea Prioridad diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 6859f27f3..f1a986f13 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -21,7 +21,6 @@ Aina Sopivuus \'%s\' Uusi suodin - Uusi lista Suodatinta ei valittu! Valitse suodatin tai lista. Tehtävän nimi Etusija diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 5100da85a..e838166b6 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -64,7 +64,6 @@ Toujours Correspondant \'%s\' Nouveau filtre - Nouvelle liste Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste. Nom de la tâche Priorité diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 1dd46d3b4..0fcda4870 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -61,7 +61,6 @@ Sempre Confrontando \'%s\' Nuovo Filtro - Nuova lista Filtro non selezionato! Perfavore seleziona un filtro o una lista. Priorità Descrizione diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index c429bb738..ff4f69025 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -64,7 +64,6 @@ תמיד התאים ל\'%s\' מַסְנֵן חדש - רשימה חדשה לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה. שם המשימה עדיפות diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 4b3ba2b8f..7ffcc5862 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -64,7 +64,6 @@ 設定の保存 「%s」の検索結果 新しいフィルタ - 新しいリスト フィルターが選択されていません! フィルターかリストを選択してください. タスク名 優先順位 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 4803ef470..5a924adbd 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -67,7 +67,6 @@ 항상 정렬 \'%s\' 검색 중 새 필터 - 새 목록 필터를 선택하지 않았습니다! 필터나 목록을 선택하세요. 일정 이름 우선순위 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index b41f89b5d..e49aa90de 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -52,7 +52,6 @@ Alltid Matcher \'%s\' Nytt filter - Ny liste Oppgavesammendrag Viktighet Skjul frem til diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 957c019b6..235c386da 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -64,7 +64,6 @@ Altijd Bevat \'%s\' Nieuw Filter - Nieuwe lijst Geen filter geselecteerd! Selecteer een filter of lijst. Taak naam Prioriteit diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 5ecba74ca..cb47bad2a 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -64,7 +64,6 @@ Zawsze Pasujących do: %s Nowy filtr - Nowa lista Nie wybraon filtra! Wybierz filtr lub listę. Tytuł zadania Priorytet diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 74b3da4ab..7bc819564 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -63,7 +63,6 @@ Sempre Encontradas para \'%s\' Novo Filtro - Nova lista Sem filtro selecionado! Selecione um filtro ou lista. Nome da tarefa Prioridade diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 788202236..2a0de240e 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -66,7 +66,6 @@ Sempre Coincidente com %s Novo filtro - Nova lista Não selecionou o filtro! Selecione um filtro ou uma lista. Nome da tarefa Prioridade diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index e62bb2092..2ebb87a71 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -64,7 +64,6 @@ Всегда Соответствует \'%s\' Новый фильтр - Новый список Фильтры не выбраны! Пожалуйста, выберите фильтр или список Имя задачи Приоритет diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index ac602139c..87e28e5ce 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -64,7 +64,6 @@ Vždy Zodpovedá \'%s\' Nový filter - Nový zoznam Nieje vybraný filter! Prosím, zvoľ si filter, alebo zoznam. Názov úlohy Priorita diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 28e2a55ea..01235a5d0 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -67,7 +67,6 @@ Vedno Ujemanje za \'%s\' Nov filter - Nov seznam Noben filter ni izbran. Izberite filter ali seznam. Poimenovanje opravka Prioriteta diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 28545c308..676276443 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -64,7 +64,6 @@ Alltid Matchar \'%s\' Nytt filter - Ny lista Inget filter valt! Välj ett filter eller en lista. Uppgiftsnamn Prioritet diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 88455ed09..1a9b7e2f6 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -61,7 +61,6 @@ Her zaman \'%s\' ile eşleşenler Yeni Filtre - Yeni Liste Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin. Açıklama Ne kadar sürecek? diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 3b2fab4b8..7e87e42a6 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -67,7 +67,6 @@ Завжди Відповідності до %s Новий фільтр - Новий список Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список. Ім\'я завдання Пріоритет diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index f6a05a560..58cbdc045 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -61,7 +61,6 @@ 总是 比对 \'%s\' 新建过滤器 - 新建列表 还没有选定过滤器呢！请选择一个过滤器或列表呗。 描述 要花多久时间? diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index a54e3fdbf..e752de320 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -63,7 +63,6 @@ 總是 比對 \'%s\' 新建過濾器 - 新建列表 還沒有選定過濾器呢！請選擇一個過濾器或列表唄。 工作名稱 優先權 diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 6ee605f80..3fdedfc12 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -57,6 +57,7 @@ + diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml index 0e913e12c..9cf0e262d 100644 --- a/src/main/res/values/strings-core.xml +++ b/src/main/res/values/strings-core.xml @@ -133,9 +133,6 @@ New Filter - - New List - No filter selected! Please select a filter or list. diff --git a/src/main/res/values/strings-tags.xml b/src/main/res/values/strings-tags.xml index d9499bdc7..f761dbdd9 100644 --- a/src/main/res/values/strings-tags.xml +++ b/src/main/res/values/strings-tags.xml @@ -13,6 +13,8 @@ New List + + New tag Please enter a name for this list first! diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e49a73ed1..4d977ff78 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -67,6 +67,7 @@ @drawable/ic_label_black_24dp @drawable/ic_filter_list_black_24dp @drawable/ic_cloud_queue_black_24dp + @drawable/ic_add_black_24dp