From e0f17708b07ee1050893032e65ceb718edb5df64 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 7 Jan 2016 11:15:38 -0600 Subject: [PATCH] Use radio buttons for importance control set --- .../astrid/activity/TaskEditFragment.java | 4 +- .../java/com/todoroo/astrid/data/Task.java | 4 +- .../astrid/ui/EditTitleControlSet.java | 2 +- .../astrid/ui/ImportanceControlSet.java | 152 ------------------ .../java/org/tasks/ui/PriorityControlSet.java | 100 ++++++++++++ .../importance_background_selected.xml | 15 -- .../res/layout/control_set_importance.xml | 24 --- src/main/res/layout/control_set_priority.xml | 50 ++++++ src/main/res/values-ar/strings.xml | 5 - src/main/res/values-bg-rBG/strings.xml | 6 - src/main/res/values-cs/strings.xml | 6 - src/main/res/values-de/strings.xml | 6 - src/main/res/values-el/strings.xml | 6 - src/main/res/values-es/strings.xml | 6 - src/main/res/values-fa/strings.xml | 5 - src/main/res/values-fr/strings.xml | 6 - src/main/res/values-it/strings.xml | 6 - src/main/res/values-iw/strings.xml | 6 - src/main/res/values-ja/strings.xml | 6 - src/main/res/values-ko/strings.xml | 6 - src/main/res/values-nl/strings.xml | 6 - src/main/res/values-pl/strings.xml | 6 - src/main/res/values-pt-rBR/strings.xml | 6 - src/main/res/values-pt/strings.xml | 6 - src/main/res/values-ru/strings.xml | 6 - src/main/res/values-sk/strings.xml | 6 - src/main/res/values-sl-rSI/strings.xml | 6 - src/main/res/values-sv/strings.xml | 6 - src/main/res/values-tr/strings.xml | 6 - src/main/res/values-uk/strings.xml | 6 - src/main/res/values-v21/styles.xml | 3 + src/main/res/values-zh-rCN/strings.xml | 6 - src/main/res/values-zh-rTW/strings.xml | 6 - src/main/res/values/arrays.xml | 7 + src/main/res/values/attrs.xml | 1 - src/main/res/values/colors.xml | 2 - src/main/res/values/strings.xml | 12 +- src/main/res/values/styles.xml | 12 ++ src/main/res/values/styles_dark.xml | 1 - src/main/res/values/styles_light.xml | 1 - 40 files changed, 179 insertions(+), 353 deletions(-) delete mode 100644 src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java create mode 100644 src/main/java/org/tasks/ui/PriorityControlSet.java delete mode 100644 src/main/res/drawable/importance_background_selected.xml delete mode 100644 src/main/res/layout/control_set_importance.xml create mode 100644 src/main/res/layout/control_set_priority.xml diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index f3e766400..359a5077d 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -62,7 +62,6 @@ import com.todoroo.astrid.ui.CheckableImageView; import com.todoroo.astrid.ui.DescriptionControlSet; import com.todoroo.astrid.ui.EditTitleControlSet; import com.todoroo.astrid.ui.HideUntilControlSet; -import com.todoroo.astrid.ui.ImportanceControlSet; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.ui.ReminderControlSet; import com.todoroo.astrid.utility.Flags; @@ -81,6 +80,7 @@ import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.PermissionRequestor; import org.tasks.ui.DeadlineControlSet; import org.tasks.ui.MenuColorizer; +import org.tasks.ui.PriorityControlSet; import java.io.File; import java.util.ArrayList; @@ -366,7 +366,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { controls.add(deadlineControl); controls.add(gcalControl); - ImportanceControlSet importanceControl = new ImportanceControlSet(getActivity()); + PriorityControlSet importanceControl = new PriorityControlSet(getActivity()); controls.add(importanceControl); importanceControl.addListener(editTitle); controlSetMap.put(getString(R.string.TEA_ctrl_importance_pref), diff --git a/src/main/java/com/todoroo/astrid/data/Task.java b/src/main/java/com/todoroo/astrid/data/Task.java index 36d579a36..ba0ebf83b 100644 --- a/src/main/java/com/todoroo/astrid/data/Task.java +++ b/src/main/java/com/todoroo/astrid/data/Task.java @@ -155,9 +155,7 @@ public class Task extends RemoteModel { r.getColor(R.color.importance_1), r.getColor(R.color.importance_2), r.getColor(R.color.importance_3), - r.getColor(R.color.importance_4), - r.getColor(R.color.importance_5), - r.getColor(R.color.importance_6), + r.getColor(R.color.importance_4) }; } diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java index 1673e7eac..8ecf138b1 100644 --- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -21,9 +21,9 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.repeats.RepeatControlSet.RepeatChangedListener; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.ui.ImportanceControlSet.ImportanceChangedListener; import org.tasks.ui.CheckBoxes; +import org.tasks.ui.PriorityControlSet.ImportanceChangedListener; /** * Control set for mapping a Property to an EditText diff --git a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java deleted file mode 100644 index 007a226e3..000000000 --- a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - * Copyright (c) 2012 Todoroo Inc - * - * See the file "LICENSE" for the full license governing this code. - */ -package com.todoroo.astrid.ui; - -import android.app.Activity; -import android.util.DisplayMetrics; -import android.view.View; -import android.view.ViewGroup.LayoutParams; -import android.widget.CompoundButton; -import android.widget.LinearLayout; -import android.widget.ToggleButton; - -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.helper.TaskEditControlSetBase; - -import org.tasks.R; - -import java.util.LinkedList; -import java.util.List; - -import static org.tasks.preferences.ResourceResolver.getResource; - -/** - * Control Set for setting task importance - * - * @author Tim Su - * - */ -public class ImportanceControlSet extends TaskEditControlSetBase { - private final List buttons = new LinkedList<>(); - private final int[] colors; - private final List listeners = new LinkedList<>(); - - private static final int TEXT_SIZE = 18; - - public interface ImportanceChangedListener { - void importanceChanged(int i); - } - - public ImportanceControlSet(Activity activity) { - super(activity, R.layout.control_set_importance); - colors = Task.getImportanceColors(activity.getResources()); - } - - public void setImportance(Integer i) { - for(CompoundButton b : buttons) { - if(b.getTag() == i) { - b.setChecked(true); - b.setBackgroundResource(getResource(activity, R.attr.importance_background_selected)); - } else { - b.setChecked(false); - b.setBackgroundResource(0); - } - } - - for (ImportanceChangedListener l : listeners) { - l.importanceChanged(i); - } - } - - public Integer getImportance() { - for(CompoundButton b : buttons) { - if (b.isChecked()) { - return (Integer) b.getTag(); - } - } - return null; - } - - public void addListener(ImportanceChangedListener listener) { - listeners.add(listener); - } - - @Override - protected void afterInflate() { - LinearLayout container = (LinearLayout) getView().findViewById(R.id.importance_container); - - int min = Task.IMPORTANCE_MOST; - int max = Task.IMPORTANCE_LEAST; - - DisplayMetrics metrics = new DisplayMetrics(); - activity.getWindowManager().getDefaultDisplay().getMetrics(metrics); - - for(int i = max; i >= min; i--) { - final ToggleButton button = new ToggleButton(activity); - LinearLayout.LayoutParams params; - - int dimension = 25; - params = new LinearLayout.LayoutParams((int) (metrics.density * dimension), (int) (metrics.density * dimension)); - button.setLayoutParams(params); - - StringBuilder label = new StringBuilder(); - if (i == max) { - label.append('\u25CB'); - } - for(int j = Task.IMPORTANCE_LEAST - 1; j >= i; j--) { - label.append('!'); - } - - button.setTextColor(colors[i]); - button.setTextOff(label); - button.setTextOn(label); - button.setPadding(0, 1, 0, 0); - - button.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - setImportance((Integer)button.getTag()); - } - }); - button.setTag(i); - button.setTextSize(TEXT_SIZE); - - buttons.add(button); - - View padding = new View(activity); - LinearLayout.LayoutParams paddingParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, 0); - paddingParams.weight = 1.0f; - padding.setLayoutParams(paddingParams); - container.addView(padding); - container.addView(button); - } - } - - @Override - public void readFromTask(Task task) { - super.readFromTask(task); - setImportance(model.getImportance()); - } - - @Override - public int getIcon() { - return R.drawable.ic_flag_24dp; - } - - // Same as above because we need the setImportance listeners to fire even in - // the case when the UI hasn't been created yet - @Override - protected void readFromTaskOnInitialize() { - setImportance(model.getImportance()); - } - - @Override - protected void writeToModelAfterInitialized(Task task) { - if(getImportance() != null) { - task.setImportance(getImportance()); - } - } -} diff --git a/src/main/java/org/tasks/ui/PriorityControlSet.java b/src/main/java/org/tasks/ui/PriorityControlSet.java new file mode 100644 index 000000000..4ffc50cae --- /dev/null +++ b/src/main/java/org/tasks/ui/PriorityControlSet.java @@ -0,0 +1,100 @@ +package org.tasks.ui; + +import android.app.Activity; +import android.content.res.ColorStateList; +import android.support.v7.widget.AppCompatRadioButton; +import android.view.View; +import android.widget.RadioGroup; + +import com.google.common.primitives.Ints; +import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.helper.TaskEditControlSetBase; + +import org.tasks.R; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +public class PriorityControlSet extends TaskEditControlSetBase { + + private final List colors; + private final List listeners = new LinkedList<>(); + private RadioGroup radioGroup; + + public interface ImportanceChangedListener { + void importanceChanged(int i); + } + + public PriorityControlSet(Activity activity) { + super(activity, R.layout.control_set_priority); + colors = Ints.asList(Task.getImportanceColors(activity.getResources())); + Collections.reverse(colors); + } + + public void notifyImportanceChange(Integer i) { + for (ImportanceChangedListener l : listeners) { + l.importanceChanged(i); + } + } + + private Integer getImportance(int checkedId) { + return getImportance(getView().findViewById(checkedId)); + } + + private Integer getImportance(View view) { + return Integer.parseInt((String) view.getTag()); + } + + public void addListener(ImportanceChangedListener listener) { + listeners.add(listener); + } + + @Override + protected void afterInflate() { + final View view = getView(); + radioGroup = (RadioGroup) view.findViewById(R.id.importance_group); + radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + notifyImportanceChange(getImportance(checkedId)); + } + }); + for (int i = 0; i < radioGroup.getChildCount(); i++) { + AppCompatRadioButton radioButton = (AppCompatRadioButton) radioGroup.getChildAt(i); + radioButton.setSupportButtonTintList(new ColorStateList(new int[][]{ + new int[]{-android.R.attr.state_checked}, new int[]{android.R.attr.state_checked}}, + new int[]{colors.get(i), colors.get(i)})); + } + } + + @Override + public void readFromTask(Task task) { + super.readFromTask(task); + setSelected(model.getImportance()); + } + + @Override + public int getIcon() { + return R.drawable.ic_flag_24dp; + } + + @Override + protected void readFromTaskOnInitialize() { + setSelected(model.getImportance()); + } + + private void setSelected(int importance) { + for (int i = 0; i < radioGroup.getChildCount(); i++) { + AppCompatRadioButton radioButton = (AppCompatRadioButton) radioGroup.getChildAt(i); + if (importance == getImportance(radioButton)) { + radioButton.setChecked(true); + } + } + } + + @Override + protected void writeToModelAfterInitialized(Task task) { + task.setImportance(getImportance(radioGroup.getCheckedRadioButtonId())); + } +} diff --git a/src/main/res/drawable/importance_background_selected.xml b/src/main/res/drawable/importance_background_selected.xml deleted file mode 100644 index dabd34feb..000000000 --- a/src/main/res/drawable/importance_background_selected.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/src/main/res/layout/control_set_importance.xml b/src/main/res/layout/control_set_importance.xml deleted file mode 100644 index f3a49b6b6..000000000 --- a/src/main/res/layout/control_set_importance.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/src/main/res/layout/control_set_priority.xml b/src/main/res/layout/control_set_priority.xml new file mode 100644 index 000000000..a3a688d01 --- /dev/null +++ b/src/main/res/layout/control_set_priority.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index 7e422b67d..6cc59bde4 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -87,11 +87,6 @@ منبهات افتراضية أضف إلى التقويم بشكل افتراضي نوع رنين/اهتزاز افتراضي - - !!! (الأعلى) - !! - ! - o (Lowest) No deadline اليوم diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml index 869fc161b..22fc7eeb4 100644 --- a/src/main/res/values-bg-rBG/strings.xml +++ b/src/main/res/values-bg-rBG/strings.xml @@ -157,12 +157,6 @@ Напомняния по подразбиране Добави към календара по подразбиране Тон на звънене/вибрация по подразбиране - - !!! (Най-висок) - !! - ! - o (Най-нисък) - Без краен срок Днес diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 0a1297b99..c7563df0c 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -132,12 +132,6 @@ Výchozí připomenutí Výchozí přidání do kalendáře Výchozí vyzvánění / vybrace - - !!! (Nejvyšší) - !! - ! - o (Nejnižší) - Žádný termín Dnes diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index a8ff8d234..ca3f65103 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -143,12 +143,6 @@ Standard-Erinnerungen Standardmäßig in Kalender eintragen Standard-Alarm/Vibrationssignal - - !!! (Höchste) - !! - ! - o (Niedrigste) - Keine Fälligkeit Heute diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 5105bd9d5..2728e7308 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -138,12 +138,6 @@ Προκαθορισμένες υπενθυμίσεις Προκαθορισμένη προσθήκη σε ημερολόγιο Προκαθορισμένος ήχος/τύπος δόνησης - - !!! (Υψηλότερο) - !! - ! - 0 (χαμηλότερο) - Χωρίς προθεσμία Σήμερα diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 36c1f872b..5ec7a5e92 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -151,12 +151,6 @@ Recordatorios por defecto Por defecto, agregar al calendario Tipo predeterminado de timbre/vibración - - !!! (máximo) - !! - ! - o (Mínimo) - Sin vencimiento Hoy diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml index b25f6f1ba..0f8b06b50 100644 --- a/src/main/res/values-fa/strings.xml +++ b/src/main/res/values-fa/strings.xml @@ -96,11 +96,6 @@ your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Tasks. پیش فرض های وظیفه موعود پیش فرض - - !!! (بالاترین) - !! - ! - o (Lowest) بدون موعود امروز diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 0062b290f..6d3446876 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -150,12 +150,6 @@ Rappels par défaut Ajout au calendrier par défaut Type de sonnerie/vibration par défaut - - !!! (la plus haute) - !! - ! - o (la plus basse) - Aucune échéance Aujourd\'hui diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index aabf930a0..63a10b14a 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -153,12 +153,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat Promemoria predefiniti Aggiungi automaticamente al calendario Tipo di squillo/vibrazione predefinito - - !!! (Massima) - !! - ! - o (Minima) - Nessun Termine Oggi diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 9726c4534..2595841c2 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -134,12 +134,6 @@ תזכורות ברירת מחדל הוספה ליומן כברירת מחדל ברירת מחדל לסוג צלצול/רטט - - !!! - !! - ! - o (נמוכה ביותר) - ללא מועד סף היום diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 84c6b7050..43de7b537 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -155,12 +155,6 @@ 標準リマインダー デフォルトでカレンダーに登録 標準の通知音、振動種類 - - !!! (最高) - !! - ! - o (最低) - 期限なし 今日 diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 9dce621e3..0d716abbf 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -158,12 +158,6 @@ Tasks의 백업에서 당신의 일정을 복구하시기 바랍니다. 기본 알림 달력에 추가하기 (기본값) 기본 벨소리/진동 형식 - - !!! (최우선) - !! - ! - o (낮음) - 기한 없음 오늘 diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index ce6956ff5..4802843ac 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -152,12 +152,6 @@ Standaard herinneringen Standaard Toevoegen aan Agenda Standaard toon/tril type - - !!! (Hoogste) - !! - ! - o (Laagste) - Geen einddatum Vandaag diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index c14712f9a..0343ec3d3 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -137,12 +137,6 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup-&g Przypomnienia (domyślnie) Domyślnie dodawaj do kalendarza Domyślny dzwonek/wibracja - - !!! (Najwyższy) - !! - ! - o (Najniższy) - Bez nieprzekraczalnego terminu Dzisiaj diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index b9e07a8af..494691145 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -134,12 +134,6 @@ Lembretes Padrão de Inserir no Calendário Tipo de toque/vibração padrão - - !!! (Máxima) - !! - ! - o (baixa) - Sem prazo Hoje diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index d2230cce3..524f83145 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -150,12 +150,6 @@ das tarefas através de um backup em Definições->Sincronização e backup-& Lembretes predefinidos Predefinição ao adicionar ao calendário Tipo de vibração/toque predefinido - - !!! (Mais alta) - !! - ! - o (mais baixa) - Sem data limite Hoje diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 2c8c1e7a5..3fd0d1088 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -155,12 +155,6 @@ Напоминания по умолчанию Добавлять в календарь по умолчанию Тип звонка/вибрации по умолчанию - - !!! (Высшая) - !! - ! - o (Низший) - Без срока выполнения Сегодня diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 843dfcecc..eb578ccfa 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -146,12 +146,6 @@ Predvolené pripomienky Predvoliť pridanie do kalendára Východzie vyzváňanie/vybrovanie - - !!!(Najvyššie) - !! - ! - o (Najnižšie) - Žiaden termín Dnes diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml index e3b028255..6ae824b3d 100644 --- a/src/main/res/values-sl-rSI/strings.xml +++ b/src/main/res/values-sl-rSI/strings.xml @@ -138,12 +138,6 @@ Privzeti opomniki Privzeto dodati na koledar Privzeti način zvonenja/vibriranja - - !!! (Najvišja) - !! - ! - o (Najnižja) - Brez dospelosti Danes diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index fdcd3926c..d8debebc2 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -131,12 +131,6 @@ och återställer dina aktuella uppgifter från en backup Standardpåminnelser Standardkalender för att lägga till händelser Standardtyp av ringsignal/vibration - - !!! (Högst) - !! - ! - o (Lägst) - Ingen frist Idag diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 33e56fcab..cba8e4ad2 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -113,12 +113,6 @@ Öntanımlı Hatırlatmalar Öntanımlı olarak Takvime Ekle Varsayılan Zil/Titreşim tipi - - !!! (En yüksek) - !! - ! - o (En Düşük) - Son tarih yok Bugün diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 8fdbf9869..f4958277d 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -150,12 +150,6 @@ Нагадування по замовчуванню Додавати в календар по замовчуванню Тип дзвінка/вібрація по замовчуванню - - !!! (найвищий) - !! - ! - o (найменший) - Немає дедлайну Сьогодні diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 01a84d7c9..823073c0c 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -4,4 +4,7 @@ + + \ No newline at end of file diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index a987542fd..867bd5609 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -93,12 +93,6 @@ 默认提醒 默认添加到日历 默认铃声／振动类型 - - !!!（最高级别） - !! - ! - o（最低级别） - 无截止日 今天 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 54e967091..095c4ee62 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -121,12 +121,6 @@ 預設提醒 默認添加到日曆 默認鈴聲／振動類型 - - !!!（最高級別） - !! - ! - o（最低級別） - 無截止日 今天 diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index c3f8723b0..00504bb9b 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -55,4 +55,11 @@ @string/week_before_due + + @string/priority_high + @string/priority_medium + @string/priority_low + @string/none + + \ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index adc213e18..51f891b8a 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -24,7 +24,6 @@ - diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 99773d7d8..167501102 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -33,8 +33,6 @@ #fffea400 #ff33a5e8 #ff808080 - #ff505050 - #ff202020 #f4b400 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 61cc959c4..959fb380e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -431,15 +431,9 @@ File %1$s contained %2$s.\n\n Default ring/vibrate type - - - - !!! (Highest) - !! - ! - - o (Lowest) - + High + Medium + Low diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 42b2cc8a8..6291473c9 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -106,4 +106,16 @@ 18sp + + + + diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml index daeaa008b..7234e2373 100644 --- a/src/main/res/values/styles_dark.xml +++ b/src/main/res/values/styles_dark.xml @@ -38,7 +38,6 @@ #6666aa #dddddd @color/dark_blue_theme_color - @drawable/importance_background_selected @style/SpinnerNoPadding diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml index 695eca9ea..884753077 100644 --- a/src/main/res/values/styles_light.xml +++ b/src/main/res/values/styles_light.xml @@ -36,7 +36,6 @@ #607d8b @android:color/black @android:color/white - @drawable/importance_background_selected @color/task_edit_divider @style/SpinnerNoPadding