Use radio buttons for importance control set

pull/384/head
Alex Baker 10 years ago
parent 0b6499563c
commit e0f17708b0

@ -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),

@ -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)
};
}

@ -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

@ -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 <tim@todoroo.com>
*
*/
public class ImportanceControlSet extends TaskEditControlSetBase {
private final List<CompoundButton> buttons = new LinkedList<>();
private final int[] colors;
private final List<ImportanceChangedListener> 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());
}
}
}

@ -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<Integer> colors;
private final List<ImportanceChangedListener> 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()));
}
}

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#eee"/>
<corners
android:radius="4dp" />
<size android:width="40dip"
android:height="40dip"/>
</shape>

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/importance_container"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
android:paddingEnd="@dimen/task_edit_drawable_padding_left_right">
<TextView
android:id="@+id/display_row_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:text="@string/TEA_importance_label"
android:textColor="?attr/asTextColor"
android:textSize="@dimen/task_edit_text_size" />
</LinearLayout>

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/display_row_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:paddingEnd="@dimen/task_edit_drawable_padding_left_right"
android:paddingRight="@dimen/task_edit_drawable_padding_left_right"
android:text="@string/TEA_importance_label"
android:textColor="?attr/asTextColor"
android:textSize="@dimen/task_edit_text_size" />
<RadioGroup
android:id="@+id/importance_group"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="end"
android:gravity="end"
android:orientation="horizontal"
android:paddingLeft="@dimen/task_edit_drawable_padding_left_right"
android:paddingStart="@dimen/task_edit_drawable_padding_left_right">
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/importance_3"
style="@style/priority_button"
android:tag="3" />
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/importance_2"
style="@style/priority_button"
android:tag="2" />
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/importance_1"
style="@style/priority_button"
android:tag="1" />
<android.support.v7.widget.AppCompatRadioButton
android:id="@+id/importance_0"
style="@style/priority_button"
android:tag="0" />
</RadioGroup>
</LinearLayout>

@ -87,11 +87,6 @@
<string name="EPr_default_reminders_title">منبهات افتراضية</string>
<string name="EPr_default_addtocalendar_title">أضف إلى التقويم بشكل افتراضي</string>
<string name="EPr_default_reminders_mode_title">نوع رنين/اهتزاز افتراضي</string>
<string-array name="EPr_default_importance">
<item>!!! (الأعلى)</item>
<item>!!</item>
<item>!</item>
<item>o (Lowest)</item> </string-array>
<string-array name="EPr_default_urgency">
<item>No deadline</item>
<item>اليوم</item>

@ -157,12 +157,6 @@
<string name="EPr_default_reminders_title">Напомняния по подразбиране</string>
<string name="EPr_default_addtocalendar_title">Добави към календара по подразбиране</string>
<string name="EPr_default_reminders_mode_title">Тон на звънене/вибрация по подразбиране</string>
<string-array name="EPr_default_importance">
<item>!!! (Най-висок)</item>
<item>!!</item>
<item>!</item>
<item>o (Най-нисък)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Без краен срок</item>
<item>Днес</item>

@ -132,12 +132,6 @@
<string name="EPr_default_reminders_title">Výchozí připomenutí</string>
<string name="EPr_default_addtocalendar_title">Výchozí přidání do kalendáře</string>
<string name="EPr_default_reminders_mode_title">Výchozí vyzvánění / vybrace</string>
<string-array name="EPr_default_importance">
<item>!!! (Nejvyšší)</item>
<item>!!</item>
<item>!</item>
<item>o (Nejnižší)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Žádný termín</item>
<item>Dnes</item>

@ -143,12 +143,6 @@
<string name="EPr_default_reminders_title">Standard-Erinnerungen</string>
<string name="EPr_default_addtocalendar_title">Standardmäßig in Kalender eintragen</string>
<string name="EPr_default_reminders_mode_title">Standard-Alarm/Vibrationssignal</string>
<string-array name="EPr_default_importance">
<item>!!! (Höchste)</item>
<item>!!</item>
<item>!</item>
<item>o (Niedrigste)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Keine Fälligkeit</item>
<item>Heute</item>

