From 4f999bf5fc7b47384ba0b355e8e76993c8f9b7bf Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 16 Jun 2015 14:41:13 -0500 Subject: [PATCH] MCA launches task edit screen --- .../astrid/calls/MissedCallActivity.java | 41 +++++-------------- 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-de/strings.xml | 1 - src/main/res/values-el/strings.xml | 1 - src/main/res/values-es/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-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-core.xml | 3 -- 25 files changed, 10 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java b/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java index 95067f1cd..70732ad49 100644 --- a/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java +++ b/src/main/java/com/todoroo/astrid/calls/MissedCallActivity.java @@ -22,8 +22,6 @@ import android.widget.TextView; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.reminders.SnoozeCallback; -import com.todoroo.astrid.reminders.SnoozeDialog; import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; @@ -31,6 +29,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.tasks.R; import org.tasks.injection.InjectingFragmentActivity; +import org.tasks.intents.TaskIntents; import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.BasicPreferences; import org.tasks.preferences.ResourceResolver; @@ -52,7 +51,6 @@ public class MissedCallActivity extends InjectingFragmentActivity { // Prompt user to ignore all missed calls after this many ignore presses private static final int IGNORE_PROMPT_COUNT = 3; - private static final String FRAG_TAG_SNOOZE_DIALOG = "frag_tag_snooze_dialog"; @Inject StartupService startupService; @Inject TaskService taskService; @@ -180,34 +178,15 @@ public class MissedCallActivity extends InjectingFragmentActivity { callLaterButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - final String taskTitle; - String dialogTitle; - if (TextUtils.isEmpty(name)) { - taskTitle = getString(R.string.MCA_task_title_no_name, number); - dialogTitle = getString(R.string.MCA_schedule_dialog_title, number); - } else { - taskTitle = getString(R.string.MCA_task_title_name, name, number); - dialogTitle = getString(R.string.MCA_schedule_dialog_title, name); - } - SnoozeDialog snoozeDialog = new SnoozeDialog(); - snoozeDialog.setTitle(dialogTitle); - snoozeDialog.setSnoozeCallback(new SnoozeCallback() { - @Override - public void snoozeForTime(long time) { - Task newTask = new Task(); - newTask.setTitle(taskTitle); - newTask.setDueDate(time); - taskService.save(newTask); - finish(); - } - }); - snoozeDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - finish(); - } - }); - snoozeDialog.show(getSupportFragmentManager(), FRAG_TAG_SNOOZE_DIALOG); + Task task = new Task() {{ + setTitle(TextUtils.isEmpty(name) + ? getString(R.string.MCA_task_title_no_name, number) + : getString(R.string.MCA_task_title_name, name, number)); + }}; + taskService.save(task); + TaskIntents + .getEditTaskStack(MissedCallActivity.this, null, task.getId()) + .startActivities(); } }); } diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 1c7b3eb86..82a246e81 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -125,7 +125,6 @@ Tasks ще ви уведомява за пропуснати повиквания и ще предлага да напомни да се обадите Обади се на %1$s на %2$s Обади се на %s - Обади се на %s в... Игнорирай Нуждаете се от списък за среща? Игнориране на всички събития в календара? diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 73c8357ac..716867b4c 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -112,7 +112,6 @@ Ignora només aquesta trucada Retorna la trucada a en/na %1$s a %2$s Retorna la trucada a %s - Retorna la trucada a %s en... Tasks: Paràmetres desactivat Aparença diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 64f8e56ee..a38323b0e 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -121,7 +121,6 @@ Tasks Vás upozorní na zmeškané hovory a připomene Vám, abyste zavolal zpět Zavolat %1$s zpět v %2$s Zavolat %s zpět - Zavolat %s zpět... Ignorovat Potřebujete seznam schůze? Ignorovat všechny události v kalendáři? diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 26adf2736..d6f3a7c29 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -122,7 +122,6 @@ Tasks wird Sie über versäumte Anrufe informieren und an Rückrufe erinnern %1$s unter %2$s zurückrufen %s zurückrufen - %s zurückrufen in ... Ablehnen Willst Du eine Besprechungsliste erstellen? Alle Kalendertermine ablehnen? diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 86d80da4c..bc33ea57c 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -119,7 +119,6 @@ Η εφαρμογή θα σας ενημερώσει για αναπάντητες κλήσεις και θα σας υπενθυμίσει για να τις απαντήσετε μετά Ξανακαλέστε %1$s στίς %2$s Ξανακαλέστε %s - Ξανακαλέστε %s σε... Αγνοήστε Χρειάζεστε λίστα για συνάντηση? Αγνόησή όλων των γεγονότων ημερολογίου; diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 4b0bedda9..f46e6debc 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -122,7 +122,6 @@ Tasks le notificará de las llamadas perdidas y le recordará que devuelva la llamada. Devolver la llamada a %1$s al %2$s Devolver la llamada a %s - Devolver la llamada a %s en... Ignorar ¿Necesita una lista de reuniones? ¿Ignorar todos los eventos del calendario? diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index e8aa2f066..5100da85a 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -120,7 +120,6 @@ Atrid vous avertira en cas d\'appels manqués et vous proposera de rappeler. Rappeler %1$s au %2$s Rappeler %s - Rappeler %s dans... Ignorer Besoin d\'une liste de réunion ? Ignorer tous les événements du calendrier ? diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 46018615c..1dd46d3b4 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -109,7 +109,6 @@ Tasks ti notificherà per le chiamate perse e ti offrirà di ricordarti di richiamare Richiama %1$s al %2$s Richiama %s - Richiama %s tra... Ignora Hai bisogno di una lista per le riunioni? Ignora tutti gli eventi del calendario? diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index f4b21350b..c429bb738 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -119,7 +119,6 @@ אסטריד תודיע לך על שיחות שלא נענו, ותציע להזכיר לך להחזיר שיחה. \"החזר שיחה ל־%1$s ב־%2$s\" החזר שיחה ל־%s - החזר שיחה ל־%s ב... התעלם צריך רשימה לפגישה? להתעלם מכל אירועי היומן? diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index d4a6ae3ff..4b3ba2b8f 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -123,7 +123,6 @@ Tasks は応答しなかった呼び出しを通知して折り返し連絡するようにリマインドします %1$s に %2$s 折り返し連絡 %s に折り返し連絡 - %s に折り返し連絡... 無視する ミーティングリストが必要ですか? すべてのカレンダーイベントを無視しますか? diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 62f993034..4803ef470 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -126,7 +126,6 @@ Tasks는 부재중 전화 내역과 이를 회신할 수 있도록 알려줍니다 %1$s 님에게 %2$s 에 다시 연락하세요 %s 님에게 다시 연락하세요 - %s 님에게 다시 연락하세요... 무시하기 모임 목록이 필요하세요? 모든 달력 이벤트를 무시할까요? diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index e9871d77b..957c019b6 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -121,7 +121,6 @@ Tasks zal gemiste oproepen laten zien en een herinnering weergeven om terug te bellen Bel %1$s terug op %2$s Bel %s terug - Bel %s terug over... Negeren Heb je een bijeenkomst lijst nodig? Alle agenda gebeurtenissen negeren? diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 5d3c5b291..5ecba74ca 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -120,7 +120,6 @@ Tasks będzie powiadamiał Cię o nieodebranych połączeniach i przypomni Ci o oddzwonieniu. Oddzwoń do %1$s o %2$s Oddzwoń do %s - Oddzwoń do %s za... Ignoruj Czy potrzebujesz listy spotkań? Ignorować wszystke wydarzenia w kalendarzu? diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 3c4ffec45..74b3da4ab 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -119,7 +119,6 @@ Tasks notificará sobre chamadas perdidas e oferecerá para lhe lembrar para ligar de volta Retornar ligação de %1$s às %2$s Retornar ligação de %s - Retornar ligação de %s em ... Ignorar Precisa de uma lista de reuniões? Ignorar todos os eventos do calendário? diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 0a140e658..788202236 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -124,7 +124,6 @@ O Tasks irá notificar sobre as chamadas perdidas e lembrar-lhe para fazer as ligações Ligar a %1$s às %2$s Ligar a %s - Ligar a %s em... Ignorar Precisa de uma lista de encontros? Ignorar todos os eventos do calendário? diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 1b80898b3..3ce79d7ab 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -123,7 +123,6 @@ Tasks будет уведомлять вас о пропущенных звонках и предложит вам перезвонить Перезвонить %1$s в %2$s Перезвонить %s - Перезвонить %s в... Игнорировать Необходим список встреч? Пропустить все события календаря? diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 6e1524a7b..ac602139c 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -123,7 +123,6 @@ Tasks ťa upozorní na zmeškané hovory a ponúkne ti pripomienku na zavolanie späť Zavolať %1$s späť o %2$s Zavolať %s späť - Zavolať %s späť na... Ignorovať Potrebuješ zoznam na stretnutie? Ignorovať všetky udalosti kalendára? diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index db9257ca8..28e2a55ea 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -123,7 +123,6 @@ Aplikacija Opravki vas bo obvestila o zgrešenih klicih in ponudila opomnik za vrnitev klicev %1$s pokliči nazaj ob %2$s Vrni klic %s - Pokliči nazaj %s čez... Ignoriraj Potrebujete seznam sestankov? Naj ignoriram vse dogodke na koledarju? diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index d1de9f2ca..28545c308 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -120,7 +120,6 @@ Tasks meddelar dig om missade samtal och ger dig möjligheten att få påminnelse om att ringa tillbaka Ring %1$s tillbaka kl %2$s Ring %s tillbaka - Ring %s tillbaka om... Ignorera Behöver du en lista över möten? Ignorera alla händelser i kalender? diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 4f42dcfa3..88455ed09 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -108,7 +108,6 @@ Tasks cevapsız çağrıları size bildirecek ve geri aramanız için hatırlatacak %1$s kişisini geri ara: %2$s %s kişisini geri ara - %s kişisini geri ara.. Yoksay Bir toplantı listesine mi ihtiyacınız var? Tüm takvim etkinlikleri yok sayılsın mı? diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 0588b2f55..3b2fab4b8 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -123,7 +123,6 @@ Tasks буде повідомляти вас про пропущені дзвінки і запропонує вам передзвонити Перетелефонувати %1$s о %2$s Перетелефонувати %s - Перетелефонувати %s через... Ігнорувати Потрібен список для зустрічі? Ігнорувати всі події календаря? diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 56a655db4..f6a05a560 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -108,7 +108,6 @@ 清单小助理会向您报告未接电话，还会提供回电的提醒 请回电给 %1$s，电话是 %2$s 请回电给 %s - 请给 %s 回个电话过去…… 忽略 需要会议列表？ 忽略所有日历事件？ diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index f701025fd..a54e3fdbf 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -118,7 +118,6 @@ Tasks 會向您報告未接電話，還會提供回電的提醒 請回電給 %1$s，電話是 %2$s 請回電給 %s - 請給 %s 回個電話過去…… 忽略 需要一個會議列表嗎？ 要忽略所有月曆上的事件嗎？ diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml index f82a48b97..0e913e12c 100644 --- a/src/main/res/values/strings-core.xml +++ b/src/main/res/values/strings-core.xml @@ -271,9 +271,6 @@ Call %s back - - Call %s back in... -