From 51165c3925e1f211c8beeb176f0315beea495d54 Mon Sep 17 00:00:00 2001 From: Tim Su Date: Thu, 23 Feb 2012 02:40:20 -0800 Subject: [PATCH] Make white/blue the default theme, white/red is the new setting --- astrid/res/values-ca/strings.xml | 2 +- astrid/res/values-cs/strings.xml | 2 +- astrid/res/values-da/strings.xml | 2 +- astrid/res/values-de/strings.xml | 2 +- astrid/res/values-es/strings.xml | 2 +- astrid/res/values-fr/strings.xml | 2 +- astrid/res/values-he/strings.xml | 2 +- astrid/res/values-it/strings.xml | 2 +- astrid/res/values-ja/strings.xml | 2 +- astrid/res/values-ko/strings.xml | 2 +- astrid/res/values-nb/strings.xml | 2 +- astrid/res/values-nl/strings.xml | 2 +- astrid/res/values-pl/strings.xml | 2 +- astrid/res/values-pt-rBR/strings.xml | 2 +- astrid/res/values-pt/strings.xml | 2 +- astrid/res/values-ru/strings.xml | 2 +- astrid/res/values-sv/strings.xml | 2 +- astrid/res/values-th/strings.xml | 2 +- astrid/res/values-tr/strings.xml | 2 +- astrid/res/values-zh-rCN/strings.xml | 2 +- astrid/res/values-zh-rTW/strings.xml | 2 +- astrid/res/values/keys.xml | 2 +- astrid/res/values/strings-core.xml | 2 +- astrid/src/com/todoroo/astrid/service/ThemeService.java | 4 ++-- astrid/src/com/todoroo/astrid/service/UpgradeService.java | 6 ------ 25 files changed, 25 insertions(+), 31 deletions(-) diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml index 5d800eee4..bb709bd92 100644 --- a/astrid/res/values-ca/strings.xml +++ b/astrid/res/values-ca/strings.xml @@ -849,8 +849,8 @@ File %1$s contained %2$s.\n\n - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml index c640672a2..0de3b2563 100644 --- a/astrid/res/values-cs/strings.xml +++ b/astrid/res/values-cs/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml index 3ac7408be..3ae85a499 100644 --- a/astrid/res/values-da/strings.xml +++ b/astrid/res/values-da/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml index 0d3e02843..9396988e3 100644 --- a/astrid/res/values-de/strings.xml +++ b/astrid/res/values-de/strings.xml @@ -840,8 +840,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml index 6e6f68c2c..08769617c 100644 --- a/astrid/res/values-es/strings.xml +++ b/astrid/res/values-es/strings.xml @@ -848,8 +848,8 @@ File %1$s contained %2$s.\n\n - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml index ca44b6857..eb509597f 100644 --- a/astrid/res/values-fr/strings.xml +++ b/astrid/res/values-fr/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-he/strings.xml b/astrid/res/values-he/strings.xml index 856ac155c..28bf41794 100644 --- a/astrid/res/values-he/strings.xml +++ b/astrid/res/values-he/strings.xml @@ -851,8 +851,8 @@ File %1$s contained %2$s.\n\n - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml index a664695ff..1135e2469 100644 --- a/astrid/res/values-it/strings.xml +++ b/astrid/res/values-it/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml index 91fd2f628..b8f246229 100644 --- a/astrid/res/values-ja/strings.xml +++ b/astrid/res/values-ja/strings.xml @@ -846,8 +846,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml index 02024717b..82302d317 100644 --- a/astrid/res/values-ko/strings.xml +++ b/astrid/res/values-ko/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml index ee2a082db..95612d971 100644 --- a/astrid/res/values-nb/strings.xml +++ b/astrid/res/values-nb/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml index 1063de201..3efa935a7 100644 --- a/astrid/res/values-nl/strings.xml +++ b/astrid/res/values-nl/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml index d13d49cca..331d70261 100644 --- a/astrid/res/values-pl/strings.xml +++ b/astrid/res/values-pl/strings.xml @@ -843,8 +843,8 @@ - Dzień - Red Dzień - Blue + Dzień - Red Noc Przezroczysty (biały tekst) Przezroczysty (czarny tekst) diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml index a202af2b2..7469e499c 100644 --- a/astrid/res/values-pt-rBR/strings.xml +++ b/astrid/res/values-pt-rBR/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml index 5201067bd..60c0aba8a 100644 --- a/astrid/res/values-pt/strings.xml +++ b/astrid/res/values-pt/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml index aed816b78..64fca00d8 100644 --- a/astrid/res/values-ru/strings.xml +++ b/astrid/res/values-ru/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml index 07ff20076..45cac2deb 100644 --- a/astrid/res/values-sv/strings.xml +++ b/astrid/res/values-sv/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml index 54f3ea7c1..78a191df4 100644 --- a/astrid/res/values-th/strings.xml +++ b/astrid/res/values-th/strings.xml @@ -851,8 +851,8 @@ File %1$s contained %2$s.\n\n - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml index b02aa57ae..01235e83d 100644 --- a/astrid/res/values-tr/strings.xml +++ b/astrid/res/values-tr/strings.xml @@ -843,8 +843,8 @@ - Gündüz - Red Gündüz - Blue + Gündüz - Red Gece Şeffaf (Beyaz yazı) Şeffaf (Siyah yazı) diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml index f1b0d7d87..795bb7b57 100644 --- a/astrid/res/values-zh-rCN/strings.xml +++ b/astrid/res/values-zh-rCN/strings.xml @@ -843,8 +843,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml index adb3206a1..bece88c8a 100644 --- a/astrid/res/values-zh-rTW/strings.xml +++ b/astrid/res/values-zh-rTW/strings.xml @@ -844,8 +844,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml index 576b1c236..ce9a2d7d4 100644 --- a/astrid/res/values/keys.xml +++ b/astrid/res/values/keys.xml @@ -174,7 +174,7 @@ white - white-blue + white-red black transparent transparent-white diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml index 86f759c53..6ba10a21d 100644 --- a/astrid/res/values/strings-core.xml +++ b/astrid/res/values/strings-core.xml @@ -534,8 +534,8 @@ - Day - Red Day - Blue + Day - Red Night Transparent (White Text) Transparent (Black Text) diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 81b95a509..35dc64294 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -12,7 +12,7 @@ import com.todoroo.andlib.utility.Preferences; public class ThemeService { public static final String THEME_WHITE = "white"; - public static final String THEME_WHITE_BLUE = "white-blue"; + public static final String THEME_WHITE_RED = "white-red"; public static final String THEME_BLACK = "black"; public static final String THEME_TRANSPARENT = "transparent"; public static final String THEME_TRANSPARENT_WHITE = "transparent-white"; @@ -32,7 +32,7 @@ public class ThemeService { return R.style.Theme_Transparent; else if(THEME_TRANSPARENT_WHITE.equals(preference)) return R.style.Theme_TransparentWhite; - else if (THEME_WHITE.equals(preference)) + else if (THEME_WHITE_RED.equals(preference)) return R.style.Theme_White; else return R.style.Theme_White_Blue; diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 78bcef340..5843e3626 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -112,12 +112,6 @@ public final class UpgradeService { if(from == 135) AddOnService.recordOem(); - if (from > 0 && from < V4_0_0) { - String preference = Preferences.getStringValue(R.string.p_theme); - if (ThemeService.THEME_WHITE.equals(preference)) - Preferences.setString(R.string.p_theme, ThemeService.THEME_WHITE_BLUE); - } - 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$