@ -138,12 +138,6 @@
<string name="EPr_default_reminders_title">Προκαθορισμένες υπενθυμίσεις</string>
<string name="EPr_default_addtocalendar_title">Προκαθορισμένη προσθήκη σε ημερολόγιο</string>
<string name="EPr_default_reminders_mode_title">Προκαθορισμένος ήχος/τύπος δόνησης</string>
<string-array name="EPr_default_importance">
<item>!!! (Υψηλότερο)</item>
<item>!!</item>
<item>!</item>
<item>0 (χαμηλότερο)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Χωρίς προθεσμία</item>
<item>Σήμερα</item>

@ -151,12 +151,6 @@
<string name="EPr_default_reminders_title">Recordatorios por defecto</string>
<string name="EPr_default_addtocalendar_title">Por defecto, agregar al calendario</string>
<string name="EPr_default_reminders_mode_title">Tipo predeterminado de timbre/vibración</string>
<string-array name="EPr_default_importance">
<item>!!! (máximo)</item>
<item>!!</item>
<item>!</item>
<item>o (Mínimo)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Sin vencimiento</item>
<item>Hoy</item>

@ -96,11 +96,6 @@
your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Tasks.</string>
<string name="task_defaults">پیش فرض های وظیفه</string>
<string name="EPr_default_urgency_title">موعود پیش فرض</string>
<string-array name="EPr_default_importance">
<item>!!! (بالاترین)</item>
<item>!!</item>
<item>!</item>
<item>o (Lowest)</item> </string-array>
<string-array name="EPr_default_urgency">
<item>بدون موعود</item>
<item>امروز</item>

@ -150,12 +150,6 @@
<string name="EPr_default_reminders_title">Rappels par défaut</string>
<string name="EPr_default_addtocalendar_title">Ajout au calendrier par défaut</string>
<string name="EPr_default_reminders_mode_title">Type de sonnerie/vibration par défaut</string>
<string-array name="EPr_default_importance">
<item>!!! (la plus haute)</item>
<item>!!</item>
<item>!</item>
<item>o (la plus basse)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Aucune échéance</item>
<item>Aujourd\'hui</item>

@ -153,12 +153,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
<string name="EPr_default_reminders_title">Promemoria predefiniti</string>
<string name="EPr_default_addtocalendar_title">Aggiungi automaticamente al calendario</string>
<string name="EPr_default_reminders_mode_title">Tipo di squillo/vibrazione predefinito</string>
<string-array name="EPr_default_importance">
<item>!!! (Massima)</item>
<item>!!</item>
<item>!</item>
<item>o (Minima)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Nessun Termine</item>
<item>Oggi</item>

@ -134,12 +134,6 @@
<string name="EPr_default_reminders_title">תזכורות ברירת מחדל</string>
<string name="EPr_default_addtocalendar_title">הוספה ליומן כברירת מחדל</string>
<string name="EPr_default_reminders_mode_title">ברירת מחדל לסוג צלצול/רטט</string>
<string-array name="EPr_default_importance">
<item>!!!</item>
<item>!!</item>
<item>!</item>
<item>o (נמוכה ביותר)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>ללא מועד סף</item>
<item>היום</item>

@ -155,12 +155,6 @@
<string name="EPr_default_reminders_title">標準リマインダー</string>
<string name="EPr_default_addtocalendar_title">デフォルトでカレンダーに登録</string>
<string name="EPr_default_reminders_mode_title">標準の通知音、振動種類</string>
<string-array name="EPr_default_importance">
<item>!!! (最高)</item>
<item>!!</item>
<item>!</item>
<item>o (最低)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>期限なし</item>
<item>今日</item>

@ -158,12 +158,6 @@ Tasks의 백업에서 당신의 일정을 복구하시기 바랍니다.
<string name="EPr_default_reminders_title">기본 알림</string>
<string name="EPr_default_addtocalendar_title">달력에 추가하기 (기본값)</string>
<string name="EPr_default_reminders_mode_title">기본 벨소리/진동 형식</string>
<string-array name="EPr_default_importance">
<item>!!! (최우선)</item>
<item>!!</item>
<item>!</item>
<item>o (낮음)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>기한 없음</item>
<item>오늘</item>

@ -152,12 +152,6 @@
<string name="EPr_default_reminders_title">Standaard herinneringen</string>
<string name="EPr_default_addtocalendar_title">Standaard Toevoegen aan Agenda</string>
<string name="EPr_default_reminders_mode_title">Standaard toon/tril type</string>
<string-array name="EPr_default_importance">
<item>!!! (Hoogste)</item>
<item>!!</item>
<item>!</item>
<item>o (Laagste)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Geen einddatum</item>
<item>Vandaag</item>

