diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java index e930cda36..af33d0a92 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -345,36 +345,6 @@ public class EditPreferences extends TodorooPreferenceActivity { } else { preference.setSummary(R.string.EPr_fullTask_desc_disabled); } - } else if (r.getString(R.string.p_theme).equals(preference.getKey())) { - if (AndroidUtilities.getSdkVersion() < 5) { - preference.setEnabled(false); - preference.setSummary(R.string.EPr_theme_desc_unsupported); - } else { - int index = 0; - if (value instanceof String && !TextUtils.isEmpty((String) value)) { - index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_settings), (String) value); - } - if (index < 0) { - index = 0; - } - preference.setSummary(getString(R.string.EPr_theme_desc, - r.getStringArray(R.array.EPr_themes)[index])); - } - } else if (r.getString(R.string.p_theme_widget).equals(preference.getKey())) { - if (AndroidUtilities.getSdkVersion() < 5) { - preference.setEnabled(false); - preference.setSummary(R.string.EPr_theme_desc_unsupported); - } else { - int index = 0; - if (value instanceof String && !TextUtils.isEmpty((String) value)) { - index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_widget_settings), (String) value); - } - if (index < 0) { - index = 0; - } - preference.setSummary(getString(R.string.EPr_theme_desc, - r.getStringArray(R.array.EPr_themes_widget)[index])); - } } // pp preferences @@ -464,7 +434,7 @@ public class EditPreferences extends TodorooPreferenceActivity { } public void addPreferenceListeners() { - findPreference(getString(R.string.p_theme)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); + findPreference(getString(R.string.p_use_dark_theme)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); @@ -476,7 +446,7 @@ public class EditPreferences extends TodorooPreferenceActivity { findPreference(getString(key)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); } - findPreference(getString(R.string.p_theme_widget)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { + findPreference(getString(R.string.p_use_dark_theme_widget)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { @Override public boolean onPreferenceChange(Preference preference, Object newValue) { TasksWidget.updateWidgets(EditPreferences.this); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java b/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java index 8889beee8..5cc69ac33 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/MarketStrategy.java @@ -121,7 +121,6 @@ public abstract class MarketStrategy { @Override public int[] excludedSettings() { return new int[] { - R.string.p_theme_widget, R.string.p_voicePrefSection, R.string.p_end_at_deadline, R.string.p_field_missed_calls @@ -157,13 +156,11 @@ public abstract class MarketStrategy { @Override public int[] excludedSettings() { return new int[] { - R.string.p_theme_widget, R.string.p_voicePrefSection, R.string.p_end_at_deadline, R.string.p_field_missed_calls, R.string.p_rmd_vibrate, R.string.gcal_p_default, - R.string.p_theme_widget, R.string.p_voiceInputEnabled, R.string.p_voiceInputCreatesTask }; diff --git a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java index bdc3bd6fb..7bda3a831 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java @@ -10,54 +10,42 @@ import android.graphics.PixelFormat; import android.text.TextUtils; import android.view.WindowManager; -import org.tasks.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.utility.AstridPreferences; -import com.todoroo.astrid.widget.TasksWidget; + +import org.tasks.R; public class ThemeService { public static final String THEME_WHITE = "white"; - public static final String THEME_WHITE_RED = "white-red"; - public static final String THEME_WHITE_ALT = "white-alt"; public static final String THEME_BLACK = "black"; - public static final String THEME_TRANSPARENT = "transparent"; - public static final String THEME_TRANSPARENT_WHITE = "transparent-white"; - - public static final String THEME_WIDGET_SAME_AS_APP = "same-as-app"; - public static final String THEME_WIDGET_LEGACY = "legacy-widget"; public static final int FLAG_FORCE_DARK = 1; public static final int FLAG_FORCE_LIGHT = 2; public static final int FLAG_INVERT = 3; - private static int currentTheme; - // Widget config activities set this flag since they theme differently than the normal // filter list. In other cases this should be false private static boolean forceFilterInvert = false; public static void applyTheme(Activity activity) { - currentTheme = getTheme(); + int currentTheme = getTheme(); activity.setTheme(currentTheme); - activity.getWindow().setFormat(PixelFormat.RGBA_8888); activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER); } public static int getTheme() { - String preference = Preferences.getStringValue(R.string.p_theme); + String preference = Preferences.getBoolean(R.string.p_use_dark_theme, false) ? THEME_BLACK : THEME_WHITE; return getStyleForSetting(preference); } public static int getWidgetTheme() { - String preference = Preferences.getStringValue(R.string.p_theme_widget); - if (TextUtils.isEmpty(preference) || THEME_WIDGET_SAME_AS_APP.equals(preference)) { + String preference = Preferences.getBoolean(R.string.p_use_dark_theme_widget, false) ? THEME_BLACK : THEME_WHITE; + if (TextUtils.isEmpty(preference)) { return getTheme(); - } else if (THEME_WIDGET_LEGACY.equals(preference)) { - return TasksWidget.THEME_LEGACY; } else { return getStyleForSetting(preference); } @@ -66,14 +54,6 @@ public class ThemeService { private static int getStyleForSetting(String setting) { if(THEME_BLACK.equals(setting)) { return R.style.Theme; - } else if(THEME_TRANSPARENT.equals(setting)) { - return R.style.Theme_Transparent; - } else if(THEME_TRANSPARENT_WHITE.equals(setting)) { - return R.style.Theme_TransparentWhite; - } else if (THEME_WHITE_RED.equals(setting)) { - return R.style.Theme_White; - } else if (THEME_WHITE_ALT.equals(setting)) { - return R.style.Theme_White_Alt; } else { return R.style.Theme_White_Blue; } @@ -152,7 +132,6 @@ public class ThemeService { /** * Only widget config activities should call this (see note on the flag above) - * @param forceInvert */ public static void setForceFilterInvert(boolean forceInvert) { forceFilterInvert = forceInvert; @@ -276,9 +255,4 @@ public class ThemeService { public static int getTaskEditThemeColor() { return getDarkVsLight(R.color.task_edit_selected, R.color.blue_theme_color, true); } - - public static void forceTheme(int theme) { - currentTheme = theme; - } - } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java index d86b352b8..ea8f7bb52 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java @@ -167,14 +167,6 @@ public final class UpgradeService { AddOnService.recordOem(); } - if(from > 0 && from < V3_8_2) { - if(Preferences.getBoolean(R.string.p_transparent_deprecated, false)) { - Preferences.setString(R.string.p_theme, "transparent"); //$NON-NLS-1$ - } else { - Preferences.setString(R.string.p_theme, "black"); //$NON-NLS-1$ - } - } - if(from <= V3_9_1_1) { actFmPreferenceService.clearLastSyncDate(); } diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 46b5a3d6d..b19bd0484 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -5,13 +5,13 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Resources; -import org.tasks.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.BeastModePreferences; import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.service.ThemeService; + +import org.tasks.R; public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { @@ -40,10 +40,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { } BeastModePreferences.setDefaultOrder(context, false); - if ("white-blue".equals(Preferences.getStringValue(R.string.p_theme))) { //$NON-NLS-1$ migrate from when white-blue wasn't the default - Preferences.setString(R.string.p_theme, ThemeService.THEME_WHITE); - } - if (Constants.MARKET_STRATEGY.defaultPhoneLayout()) { setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset); } @@ -68,7 +64,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1); } } - Preferences.setString(R.string.p_theme, ThemeService.THEME_WHITE); + Preferences.setBoolean(R.string.p_use_dark_theme, false); setPreference(prefs, editor, r, R.string.p_force_phone_layout, Constants.MARKET_STRATEGY.defaultPhoneLayout(), ifUnset); BeastModePreferences.setDefaultOrder(context, true); @@ -110,7 +106,7 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset); - setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE, ifUnset); + setPreference(prefs, editor, r, R.string.p_use_dark_theme, false, ifUnset); setPreference(prefs, editor, r, R.string.p_force_phone_layout, false, ifUnset); diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java index 5a36b178c..54bd28629 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java @@ -58,8 +58,6 @@ public class TasksWidget extends AppWidgetProvider { private static final int NUM_VISIBLE_TASKS = 25; - public static final int THEME_LEGACY = -1; - public static long suppressUpdateFlag = 0; // Timestamp--don't update widgets if this flag is non-zero and now() is within 5 minutes private static final long SUPPRESS_TIME = DateUtilities.ONE_MINUTE * 5; @@ -205,13 +203,10 @@ public class TasksWidget extends AppWidgetProvider { cursor.moveToPosition(i); task.readFromCursor(cursor); - String textContent = ""; + String textContent; Resources r = context.getResources(); int textColor = r .getColor(isDarkTheme() ? R.color.widget_text_color_dark : R.color.widget_text_color_light); - if (isLegacyTheme()) { - textColor = r.getColor(android.R.color.white); - } textContent = task.getValue(Task.TITLE); @@ -322,12 +317,6 @@ public class TasksWidget extends AppWidgetProvider { return (theme == R.style.Theme || theme == R.style.Theme_Transparent); } - private boolean isLegacyTheme() { - int theme = ThemeService.getWidgetTheme(); - return theme == THEME_LEGACY; - } - - /** * The reason we use a bunch of different but almost identical layouts is that there is a bug with * Android 2.1 (level 7) that doesn't allow setting backgrounds on remote views. I know it's lame, @@ -341,18 +330,12 @@ public class TasksWidget extends AppWidgetProvider { String packageName = context.getPackageName(); Resources r = context.getResources(); int layout; - RemoteViews views = null; + RemoteViews views; int titleColor; int buttonDrawable; - if (isLegacyTheme()) { - views = new RemoteViews(packageName, R.layout.widget_initialized_legacy); - views.setTextColor(R.id.widget_title, r.getColor(android.R.color.white)); - views.setInt(R.id.widget_button, "setImageResource", R.drawable.button_plus); - views.setViewVisibility(R.id.widget_header_separator, View.GONE); - return views; - } else if(isDarkTheme()) { + if (isDarkTheme()) { layout = (theme == R.style.Theme_Transparent ? R.layout.widget_initialized_dark_transparent : R.layout.widget_initialized_dark); titleColor = r.getColor(R.color.widget_text_color_dark); buttonDrawable = R.drawable.plus_button_blue; @@ -360,7 +343,7 @@ public class TasksWidget extends AppWidgetProvider { layout = R.layout.widget_initialized_red; titleColor = r.getColor(R.color.widget_text_color_light); buttonDrawable = R.drawable.plus_button_red; - } else if (theme == R.style.Theme_White_Alt) { + } else if (theme == R.style.Theme_White_Alt) { layout = R.layout.widget_initialized; titleColor = r.getColor(R.color.widget_text_color_light); buttonDrawable = R.drawable.plus_button_blue; diff --git a/astrid/src/main/res/drawable/button_plus.png b/astrid/src/main/res/drawable/button_plus.png deleted file mode 100644 index 82bc521b7..000000000 Binary files a/astrid/src/main/res/drawable/button_plus.png and /dev/null differ diff --git a/astrid/src/main/res/layout/widget_initialized_legacy.xml b/astrid/src/main/res/layout/widget_initialized_legacy.xml deleted file mode 100644 index b085641d9..000000000 --- a/astrid/src/main/res/layout/widget_initialized_legacy.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index ce45facb1..740778cac 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -220,9 +220,6 @@ Es mostraran sempre les anotacions Mostra el títol sencer de la tasca Es mostrarà el títol sencer de la tasca - Color del tema - Actualment: %s - Aquest paràmetre requrereix l\'Android 2.0 o superior Segur que voleu suprimir totes les tasques completades? S\'han suprimit %d tasques Segur que voleu suprimir els esdeveniments de calendari de les tasques completades? diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 526b06f48..de05bf0df 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -213,31 +213,10 @@ Zobrazit úplný název úkolu Zobrazí se úplný název úkolu Zobrazí se první dva řádky názvu úkolu - Barevný motiv - Aktuální: %s - Nastavení vyžaduje Android 2.0+ Vzhled řádku úkolu Čas události v kalendáři Událost v kalendáři končí splněním úkolu Událost v kalendáři začíná splněním úkolu - - Den - Modrá - Den - Červená - Sky blue - Noc - Průhledné (Bílý text) - Průhledné (Tmavý text) - - - Same as app - Den - Modrá - Den - Červená - Sky blue - Noc - Průhledné (Bílý text) - Průhledné (Tmavý text) - Starý styl - Spravovat staré úkoly Odstranit dokončené úkoly Opravdu chcete odstranit všechny dokončené úkoly? @@ -478,7 +457,7 @@ Ahoj! Máš chvíli? - Je skvělý den na + Můžu Tě na chvíli vidět? Máš pár minut? Zapomněl jsi? Omlouvám se! @@ -515,12 +494,12 @@ Jsem na Tebe pyšný! Pojď to dokončit! A little snack after you finish this? Jen tenhle úkol? Prosím? - Je čas zkrátit Tvůj seznam úkolů! + Můžeš výt šťastná/ý! Jen tohle dokonči! Slibuji Ti, že se budeš cítit lépe, když tohle dokončíš! Have I mentioned you are awesome recently? Keep it up! A task a day keeps the clutter away... Goodbye clutter! How do you do it? Wow, I\'m impressed! - You can\'t just get by on your good looks. Let\'s get to it! + Plánuješ tohle vůbec někdy udělat? Lovely weather for a job like this, isn\'t it? A spot of tea while you work on this? If only you had already done this, then you could go outside and play. diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index f3b0b1191..fcc9e0066 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -119,7 +119,6 @@ Skriftstørrelse på den centrale liste Vis noter i opgave Noter vises altid - Nuværende: %s Tilføjelser Tasks team Installerede diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 5341e4342..69fa0e68d 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -304,10 +304,6 @@ Menüeinträge Listenansicht Kommentare bei Aufgabeneingabe anzeigen - Farbschema - Momentan: %s - Einstellungen benötigen mindestens Android 2.0 - Widget Theme Aussehen der Aufgabenzeilen Zeitpunkt Kalendertermin Telefon Layout nutzen @@ -316,24 +312,6 @@ Zum Wechseln der Listen wischen Zieh nach links oder rechts, um schnell zwischen Listen zu wechseln Ändere die Einstellungen unter Einstellungen -> Erscheinungsbild - - Tag - Blau - Tag -Rot - Himmelblau - Nacht - Transparent (weißer Text) - Transparent (schwarzer Text) - - - Wie die App - Tag - Blau - Tag - Rot - Himmelblau - Nacht - Transparent (weißer Text) - Transparent (schwarzer Text) - Retro - Alte Aufgaben verwalten Erledigte Aufgaben löschen Willst du wirklich alle erledigten Aufgaben löschen? diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index e7c8191c3..a70e32596 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -308,34 +308,12 @@ Usar filtros Objetos del menú Vista de listas - Combinación de colores - Actualmente: %s - Esta configuración requiere Android 2.0+ - Tema del widget Apariencia de la fila de tareas Usar diseño de teléfono Deslizar entre las listas Deslizar entre listas Deslizar a izquierda o derecha para moverse rápidamente entre listas Cambiar configuración en Ajustes -> Apariencia - - Día - Azul - Día - Rojo - Azul cielo - Noche - Transparent (white text) - Transparente (Texto Negro) - - - El mismo que la app - Día - Azul - Día - Rojo - Sky blue - Night - Transparent (white text) - Transparent (black text) - Estilo antiguo - Administrar tareas antiguas Borrar tareas completadas ¿Seguro que desea borrar todas las tareas completadas? diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index df3a4c8c7..88542a572 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -51,7 +51,7 @@ Passer en premium Ajoutez des fichiers, faites des sauvegardes vocales, bénéficiez du support premium et bien plus Non autorisé - Vous n\'êtes plus autorisé à voir les listes %s (vous avez peut-être été supprimé). Voulez-vous créer une nouvelle liste avec le même nom? + Vous n\'êtes plus autorisé à voir la liste %s (vous avez peut-être été supprimé). Voulez-vous créer une nouvelle liste avec le même nom? Créer une nouvelle liste Quitter la liste Synchronisation en cours... @@ -307,10 +307,6 @@ Eléments de menu Vue sous forme de liste Afficher les commentaires dans l\'édition de tâches - Thème de couleur - Actuellement : %s - Ce paramètre requiert Android 2.0+. - Thème de gadget Style des lignes de tâche Heure de l\'évenement dans le calendrier Terminer les événements dans le calendrier à l\'échéance @@ -321,24 +317,6 @@ Glisser entre les listes. \"Glissez vers la gauche ou la droite pour passer rapidement d\'une liste à l\'autre\" Changez les préférences dans Préférences -> Apparence - - Jour - Bleu - Jour - Rouge - Bleu ciel - Nuit - Transparent (texte en blanc) - Transparent (Texte Noir) - - - Même que l\'application - Jour - Bleu - Jour - Rouge - Bleu ciel - Nuit - Transparent (texte en blanc) - Transparent (texte en noir) - Ancien Style - Gérer les anciennes tâches Supprimer les tâches terminées Confirmer la suppression de toutes vos tâches ? diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 49b84407f..d51520d06 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -266,34 +266,12 @@ Riduci il titolo a una riga con la data e gli elenchi sotto Single line title only - Tema del colore - Attualmente: %s - L\'impostazione richiede Android 2.0+ - Tema del widget Aspetto della riga dei task Usa il layout del telefono Scorri tra le liste Scorri tra le liste Scorri a destra o a sinistra per muoverti rapidamente fra le liste Modifica le impostazioni in Impostazioni -> Aspetto - - Giorno - Blu - Giorno - Rosso - Sky blue - Night - Transparent (white text) - Transparent (Black Text) - - - Come l\'app - Giorno - Blu - Giorno - Rosso - Sky blue - Night - Transparent (white text) - Transparent (black text) - Vecchio Stile - Gestisci compiti vecchi Elimina i compiti completati Vuoi davvero eliminare tutti i compiti completati? diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 951c72cb5..e3473a6c3 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -297,10 +297,6 @@ פריטי תפריט תצוגת רשימה הצגת הערות בעריכת משימה - צבע ערכת נושא - כעת: %s - הפעלת הגדרות דורשת גירסא 2.0 ומעלה של אנדרואיד - ערכת חֲפִיץ מסך חזות שורת המשימה משך אירוע יומן סיים את אירועי היומן במועד היעד? @@ -310,24 +306,6 @@ עִלְעוּל בין רשימות עִלְעוּל ימינה ושמאלה למעבר מהיר בין רשימות שנה הגדרות תחת הגדרות>חזות - - יום - כחול - יום - אדום - תכלת - לילה - שקוף (טקסט לבן) - שקוף (טקסט שחור) - - - שמור כְּיִשּׂוּמוֹן - יום - כחול - יום - אדום - תכלת - לילה - שקוף (טקסט לבן) - שקוף (טקסט שחור) - סגנון ישן - נהל משימות ישנות מַחֲקִי משימות שבוצעו האם אתה בטוח שברצונך למחוק את כל המשימות שבוצעו? diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index 041175abb..dce2f6c8a 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -164,15 +164,6 @@ 外観 リストの文字サイズ メインのリスト画面の文字サイズ - 現在の設定: %s - - Day - Blue - Day - Red - Sky blue - Night - Transparent (white text) - Transparent (Black Text) - アドオン インストール済 追加 diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 7da9a2c3e..68b22ba89 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -316,10 +316,6 @@ 메뉴 항목 목록 보기 일정 편집에서 댓글 보기 - 색상 테마 - 현재: %s - 설정은 안드로이드 2.0 이상이 필요합니다 - 위젯 테마 일정 표시줄 보기 설정 달력 이벤트 시간 설정한 시간에 달력 이벤트 종료 @@ -330,24 +326,6 @@ 목록간 스와이프 이동하기 목록간 빠른 이동하려면 좌우로 스와이프 이동하기 설정에 있는 설정 변경하기 -> 모양 - - 낮 - 파란색 - 낮 - 빨간색 - 하늘색 - 밤 - 투명하게 (흰색 본문) - 투명 (검은색 텍스트) - - - 어플과 동일하게 - 낮 - 파란색 - 낮 - 빨간색 - 하늘색 - 밤 - 투명하게 (흰색 본문) - 투명하게 (검은색 본문) - 오래된 스타일 - 오래된 일정 관리하기 완료한 일정 지우기 완료한 일정을 모두 삭제하시겠습니까? diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index 45ed92529..8c4f128b1 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -101,7 +101,6 @@ Tekststørrelse for hovedlista Vis notater i oppgaven Notater vil alltid vises - For tiden: %s Tasks: Tillegg Tasks-teamet Installert diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index cea9c9ba2..c4621c57b 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -309,10 +309,6 @@ Verberg plus knop Lijst weergave Toon opmerkingen in taak bewerken - Kleuren Thema - Nu: %s - Instelllingen vereisen Android 2.0+ - Widget Thema Taakrij Weergave Agenda item tijd Agenda item op tijd afronden @@ -323,24 +319,6 @@ Swipe tussen lijsten Swipe links of rechts om snel tussen lijsten te bladeren Verander instellingen in Instellingen --> Uiterlijk - - Dag - Blauw - Dag - Rood - Hemelsblauw - Nacht - Transparant (witte tekst) - Transparant (Zwarte Tekst) - - - Zelfde als app - Dag - Blauw - Dag - Rood - Hemelsblauw - Nacht - Transparant (witte tekst) - Transparant (zwarte tekst) - Oude Stijl - Oude taken beheren Voltooide taken verwijderen Alle voltooide taken werkelijk verwijderen? diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 8210d0f36..afc6f2a76 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -302,10 +302,6 @@ Pozycje menu Widok listy Pokaż komentarze w edycji zadania - Kolorystyka - Aktualnie: %s - Ustawienia wymagaja Androida 2.0+ - Skórka Widgeta Wygląd rzędu zadań Czas zdarzenia kalendarza Zakończ zadania kalendarza w ustalonym czasie @@ -316,24 +312,6 @@ Przeciągaj pomiędzy listami Przeciągnij w lewo lub prawo aby szybko przełączyć się między listami Zmień ustawienia w Ustawienia -&gl; Wygląd - - Dzień - Blue - Dzień - Red - Błękit nieba - Noc - Przezroczysty (biały tekst) - Przezroczysty (czarny tekst) - - - Taki jak aplikacji - Dzień - Niebieski - Dzień - Czerwony - Błękit nieba - Noc - Przezroczysty (biały tekst) - Przezroczysty (czarny tekst) - Old Style - Zarządzaj starymi zadaniami Usuń zakończone zadania Czy na pewno chcesz usunąć wszystkie zadania wykonane? diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 2ca13b8af..761329c2b 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -268,34 +268,12 @@ Truncar título para uma única linha com data e lista abaixo Single line title only - Tema - Atualmente: %s - Esta opção requer Android 2.0+ - Tema do widget Aparência da Tarefa Usar layout do telefone Navegar entre as listas Navegar entre as listas Deslizar para a esquerda ou direita para mover-se rapidamente entre listas Alterar configurações em Configurações -> Aparência - - Dia - Azul - Dia - Vermelho - Sky blue - Night - Transparent (white text) - Transparente (Texto preto) - - - Mesmo que o aplicativo - Dia - Azul - Dia - Vermelho - Sky blue - Night - Transparent (white text) - Transparent (black text) - Estilo antigo - Gerenciar tarefas antigas Exclui as tarefas concluídas Você realmente deseja excluir todas as tarefas concluídas? diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index 6330a1553..970a56969 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -302,10 +302,6 @@ Элементы меню Списком Показывать комментарии в редакторе задачи - Цветовая тема - Текущая: %s - Настройка требует Android 2.0+ - Тема виджета Внешний вид задач в списке Время события в календаре Завершение события при наступлении срока @@ -315,24 +311,6 @@ Свайп между списками Свайп влево или вправо чтобы быстро переключать списки Измените настройки в Параметры -> Интерфейс - - День - Синий - День - Красный - Небесно голубой - Ночь - Прозрачный (белый текст) - Прозрачный (черный текст) - - - Та же что и в приложении - День - Синий - День - Красный - Голубой - Ночь - Прозрачный (белый текст) - Прозрачный (черный текст) - Старый стиль - Управление старыми задачами Удалить завершенные задачи Вы действительно хотите удалить все завершенные задачи? diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 2d66f939f..77cbc117d 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -272,34 +272,12 @@ Förkorta titel till en rad, med datum och listor nedanför Single line title only - Färgtema - Aktuellt: %s - Inställningen kräver Android 2.0 eller senare version - Widgettema Utseende på uppgiftsraden Använd telefonutseende Svep för att växla mellan listor Gör en svepande rörelse för att byta lista Gör en svepande rörelse åt vänster eller höger för att snabbt växla mellan listor Ändra inställningar i Inställningar -> Utseende - - Dag - blå - Dag - röd - Sky blue - Night - Transparent (white text) - Genomskinlig (svart text) - - - Same as app - Dag - blå - Dag - röd - Sky blue - Night - Transparent (white text) - Transparent (black text) - Gammalt format - Hantera gamla uppgifter Radera färdiga uppgifter Vill du verkligen radera alla dina färdiga uppgifter? diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index d4907ae0f..75afbd963 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -256,34 +256,12 @@ Tüm görev başlığını göster Tüm görev başlığı gösterilecek Görev başlığının ilk iki satırı gösterilecek - Renk Teması - Geçerli: %s - Ayarlar için Android 2.0+ zorunludur. - Bileşen Teması Görev Sırası Görünümü Telefon yerleşimini kullan Listeler arası sürükleme Listeler arası sürükleme Listelerde hızlı gezinme için sağa ya da sola kaydır Ayarlar -> Görünüm içinden ayarları değiştir - - Gündüz - Mavi - Gündüz - Kırmızı - Sky blue - Night - Transparent (white text) - Şeffaf (Siyah Metin) - - - Uygulama ile aynı - Gündüz - Mavi - Gündüz - Kırmızı - Sky blue - Night - Transparent (white text) - Transparent (black text) - Eski Biçem - Eski Görevleri Yönet Tamamlanan Görevleri Sil Gerçekten tüm tamamlanmış görevleri silmek istiyor musun? diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index df1eb7f01..4b4852f5d 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -247,34 +247,12 @@ 截取标题为一行，并在下方显示日期和列表 Single line title only - 主题 - 当前：%s - 该设置需要 Android 2.0+ - 小工具主题 任务栏 使用手机布局 在列表间滑动 在列表间滑动 向左或向右快速滑动来切换列表 在设置-&gt外观中修改选项 - - 蓝 - 红 - Sky blue - Night - Transparent (white text) - 透明(黑色文字) - - - 与应用相同 - 日间——蓝色 - 日间——红色 - Sky blue - Night - Transparent (white text) - Transparent (black text) - 老式风格 - 管理旧任务 删除已完成任务 您真的要删除所有已完成任务吗？ diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index 4089ccc6f..72bdef6ce 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -266,34 +266,12 @@ 截取標題為一行，並在下方顯示日期和列表 Single line title only - 主題 - 目前設定: %s - 該設置需要 Android 2.0+ - 小工具主題 任務工作欄 使用手機佈局 在列表間滑動 在列表間滑動 在列表間向左或向右快速滑動 在設置-&gt外觀中修改選項 - - 藍 - 紅 - Sky blue - Night - Transparent (white text) - 透明(黑色文字) - - - 與應用相同 - 日間——藍色 - 日間——紅色 - Sky blue - Night - Transparent (white text) - Transparent (black text) - 老式風格 - 管理舊任務工作 刪除已完成任務工作 您真的要刪除所有已完成任務工作嗎？ diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index 33d3c4ddb..0679127d4 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -200,37 +200,12 @@ notesVisible beastMode - transparent - theme - theme_widget - + voicePrefSection voiceInputEnabled voiceInputCreatesTask voiceRemindersEnabled - - - - white - white-red - white-alt - black - transparent - transparent-white - - - - - same-as-app - white - white-red - white-alt - black - transparent - transparent-white - legacy-widget - - + 10 @@ -405,7 +380,10 @@ TEA_ctrl_hide_section_pref TEA_ctrl_reminders_pref TEA_ctrl_timer_pref - TEA_ctrl_share_pref + TEA_ctrl_share_pref + use_dark_theme + use_dark_theme_widget + @string/TEA_ctrl_when_pref diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index a22ef15fe..21985ac10 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -652,15 +652,6 @@ Show comments in task edit - - Color theme - - Currently: %s - - Setting requires Android 2.0+ - - Widget theme - Task row appearance @@ -674,7 +665,6 @@ Show save and cancel - Swipe between lists @@ -692,34 +682,6 @@ @string/TEA_reminder_mode_nonstop - - - - Day - Blue - - Day - Red - - Sky blue - - Night - - Transparent (white text) - - Transparent (black text) - - - - - Same as app - Day - Blue - Day - Red - Sky blue - Night - Transparent (white text) - Transparent (black text) - Old Style - - diff --git a/astrid/src/main/res/values/strings.xml b/astrid/src/main/res/values/strings.xml new file mode 100644 index 000000000..281fde19a --- /dev/null +++ b/astrid/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + + Dark theme + Dark widget theme + \ No newline at end of file diff --git a/astrid/src/main/res/xml/preferences.xml b/astrid/src/main/res/xml/preferences.xml index d0ee3c8ef..13626b505 100644 --- a/astrid/src/main/res/xml/preferences.xml +++ b/astrid/src/main/res/xml/preferences.xml @@ -11,19 +11,17 @@ - - - - - + + + + +