From 34508ab6d1b54752921240dfd88b3f412d0bac0b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 26 Mar 2015 17:29:22 -0500 Subject: [PATCH] Move alarm control set to main edit screen --- .../astrid/alarms/AlarmControlSet.java | 2 +- .../todoroo/astrid/ui/ReminderControlSet.java | 32 +-- src/main/res/layout/alarm_edit_row.xml | 66 ++---- src/main/res/layout/control_set_alarms.xml | 63 ++---- src/main/res/layout/control_set_reminders.xml | 35 +++- .../layout/control_set_reminders_dialog.xml | 193 +++++++++--------- src/main/res/values-bg-rBG/strings.xml | 2 - src/main/res/values-ca/strings.xml | 2 - src/main/res/values-cs/strings.xml | 2 - src/main/res/values-da/strings.xml | 2 - src/main/res/values-de/strings.xml | 2 - src/main/res/values-el/strings.xml | 2 - src/main/res/values-es/strings.xml | 2 - src/main/res/values-fr/strings.xml | 2 - src/main/res/values-it/strings.xml | 2 - src/main/res/values-iw/strings.xml | 2 - src/main/res/values-ja/strings.xml | 2 - src/main/res/values-ko/strings.xml | 2 - src/main/res/values-nb/strings.xml | 2 - src/main/res/values-nl/strings.xml | 2 - src/main/res/values-pl/strings.xml | 2 - src/main/res/values-pt-rBR/strings.xml | 2 - src/main/res/values-pt/strings.xml | 2 - src/main/res/values-ru/strings.xml | 2 - src/main/res/values-sl-rSI/strings.xml | 2 - src/main/res/values-sv/strings.xml | 2 - src/main/res/values/strings-alarms.xml | 10 - src/main/res/values/strings.xml | 1 + 28 files changed, 168 insertions(+), 274 deletions(-) delete mode 100644 src/main/res/values/strings-alarms.xml diff --git a/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java b/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java index 306445567..c0e555c61 100644 --- a/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -51,7 +51,7 @@ public final class AlarmControlSet extends TaskEditControlSetBase { } @Override - protected void readFromTaskOnInitialize() { + public void readFromTaskOnInitialize() { alertsContainer.removeAllViews(); alarmService.getAlarms(model.getId(), new Callback() { @Override diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 5432fa5f9..52b0748d5 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -23,9 +23,6 @@ import com.todoroo.astrid.data.Task; import org.tasks.R; import org.tasks.preferences.ActivityPreferences; -import java.util.ArrayList; -import java.util.List; - /** * Control set dealing with reminder settings * @@ -36,30 +33,17 @@ public class ReminderControlSet extends PopupControlSet { private CheckBox during, after; private Spinner mode; private TextView modeDisplay; - private LinearLayout remindersBody; - private final List extraViews; private final TextView label; private RandomReminderControlSet randomControlSet; private AlarmControlSet alarmControl; - private final AlarmService alarmService; - private TaskEditFragment taskEditFragment; public ReminderControlSet(ActivityPreferences preferences, AlarmService alarmService, TaskEditFragment taskEditFragment) { super(preferences, taskEditFragment.getActivity(), R.layout.control_set_reminders_dialog, R.layout.control_set_reminders, R.string.TEA_reminders_group_label); - this.alarmService = alarmService; - this.taskEditFragment = taskEditFragment; - extraViews = new ArrayList<>(); label = (TextView) getDisplayView().findViewById(R.id.display_row_edit); - } - - public void addViewToBody(View v) { - if (remindersBody != null) { - remindersBody.addView(v, 0); - } else { - extraViews.add(v); - } - + alarmControl = new AlarmControlSet(alarmService, taskEditFragment); + LinearLayout reminderRow = (LinearLayout) getDisplayView().findViewById(R.id.reminder_row); + reminderRow.addView(alarmControl.getView()); } public void setValue(int flags) { @@ -110,14 +94,6 @@ public class ReminderControlSet extends PopupControlSet { }); randomControlSet = new RandomReminderControlSet(activity, getView(), -1); - alarmControl = new AlarmControlSet(alarmService, taskEditFragment); - alarmControl.readFromTask(model); - - remindersBody = (LinearLayout) getView().findViewById(R.id.reminders_body); - remindersBody.addView(alarmControl.getView()); - while (extraViews.size() > 0) { - addViewToBody(extraViews.remove(0)); - } String[] list = new String[] { activity.getString(R.string.TEA_reminder_mode_once), @@ -221,5 +197,7 @@ public class ReminderControlSet extends PopupControlSet { label.setText(R.string.TEA_reminders_group_label); label.setTextColor(unsetColor); } + + alarmControl.readFromTask(model); } } diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml index 4ee138d28..1b9c4c748 100644 --- a/src/main/res/layout/alarm_edit_row.xml +++ b/src/main/res/layout/alarm_edit_row.xml @@ -1,52 +1,24 @@ - - - - - - - - - + android:paddingBottom="@dimen/task_edit_padding_top_bottom" + android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" > + + + + diff --git a/src/main/res/layout/control_set_alarms.xml b/src/main/res/layout/control_set_alarms.xml index 54fd59c70..be444c5e5 100644 --- a/src/main/res/layout/control_set_alarms.xml +++ b/src/main/res/layout/control_set_alarms.xml @@ -1,47 +1,28 @@ - - - - - - - - - - - - - + + + + + + diff --git a/src/main/res/layout/control_set_reminders.xml b/src/main/res/layout/control_set_reminders.xml index f2faaa2c1..892b270ba 100644 --- a/src/main/res/layout/control_set_reminders.xml +++ b/src/main/res/layout/control_set_reminders.xml @@ -21,18 +21,31 @@ android:layout_width="fill_parent" android:layout_height="wrap_content"> - + android:orientation="vertical"> + + + + + + diff --git a/src/main/res/layout/control_set_reminders_dialog.xml b/src/main/res/layout/control_set_reminders_dialog.xml index c4aa5c06d..338fd01d0 100644 --- a/src/main/res/layout/control_set_reminders_dialog.xml +++ b/src/main/res/layout/control_set_reminders_dialog.xml @@ -1,102 +1,101 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 11242a570..9055f3b81 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -12,8 +12,6 @@ Списък Въведете името на списъка Изберете Google акаунт, който искате да използвате: - Аларми - Добави Аларма Резервни копия Импортиране на задачи Експортиране на задачи diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index f4ea5d4fb..0665b92d3 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -12,8 +12,6 @@ Llista Escriviu el nom de la llista Trieu el compte de Google que vulgueu utilitzar: - Alarmes - Afegeix una alarma Còpies de seguretat Importa tasques Exporta tasques diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 6bfb416f8..b3de81888 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -12,8 +12,6 @@ Název listu: Název seznamu Vyberte, který účet Google chcete použít: - Alarmy - Přidat alarm Zálohy Importovat úkoly Exportovat úkoly diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 7d9ffd020..96d2cee37 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -11,8 +11,6 @@ Tilføj en kommentar Listenavn Vælg den Google-konto du vil anvende: - Alarmer - Tilføj en alarm Backup Importér opgaver Eksportér opgaver diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 732f73b69..01bc2cdef 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -12,8 +12,6 @@ Liste Vergebe einen Listennamen Wählen Sie den zu verwendenden Google-Account aus: - Alarme - Einen Alarm hinzufügen Aufgaben importieren Aufgaben exportieren Gesichert von %1$s bis %2$s. diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index d60277501..83bc9c2f1 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -11,8 +11,6 @@ Λίστα Εισάγετε ένα όνομα για την λίστα Επιλέξτε τον λογαριασμό Google που θέλετε να χρησιμοποιήσετε: - Ξυπνητήρια - Προσθήκη ξυπνητηριού Αντίγραφα ασφαλείας Εισαγωγή εργασιών Εξαγωγή εργασιών diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index f101b2968..aa42fe9ab 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -12,8 +12,6 @@ Lista Indique nombre de lista Seleccione la cuenta de Google que desea usar: - Alarmas - Añadir una alarma Copias de seguridad Importar tareas Exportar tareas diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 69878407d..61bf3808b 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -12,8 +12,6 @@ Nom de la liste : Entrez un nom de liste Sélectionnez le compte Google que vous voulez utiliser : - Alarmes - Ajouter une alarme Sauvegardes Importer des tâches Exporter des tâches diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 5a44b543d..7361866f7 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -12,8 +12,6 @@ Lista Inserisci il nome della lista Seleziona l\'account Google che vuoi utilizzare: - Promemoria - Aggiungi un promemoria Salvataggi Importa compiti Esporta compiti diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 0ae0acaf6..951ebbb82 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -12,8 +12,6 @@ רשימה הכנס שם רשימה בחר חשבון גוגל - התראות - הוסף התראה גיבויים ייבוא משימות ייצוא משימות diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 6373a1a23..91c495a49 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -12,8 +12,6 @@ リスト リスト名を記入してください 使用したいGoogleアカウントを選択してください: - アラーム - アラームを追加する バックアップ タスクのインポート タスクのエクスポート diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index c19de0ed7..801a819a6 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -12,8 +12,6 @@ 목록 목록 이름을 입력하세요 사용하려는 구글 계정을 선택해 주십시오: - 알람 - 알람 추가 백업 일정 가져오기 일정 내보내기 diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index 1a2d589f3..65a228afc 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -5,8 +5,6 @@ - Varsler - Legg til nytt varsel Sikkerhetskopier Importer oppgaver Eksporter oppgaver diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index b31eaa3fc..4b89b6948 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -12,8 +12,6 @@ Lijst Geef de lijst een naam Selecteer de Google account die je wil gebruiken: - Herinneringen - Voeg Herinnering toe Back-ups Taken importeren Taken exporteren diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 99f41abe8..0fafe162a 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -12,8 +12,6 @@ Lista Podaj nazwę listy Wybierz konto Google, którego chcesz użyć: - Alarmy - Dodaj alarm Kopie zapasowe Importuj zadania Eksportuj zadania diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 79d39aea0..caa6e6720 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -12,8 +12,6 @@ Lista Entre com o nome da lista Selecione a conta do Google que deseja usar: - Alarmes - Inserir alarme Importar tarefas Exportar tarefas Backups feitos: de %1$s para %2$s. diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 3cb65b7d7..236376abd 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -12,8 +12,6 @@ Lista Escreva o nome da lista Escolha a conta Google a utilizar: - Alarmes - Adicionar alarme Importar tarefas Exportar tarefas Backup de %1$s para %2$s. diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index f530d8290..3a9afb0c4 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -12,8 +12,6 @@ Список Введите имя списка Выберите аккаунт Google, который вы хотите использовать: - Напоминания - Добавить напоминание Резервные копии Импортировать задачи Экспортировать задачи diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index fb8dc9fb9..51e2dd4bc 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -12,8 +12,6 @@ Seznam Vnesi ime seznama Izberite želeni Google račun: - Glasna opozorila - Dodaj glasno opozorilo Varnostne kopije Uvozi opravke Izvozi opravke diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 3ff65d2ca..78fcf8c78 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -12,8 +12,6 @@ Lista Ange listnamn Välj vilket Googlekonto du vill använda: - Alarm - Lägg till ett alarm Säkerhetskopior Importera uppgifter Exportera uppgifter diff --git a/src/main/res/values/strings-alarms.xml b/src/main/res/values/strings-alarms.xml deleted file mode 100644 index 92c2104e5..000000000 --- a/src/main/res/values/strings-alarms.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Alarms - - - Add an Alarm - - diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b387f776d..15c219643 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -93,6 +93,7 @@ Select amount Notification Actions Show snooze and complete actions in notification + Add a reminder