@ -137,12 +137,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
<string name="EPr_default_reminders_title">Przypomnienia (domyślnie)</string>
<string name="EPr_default_addtocalendar_title">Domyślnie dodawaj do kalendarza</string>
<string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
<string-array name="EPr_default_importance">
<item>!!! (Najwyższy)</item>
<item>!!</item>
<item>!</item>
<item>o (Najniższy)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Bez nieprzekraczalnego terminu</item>
<item>Dzisiaj</item>

@ -134,12 +134,6 @@
<string name="EPr_default_reminders_title">Lembretes</string>
<string name="EPr_default_addtocalendar_title">Padrão de Inserir no Calendário</string>
<string name="EPr_default_reminders_mode_title">Tipo de toque/vibração padrão</string>
<string-array name="EPr_default_importance">
<item>!!! (Máxima)</item>
<item>!!</item>
<item>!</item>
<item>o (baixa)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Sem prazo</item>
<item>Hoje</item>

@ -150,12 +150,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
<string name="EPr_default_reminders_title">Lembretes predefinidos</string>
<string name="EPr_default_addtocalendar_title">Predefinição ao adicionar ao calendário</string>
<string name="EPr_default_reminders_mode_title">Tipo de vibração/toque predefinido</string>
<string-array name="EPr_default_importance">
<item>!!! (Mais alta)</item>
<item>!!</item>
<item>!</item>
<item>o (mais baixa)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Sem data limite</item>
<item>Hoje</item>

@ -155,12 +155,6 @@
<string name="EPr_default_reminders_title">Напоминания по умолчанию</string>
<string name="EPr_default_addtocalendar_title">Добавлять в календарь по умолчанию</string>
<string name="EPr_default_reminders_mode_title">Тип звонка/вибрации по умолчанию</string>
<string-array name="EPr_default_importance">
<item>!!! (Высшая)</item>
<item>!!</item>
<item>!</item>
<item>o (Низший)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Без срока выполнения</item>
<item>Сегодня</item>

@ -146,12 +146,6 @@
<string name="EPr_default_reminders_title">Predvolené pripomienky</string>
<string name="EPr_default_addtocalendar_title">Predvoliť pridanie do kalendára</string>
<string name="EPr_default_reminders_mode_title">Východzie vyzváňanie/vybrovanie</string>
<string-array name="EPr_default_importance">
<item>!!!(Najvyššie)</item>
<item>!!</item>
<item>!</item>
<item>o (Najnižšie)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Žiaden termín</item>
<item>Dnes</item>

@ -138,12 +138,6 @@
<string name="EPr_default_reminders_title">Privzeti opomniki</string>
<string name="EPr_default_addtocalendar_title">Privzeto dodati na koledar</string>
<string name="EPr_default_reminders_mode_title">Privzeti način zvonenja/vibriranja</string>
<string-array name="EPr_default_importance">
<item>!!! (Najvišja)</item>
<item>!!</item>
<item>!</item>
<item>o (Najnižja)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Brez dospelosti</item>
<item>Danes</item>

@ -131,12 +131,6 @@ och återställer dina aktuella uppgifter från en backup
<string name="EPr_default_reminders_title">Standardpåminnelser</string>
<string name="EPr_default_addtocalendar_title">Standardkalender för att lägga till händelser</string>
<string name="EPr_default_reminders_mode_title">Standardtyp av ringsignal/vibration</string>
<string-array name="EPr_default_importance">
<item>!!! (Högst)</item>
<item>!!</item>
<item>!</item>
<item>o (Lägst)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Ingen frist</item>
<item>Idag</item>

@ -113,12 +113,6 @@
<string name="EPr_default_reminders_title">Öntanımlı Hatırlatmalar</string>
<string name="EPr_default_addtocalendar_title">Öntanımlı olarak Takvime Ekle</string>
<string name="EPr_default_reminders_mode_title">Varsayılan Zil/Titreşim tipi</string>
<string-array name="EPr_default_importance">
<item>!!! (En yüksek)</item>
<item>!!</item>
<item>!</item>
<item>o (En Düşük)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Son tarih yok</item>
<item>Bugün</item>

