archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make white/blue the default theme, white/red is the new setting

Browse Source
pull/14/head
Tim Su 14 years ago
parent 183edf4a7f
commit 51165c3925
25 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
astrid/res/values-ca/strings.xml
Unescape Escape View File

@ -849,8 +849,8 @@ File %1$s contained %2$s.\n\n
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-cs/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-da/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-de/strings.xml
Unescape Escape View File

@ -840,8 +840,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-es/strings.xml
Unescape Escape View File

@ -848,8 +848,8 @@ File %1$s contained %2$s.\n\n
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-fr/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-he/strings.xml
Unescape Escape View File

@ -851,8 +851,8 @@ File %1$s contained %2$s.\n\n
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-it/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-ja/strings.xml
Unescape Escape View File

@ -846,8 +846,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-ko/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-nb/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-nl/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-pl/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Dzień - Red</item>
<item>Dzień - Blue</item>
<item>Dzień - Red</item>
<item>Noc</item>
<item>Przezroczysty (biały tekst)</item>
<item>Przezroczysty (czarny tekst)</item>

2
astrid/res/values-pt-rBR/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-pt/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-ru/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-sv/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-th/strings.xml
Unescape Escape View File

@ -851,8 +851,8 @@ File %1$s contained %2$s.\n\n
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-tr/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Gündüz - Red</item>
<item>Gündüz - Blue</item>
<item>Gündüz - Red</item>
<item>Gece</item>
<item>Şeffaf (Beyaz yazı)</item>
<item>Şeffaf (Siyah yazı)</item>

2
astrid/res/values-zh-rCN/strings.xml
Unescape Escape View File

@ -843,8 +843,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values-zh-rTW/strings.xml
Unescape Escape View File

@ -844,8 +844,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

2
astrid/res/values/keys.xml
Unescape Escape View File

@ -174,7 +174,7 @@
<string-array name="EPr_theme_settings">
<!-- theme_settings: options for preference menu -->
<item>white</item>
<item>white-blue</item>
<item>white-red</item>
<item>black</item>
<item>transparent</item>
<item>transparent-white</item>

2
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -534,8 +534,8 @@
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>Day - Red</item>
<item>Day - Blue</item>
<item>Day - Red</item>
<item>Night</item>
<item>Transparent (White Text)</item>
<item>Transparent (Black Text)</item>

4
astrid/src/com/todoroo/astrid/service/ThemeService.java
Unescape Escape View File

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

6
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save