From e545c7fa327e64362630bc16ac0e9af346651251 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 7 Jan 2016 14:36:58 -0600 Subject: [PATCH] Add clear button to repeat control set --- .../astrid/repeats/RepeatControlSet.java | 37 +++++++++---------- .../todoroo/astrid/ui/PopupControlSet.java | 7 ---- .../res/layout/control_set_repeat_display.xml | 35 +++++++++++++----- src/main/res/values-ar/strings.xml | 1 - src/main/res/values-bg-rBG/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-fa/strings.xml | 1 - src/main/res/values-fi/strings.xml | 1 - src/main/res/values-fr/strings.xml | 1 - src/main/res/values-hu/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/strings.xml | 2 - 32 files changed, 42 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 6e5f92bdd..1abe6121e 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.repeats; import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup.LayoutParams; @@ -18,6 +17,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -77,6 +77,7 @@ public class RepeatControlSet extends PopupControlSet { private Spinner interval; private Spinner type; private Spinner repeatUntil; + private ImageView clear; private ArrayAdapter repeatUntilAdapter; private final List repeatUntilOptions = new ArrayList<>(); private LinearLayout daysOfWeekContainer; @@ -87,7 +88,6 @@ public class RepeatControlSet extends PopupControlSet { private int intervalValue; private long repeatUntilValue; - private final List listeners = new LinkedList<>(); public interface RepeatChangedListener { @@ -98,6 +98,8 @@ public class RepeatControlSet extends PopupControlSet { public RepeatControlSet(ActivityPreferences preferences, Activity activity, DialogBuilder dialogBuilder) { super(preferences, activity, R.layout.control_set_repeat, R.layout.control_set_repeat_display, R.string.repeat_enabled, dialogBuilder); + + clear = (ImageView) getView().findViewById(R.id.clear); } /** Set up the repeat value button */ @@ -270,7 +272,18 @@ public class RepeatControlSet extends PopupControlSet { repeatUntil.setAdapter(repeatUntilAdapter); setRepeatValue(1); setRepeatUntilValue(0); + clear.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + doRepeat = false; + refreshDisplayView(); + dialog.dismiss(); + for (RepeatChangedListener l : listeners) { + l.repeatChanged(doRepeat); + } + } + }); // set up days of week DateFormatSymbols dfs = new DateFormatSymbols(); Calendar calendar = Calendar.getInstance(); @@ -404,9 +417,11 @@ public class RepeatControlSet extends PopupControlSet { if (doRepeat) { repeatDisplay.setText(getRepeatString()); repeatDisplay.setTextColor(themeColor); + clear.setVisibility(View.VISIBLE); } else { repeatDisplay.setTextColor(unsetColor); repeatDisplay.setText(R.string.repeat_never); + clear.setVisibility(View.GONE); } } @@ -440,24 +455,6 @@ public class RepeatControlSet extends PopupControlSet { return super.buildDialog(title, doRepeatButton, cancelListener); } - @Override - protected void additionalDialogSetup(AlertDialog.Builder builder) { - super.additionalDialogSetup(builder); - - builder.setNeutralButton(R.string.repeat_dont, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - doRepeat = false; - refreshDisplayView(); - dialog.dismiss(); - - for (RepeatChangedListener l : listeners) { - l.repeatChanged(doRepeat); - } - } - }); - } - private void updateRepeatUntilOptions() { repeatUntilOptions.clear(); if (repeatUntilValue > 0) { diff --git a/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java b/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java index bac96c430..d82211493 100644 --- a/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java @@ -84,8 +84,6 @@ public abstract class PopupControlSet extends TaskEditControlSetBase { } }) .setOnCancelListener(cancelClickListener); - - additionalDialogSetup(builder); dialog = builder.show(); return dialog; } @@ -102,11 +100,6 @@ public abstract class PopupControlSet extends TaskEditControlSetBase { }; } - protected void additionalDialogSetup(AlertDialog.Builder builder) { - // Will be called after dialog is set up. - // Subclasses can override - } - protected void onOkClick() { refreshDisplayView(); } diff --git a/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml index 419a59a2a..6d253dc47 100644 --- a/src/main/res/layout/control_set_repeat_display.xml +++ b/src/main/res/layout/control_set_repeat_display.xml @@ -1,15 +1,30 @@ - + android:orientation="horizontal"> + + + + + + + + + + \ 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 6cc59bde4..9470350e7 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -148,7 +148,6 @@ شهري مرتين في الشهر - لا تكرر أيام أسابيع diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 22fc7eeb4..abeb97612 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -260,7 +260,6 @@ Всеки %d Интервал на повторение Без повторение - Не повтаряй Ден(дни) Седмица(и) diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index c7563df0c..d76dd95cd 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -225,7 +225,6 @@ Každý %d Opakovací interval Bez opakování - Neopakujte Dnů Týdnů diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index f51700575..9ed16bc98 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -124,7 +124,6 @@ Hver %d Interval for gentagelse Gentages ikke - Gentag ikke Hver %s Hver %1$s\nindtil %2$s Gentag uendeligt diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index ca3f65103..64ad6ab78 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -240,7 +240,6 @@ Jeden %d Wiederholungsintervall Nicht wiederholen - Nicht wiederholen Tag(e) Woche(n) diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 2728e7308..a87a5e306 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -228,7 +228,6 @@ Κάθε %d Διάστημα επανάληψης Μή επαναλαμβανόμενα - Να μήν επαναληφθεί Μέρα(ες) Εβδομαδα(ές) diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 5ec7a5e92..cd7f3c707 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -250,7 +250,6 @@ Cada %d Intervalo de repetición Sin repetir - No repetir Día(s) Semana(s) diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index 0f8b06b50..345c6c1b2 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -181,7 +181,6 @@ تکرارها دوره تکرار بدون تکرار - تکرار نشود روز(ها) هفته(ها) diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index d0c9dda65..92c249f43 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -58,7 +58,6 @@ Toista %d Toistoväli Ei toistuva - Älä toista Joka %s Joka %1$s\nkunnes %2$s Toista loputtomiin diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 6d3446876..9277e3c5e 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -252,7 +252,6 @@ Tous les %d Interval de répétition Une fois seulement - Ne pas répéter Jour(s) Semaine(s) diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 0903c5375..80a382313 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -105,7 +105,6 @@ Minden %d Ismétlési időköz Nem ismétlődő - Ne legyen ismétlés Minden %s Minden %1$s\neddig: %2$s Ismétlés örökké diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 63a10b14a..07c8ebb71 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -253,7 +253,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Ogni %d Intervallo di ripetizione Non ricorrente - Non ripetere Giorno(i) Settimana(e) diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 2595841c2..3c5d53f61 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -227,7 +227,6 @@ חזרה כל %d אינטרוול חזרות - ללא חזרות יום/ימים שבוע/(ות) diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 43de7b537..36f6605b9 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -259,7 +259,6 @@ %d 毎 繰り返し間隔 繰り返しなし - 繰り返ししない 日毎 週毎 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 0d716abbf..7b5790318 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -260,7 +260,6 @@ Tasks의 백업에서 당신의 일정을 복구하시기 바랍니다. 매 %d 반복 주기 반복하지 않기 - 반복하지 않기 일마다 주마다 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index d0db446b7..4634a1c4b 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -113,7 +113,6 @@ Gjentakelser Hver %d Gjentakelsesintervall - Ikke gjenta Hver %s Tidtaker aktiv for %s! Oppgaver med tidtaker diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 4802843ac..a38cb72fd 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -256,7 +256,6 @@ Elke %d Herhaal interval Niet herhalend - Niet herhalen Dag(en) week/weken diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 0343ec3d3..fd725a6fe 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -231,7 +231,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Co %d Odstęp powtarzania Jednorazowo - Nie powtarzaj Dzień/Dni Tydzień/Tygodni(e) diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 494691145..1f133adc6 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -228,7 +228,6 @@ A cada %d Intervalo de repetição Não repetir - Não repetir Dia(s) Semana(s) diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 524f83145..035609753 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -251,7 +251,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& Cada %d Intervalo de repetição Não repete - Não repete Dia(s) Semana(s) diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 3fd0d1088..9637d16f5 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -258,7 +258,6 @@ С интервалом в %d Интервал повтора Без повторений - Не повторять День(дней) Неделя(ль) diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index eb578ccfa..1b5ab8b63 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -244,7 +244,6 @@ Každý %d Interval opakovania Neopakovať - Neopakovať Deň Týždeň diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index 6ae824b3d..0a9995563 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -232,7 +232,6 @@ Vsakih %d Pogostost ponovitev Brez ponovitev - Ne ponovi Dan/dni V tednih diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index d8debebc2..f9a18e512 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -223,7 +223,6 @@ och återställer dina aktuella uppgifter från en backup Varje %d Upprepningsintervall Inte upprepande - Upprepa inte Dag(ar) Vecka (veckor) diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index cba8e4ad2..c149dd209 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -202,7 +202,6 @@ Tekrarlar Her %d Yineleme Aralığı - Yineleme Yapma Gün Hafta diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index f4958277d..eb9849f10 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -244,7 +244,6 @@ З інтервалом в %d Інтервал повторення Не повторювати - Не повторювати З інтервалом в %s Кожні %1$s\nпоки %2$s Повторювати завжди diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 867bd5609..f459e54de 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -181,7 +181,6 @@ 重复 每 %d 重复间隔 - 不重复 星期 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 095c4ee62..de29c9d69 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -212,7 +212,6 @@ 重複 每 %d 重複間隔 - 不重複 星期 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 959fb380e..d5c945812 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -707,8 +707,6 @@ File %1$s contained %2$s.\n\n Not repeating - - Don\'t repeat