@ -150,12 +150,6 @@
<string name="EPr_default_reminders_title">Нагадування по замовчуванню</string>
<string name="EPr_default_addtocalendar_title">Додавати в календар по замовчуванню</string>
<string name="EPr_default_reminders_mode_title">Тип дзвінка/вібрація по замовчуванню</string>
<string-array name="EPr_default_importance">
<item>!!! (найвищий)</item>
<item>!!</item>
<item>!</item>
<item>o (найменший)</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>Немає дедлайну</item>
<item>Сьогодні</item>

@ -4,4 +4,7 @@
<style name="edit_text_style">
</style>
<style name="priority_button" parent="priority_button_base">
</style>
</resources>

@ -93,12 +93,6 @@
<string name="EPr_default_reminders_title">默认提醒</string>
<string name="EPr_default_addtocalendar_title">默认添加到日历</string>
<string name="EPr_default_reminders_mode_title">默认铃声/振动类型</string>
<string-array name="EPr_default_importance">
<item>!!!(最高级别)</item>
<item>!!</item>
<item>!</item>
<item>o最低级别</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>无截止日</item>
<item>今天</item>

@ -121,12 +121,6 @@
<string name="EPr_default_reminders_title">預設提醒</string>
<string name="EPr_default_addtocalendar_title">默認添加到日曆</string>
<string name="EPr_default_reminders_mode_title">默認鈴聲/振動類型</string>
<string-array name="EPr_default_importance">
<item>!!!(最高級別)</item>
<item>!!</item>
<item>!</item>
<item>o最低級別</item>
</string-array>
<string-array name="EPr_default_urgency">
<item>無截止日</item>
<item>今天</item>

@ -55,4 +55,11 @@
<item>@string/week_before_due</item>
</string-array>
<string-array name="EPr_default_importance">
<item>@string/priority_high</item>
<item>@string/priority_medium</item>
<item>@string/priority_low</item>
<item>@string/none</item>
</string-array>
</resources>

@ -24,7 +24,6 @@
<attr name="asEditTextBackground" format="reference" />
<attr name="asAbBackgroundColor" format="color" />
<attr name="fab_tint" format="color"/>
<attr name="importance_background_selected" format="reference" />
<attr name="icon_tint" format="color"/>
<attr name="toolbarSeparatorHeight" format="dimension" />
<attr name="separatorHeight" format="dimension" />

@ -33,8 +33,6 @@
<color name="importance_2">#fffea400</color>
<color name="importance_3">#ff33a5e8</color>
<color name="importance_4">#ff808080</color>
<color name="importance_5">#ff505050</color>
<color name="importance_6">#ff202020</color>
<color name="snackbar_undo">#f4b400</color>

@ -431,15 +431,9 @@ File %1$s contained %2$s.\n\n
<!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
<string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
<string-array name="EPr_default_importance">
<!-- importance: labels for "Task Defaults" preference item. -->
<!-- slide 40b -->
<item>!!! (Highest)</item>
<item>!!</item>
<item>!</item>
<!-- slide 40c -->
<item>o (Lowest)</item>
</string-array>
<string name="priority_high">High</string>
<string name="priority_medium">Medium</string>
<string name="priority_low">Low</string>
<string-array name="EPr_default_urgency">
<!-- urgency: labels for "Task Defaults" preference item. -->

@ -106,4 +106,16 @@
<item name="android:textSize">18sp</item>
</style>
<style name="priority_button_base">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:width">0dp</item>
</style>
<style name="priority_button" parent="priority_button_base">
<!-- hide janky selected item background on pre-lollipop devices -->
<item name="android:background">@android:color/transparent</item>
</style>
</resources>

@ -38,7 +38,6 @@
<item name="asDetailsColor">#6666aa</item>
<item name="asListDividerColor">#dddddd</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
<item name="importance_background_selected">@drawable/importance_background_selected</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
</style>

@ -36,7 +36,6 @@
<item name="asAbBackgroundColor">#607d8b</item>
<item name="icon_tint">@android:color/black</item>
<item name="fab_tint">@android:color/white</item>
<item name="importance_background_selected">@drawable/importance_background_selected</item>
<item name="task_edit_divider">@color/task_edit_divider</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
</style>

Loading…
Cancel
Save