Pare themes to light and dark

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

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

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);
+        String preference = Preferences.getBoolean(R.string.p_use_dark_theme_widget, false) ? THEME_BLACK : THEME_WHITE;
-        if (TextUtils.isEmpty(preference) || THEME_WIDGET_SAME_AS_APP.equals(preference)) {
+        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;
-    }
-
 }

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

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

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()) {
+            if (isDarkTheme()) {
-                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()) {
                 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;

astrid/src/main/res/layout/widget_initialized_legacy.xml

@@ -1,60 +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/widget"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
-
-    <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="fill_parent"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@drawable/widget_header_legacy">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
-            android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
-        <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
-    </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
-
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@color/widget_body_legacy"
-        android:orientation="vertical">
-    </LinearLayout>
-</LinearLayout>

astrid/src/main/res/values-ca/strings.xml

@@ -220,9 +220,6 @@
 	<string name="EPr_showNotes_desc_enabled">Es mostraran sempre les anotacions</string>
 	<string name="EPr_fullTask_title">Mostra el títol sencer de la tasca</string>
 	<string name="EPr_fullTask_desc_enabled">Es mostrarà el títol sencer de la tasca</string>
-	<string name="EPr_theme_title">Color del tema</string>
-	<string name="EPr_theme_desc">Actualment: %s</string>
-	<string name="EPr_theme_desc_unsupported">Aquest paràmetre requrereix l\'Android 2.0 o superior</string>
 	<string name="EPr_manage_delete_completed_message">Segur que voleu suprimir totes les tasques completades?</string>
 	<string name="EPr_manage_delete_completed_status">S\'han suprimit %d tasques</string>
 	<string name="EPr_manage_delete_completed_gcal_message">Segur que voleu suprimir els esdeveniments de calendari de les tasques completades?</string>

astrid/src/main/res/values-cs/strings.xml

@@ -213,31 +213,10 @@
 	<string name="EPr_fullTask_title">Zobrazit úplný název úkolu</string>
 	<string name="EPr_fullTask_desc_enabled">Zobrazí se úplný název úkolu</string>
 	<string name="EPr_fullTask_desc_disabled">Zobrazí se první dva řádky názvu úkolu</string>
-	<string name="EPr_theme_title">Barevný motiv</string>
-	<string name="EPr_theme_desc">Aktuální: %s</string>
-	<string name="EPr_theme_desc_unsupported">Nastavení vyžaduje Android 2.0+</string>
 	<string name="EPr_taskRowPrefs_title">Vzhled řádku úkolu</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Čas události v kalendáři</string>
 	<string name="EPr_cal_end_at_due_time">Událost v kalendáři končí splněním úkolu</string>
 	<string name="EPr_cal_start_at_due_time">Událost v kalendáři začíná splněním úkolu</string>
-	<string-array name="EPr_themes">
-		<item>Den - Modrá</item>
-		<item>Den - Červená</item>
-		<item>Sky blue</item>
-		<item>Noc</item>
-		<item>Průhledné (Bílý text)</item>
-		<item>Průhledné (Tmavý text)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Same as app</item>
-		<item>Den - Modrá</item>
-		<item>Den - Červená</item>
-		<item>Sky blue</item>
-		<item>Noc</item>
-		<item>Průhledné (Bílý text)</item>
-		<item>Průhledné (Tmavý text)</item>
-		<item>Starý styl</item>
-	</string-array>
 	<string name="EPr_manage_header">Spravovat staré úkoly</string>
 	<string name="EPr_manage_delete_completed">Odstranit dokončené úkoly</string>
 	<string name="EPr_manage_delete_completed_message">Opravdu chcete odstranit všechny dokončené úkoly?</string>
@@ -478,7 +457,7 @@
 	</string-array>
 	<string-array name="reminders">
 		<item>Ahoj! Máš chvíli?</item>
-		<item>Je skvělý den na</item>
+		<item>Můžu Tě na chvíli vidět?</item>
 		<item>Máš pár minut?</item>
 		<item>Zapomněl jsi?</item>
 		<item>Omlouvám se!</item>
@@ -515,12 +494,12 @@
 		<item>Jsem na Tebe pyšný! Pojď to dokončit!</item>
 		<item>A little snack after you finish this?</item>
 		<item>Jen tenhle úkol? Prosím?</item>
-		<item>Je čas zkrátit Tvůj seznam úkolů!</item>
+		<item>Můžeš výt šťastná/ý! Jen tohle dokonči!</item>
 		<item>Slibuji Ti, že se budeš cítit lépe, když tohle dokončíš!</item>
 		<item>Have I mentioned you are awesome recently? Keep it up!</item>
 		<item>A task a day keeps the clutter away... Goodbye clutter!</item>
 		<item>How do you do it? Wow, I\'m impressed!</item>
-		<item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+		<item>Plánuješ tohle vůbec někdy udělat?</item>
 		<item>Lovely weather for a job like this, isn\'t it?</item>
 		<item>A spot of tea while you work on this?</item>
 		<item>If only you had already done this, then you could go outside and play.</item>

astrid/src/main/res/values-da/strings.xml

@@ -119,7 +119,6 @@
 	<string name="EPr_fontSize_desc">Skriftstørrelse på den centrale liste</string>
 	<string name="EPr_showNotes_title">Vis noter i opgave</string>
 	<string name="EPr_showNotes_desc_enabled">Noter vises altid</string>
-	<string name="EPr_theme_desc">Nuværende: %s</string>
 	<string name="AOA_title">Tilføjelser</string>
 	<string name="AOA_internal_author">Tasks team</string>
 	<string name="AOA_tab_installed">Installerede</string>

astrid/src/main/res/values-de/strings.xml

@@ -304,10 +304,6 @@
 	<string name="EPr_menu_items">Menüeinträge</string>
 	<string name="EPr_list_view">Listenansicht</string>
 	<string name="EPr_show_task_edit_comments">Kommentare bei Aufgabeneingabe anzeigen </string>
-	<string name="EPr_theme_title">Farbschema</string>
-	<string name="EPr_theme_desc">Momentan: %s</string>
-	<string name="EPr_theme_desc_unsupported">Einstellungen benötigen mindestens Android 2.0</string>
-	<string name="EPr_theme_widget_title">Widget Theme</string>
 	<string name="EPr_taskRowPrefs_title">Aussehen der Aufgabenzeilen</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Zeitpunkt Kalendertermin</string>
 	<string name="EPr_force_phone_layout">Telefon Layout nutzen</string>
@@ -316,24 +312,6 @@
 	<string name="swipe_lists_helper_title">Zum Wechseln der Listen wischen</string>
 	<string name="swipe_lists_helper_header">Zieh nach links oder rechts, um schnell zwischen Listen zu wechseln</string>
 	<string name="swipe_lists_helper_subtitle">Ändere die Einstellungen unter Einstellungen -&gt; Erscheinungsbild</string>
-	<string-array name="EPr_themes">
-		<item>Tag - Blau</item>
-		<item>Tag -Rot</item>
-		<item>Himmelblau</item>
-		<item>Nacht</item>
-		<item>Transparent (weißer Text)</item>
-		<item>Transparent (schwarzer Text)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Wie die App</item>
-		<item>Tag - Blau</item>
-		<item>Tag - Rot</item>
-		<item>Himmelblau</item>
-		<item>Nacht</item>
-		<item>Transparent (weißer Text)</item>
-		<item>Transparent (schwarzer Text)</item>
-		<item>Retro</item>
-	</string-array>
 	<string name="EPr_manage_header">Alte Aufgaben verwalten</string>
 	<string name="EPr_manage_delete_completed">Erledigte Aufgaben löschen</string>
 	<string name="EPr_manage_delete_completed_message">Willst du wirklich alle erledigten Aufgaben löschen?</string>

astrid/src/main/res/values-es/strings.xml

@@ -308,34 +308,12 @@
 	<string name="EPr_use_filters_title">Usar filtros</string>
 	<string name="EPr_menu_items">Objetos del menú</string>
 	<string name="EPr_list_view">Vista de listas</string>
-	<string name="EPr_theme_title">Combinación de colores</string>
-	<string name="EPr_theme_desc">Actualmente: %s</string>
-	<string name="EPr_theme_desc_unsupported">Esta configuración requiere Android 2.0+</string>
-	<string name="EPr_theme_widget_title">Tema del widget</string>
 	<string name="EPr_taskRowPrefs_title">Apariencia de la fila de tareas</string>
 	<string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
 	<string name="EPr_swipe_lists_performance_title">Deslizar entre las listas</string>
 	<string name="swipe_lists_helper_title">Deslizar entre listas</string>
 	<string name="swipe_lists_helper_header">Deslizar a izquierda o derecha para moverse rápidamente entre listas</string>
 	<string name="swipe_lists_helper_subtitle">Cambiar configuración en Ajustes -&gt; Apariencia</string>
-	<string-array name="EPr_themes">
-		<item>Día - Azul</item>
-		<item>Día - Rojo</item>
-		<item>Azul cielo</item>
-		<item>Noche</item>
-		<item>Transparent (white text)</item>
-		<item>Transparente (Texto Negro)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>El mismo que la app</item>
-		<item>Día - Azul</item>
-		<item>Día - Rojo</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>Estilo antiguo</item>
-	</string-array>
 	<string name="EPr_manage_header">Administrar tareas antiguas</string>
 	<string name="EPr_manage_delete_completed">Borrar tareas completadas</string>
 	<string name="EPr_manage_delete_completed_message">¿Seguro que desea borrar todas las tareas completadas?</string>

astrid/src/main/res/values-fr/strings.xml

@@ -51,7 +51,7 @@
 	<string name="actfm_inapp_billing">Passer en premium</string>
 	<string name="actfm_inapp_billing_summary">Ajoutez des fichiers, faites des sauvegardes vocales, bénéficiez du support premium et bien plus</string>
 	<string name="actfm_tag_not_authorized_title">Non autorisé</string>
-	<string name="actfm_tag_not_authorized_body">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?</string>
+	<string name="actfm_tag_not_authorized_body">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?</string>
 	<string name="actfm_tag_not_authorized_new_list">Créer une nouvelle liste</string>
 	<string name="actfm_tag_not_authorized_leave_list">Quitter la liste</string>
 	<string name="actfm_sync_ongoing">Synchronisation en cours...</string>
@@ -307,10 +307,6 @@
 	<string name="EPr_menu_items">Eléments de menu</string>
 	<string name="EPr_list_view">Vue sous forme de liste</string>
 	<string name="EPr_show_task_edit_comments">Afficher les commentaires dans l\'édition de tâches</string>
-	<string name="EPr_theme_title">Thème de couleur</string>
-	<string name="EPr_theme_desc">Actuellement : %s</string>
-	<string name="EPr_theme_desc_unsupported">Ce paramètre requiert Android 2.0+.</string>
-	<string name="EPr_theme_widget_title">Thème de gadget</string>
 	<string name="EPr_taskRowPrefs_title">Style des lignes de tâche</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Heure de l\'évenement dans le calendrier</string>
 	<string name="EPr_cal_end_at_due_time">Terminer les événements dans le calendrier à l\'échéance</string>
@@ -321,24 +317,6 @@
 	<string name="swipe_lists_helper_title">Glisser entre les listes.</string>
 	<string name="swipe_lists_helper_header">\"Glissez  vers la gauche ou la droite pour passer rapidement d\'une liste à l\'autre\"</string>
 	<string name="swipe_lists_helper_subtitle">Changez les préférences dans Préférences -&gt; Apparence</string>
-	<string-array name="EPr_themes">
-		<item>Jour - Bleu</item>
-		<item>Jour - Rouge</item>
-		<item>Bleu ciel</item>
-		<item>Nuit</item>
-		<item>Transparent (texte en blanc)</item>
-		<item>Transparent (Texte Noir)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Même que l\'application</item>
-		<item>Jour - Bleu</item>
-		<item>Jour - Rouge</item>
-		<item>Bleu ciel</item>
-		<item>Nuit</item>
-		<item>Transparent (texte en blanc)</item>
-		<item>Transparent (texte en noir)</item>
-		<item>Ancien Style</item>
-	</string-array>
 	<string name="EPr_manage_header">Gérer les anciennes tâches</string>
 	<string name="EPr_manage_delete_completed">Supprimer les tâches terminées</string>
 	<string name="EPr_manage_delete_completed_message">Confirmer la suppression de toutes vos tâches ?</string>

astrid/src/main/res/values-it/strings.xml

@@ -266,34 +266,12 @@
 		<item>Riduci il titolo a una riga con la data e gli elenchi sotto</item>
 		<item>Single line title only</item>
 	</string-array>
-	<string name="EPr_theme_title">Tema del colore</string>
-	<string name="EPr_theme_desc">Attualmente: %s</string>
-	<string name="EPr_theme_desc_unsupported">L\'impostazione richiede Android 2.0+</string>
-	<string name="EPr_theme_widget_title">Tema del widget</string>
 	<string name="EPr_taskRowPrefs_title">Aspetto della riga dei task</string>
 	<string name="EPr_force_phone_layout">Usa il layout del telefono</string>
 	<string name="EPr_swipe_lists_performance_title">Scorri tra le liste</string>
 	<string name="swipe_lists_helper_title">Scorri tra le liste</string>
 	<string name="swipe_lists_helper_header">Scorri a destra o a sinistra per muoverti rapidamente fra le liste</string>
 	<string name="swipe_lists_helper_subtitle">Modifica le impostazioni in Impostazioni -&gt; Aspetto</string>
-	<string-array name="EPr_themes">
-		<item>Giorno - Blu</item>
-		<item>Giorno - Rosso</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (Black Text)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Come l\'app</item>
-		<item>Giorno - Blu</item>
-		<item>Giorno - Rosso</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>Vecchio Stile</item>
-	</string-array>
 	<string name="EPr_manage_header">Gestisci compiti vecchi</string>
 	<string name="EPr_manage_delete_completed">Elimina i compiti completati</string>
 	<string name="EPr_manage_delete_completed_message">Vuoi davvero eliminare tutti i compiti completati?</string>

astrid/src/main/res/values-iw/strings.xml

@@ -297,10 +297,6 @@
 	<string name="EPr_menu_items">פריטי תפריט</string>
 	<string name="EPr_list_view">תצוגת רשימה</string>
 	<string name="EPr_show_task_edit_comments">הצגת הערות בעריכת משימה</string>
-	<string name="EPr_theme_title">צבע ערכת נושא</string>
-	<string name="EPr_theme_desc">כעת: %s</string>
-	<string name="EPr_theme_desc_unsupported">הפעלת הגדרות דורשת גירסא 2.0 ומעלה של אנדרואיד</string>
-	<string name="EPr_theme_widget_title">ערכת חֲפִיץ מסך</string>
 	<string name="EPr_taskRowPrefs_title">חזות שורת המשימה</string>
 	<string name="EPr_cal_end_or_start_at_due_time">משך אירוע יומן</string>
 	<string name="EPr_cal_end_at_due_time">סיים את אירועי היומן במועד היעד?</string>
@@ -310,24 +306,6 @@
 	<string name="swipe_lists_helper_title">עִלְעוּל בין רשימות</string>
 	<string name="swipe_lists_helper_header">עִלְעוּל ימינה ושמאלה למעבר מהיר בין רשימות</string>
 	<string name="swipe_lists_helper_subtitle">שנה הגדרות תחת הגדרות&gt;חזות</string>
-	<string-array name="EPr_themes">
-		<item>יום - כחול</item>
-		<item>יום - אדום</item>
-		<item>תכלת</item>
-		<item>לילה</item>
-		<item>שקוף (טקסט לבן)</item>
-		<item>שקוף (טקסט שחור)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>שמור כְּיִשּׂוּמוֹן</item>
-		<item>יום - כחול</item>
-		<item>יום - אדום</item>
-		<item>תכלת</item>
-		<item>לילה</item>
-		<item>שקוף (טקסט לבן)</item>
-		<item>שקוף (טקסט שחור)</item>
-		<item>סגנון ישן</item>
-	</string-array>
 	<string name="EPr_manage_header">נהל משימות ישנות</string>
 	<string name="EPr_manage_delete_completed">מַחֲקִי משימות שבוצעו</string>
 	<string name="EPr_manage_delete_completed_message">האם אתה בטוח שברצונך למחוק את כל המשימות שבוצעו?</string>

astrid/src/main/res/values-ja/strings.xml

@@ -164,15 +164,6 @@
 	<string name="EPr_appearance_header">外観</string>
 	<string name="EPr_fontSize_title">リストの文字サイズ</string>
 	<string name="EPr_fontSize_desc">メインのリスト画面の文字サイズ</string>
-	<string name="EPr_theme_desc">現在の設定: %s</string>
-	<string-array name="EPr_themes">
-		<item>Day - Blue</item>
-		<item>Day - Red</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (Black Text)</item>
-	</string-array>
 	<string name="AOA_title">アドオン</string>
 	<string name="AOA_tab_installed">インストール済</string>
 	<string name="AOA_tab_available">追加</string>

astrid/src/main/res/values-ko/strings.xml

@@ -316,10 +316,6 @@
 	<string name="EPr_menu_items">메뉴 항목</string>
 	<string name="EPr_list_view">목록 보기</string>
 	<string name="EPr_show_task_edit_comments">일정 편집에서 댓글 보기</string>
-	<string name="EPr_theme_title">색상 테마</string>
-	<string name="EPr_theme_desc">현재: %s</string>
-	<string name="EPr_theme_desc_unsupported">설정은 안드로이드 2.0 이상이 필요합니다</string>
-	<string name="EPr_theme_widget_title">위젯 테마</string>
 	<string name="EPr_taskRowPrefs_title">일정 표시줄 보기 설정</string>
 	<string name="EPr_cal_end_or_start_at_due_time">달력 이벤트 시간</string>
 	<string name="EPr_cal_end_at_due_time">설정한 시간에 달력 이벤트 종료</string>
@@ -330,24 +326,6 @@
 	<string name="swipe_lists_helper_title">목록간 스와이프 이동하기</string>
 	<string name="swipe_lists_helper_header">목록간 빠른 이동하려면 좌우로 스와이프 이동하기</string>
 	<string name="swipe_lists_helper_subtitle">설정에 있는 설정 변경하기 -&gt; 모양</string>
-	<string-array name="EPr_themes">
-		<item>낮 - 파란색</item>
-		<item>낮 - 빨간색</item>
-		<item>하늘색</item>
-		<item>밤</item>
-		<item>투명하게 (흰색 본문)</item>
-		<item>투명 (검은색 텍스트)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>어플과 동일하게</item>
-		<item>낮 - 파란색</item>
-		<item>낮 - 빨간색</item>
-		<item>하늘색</item>
-		<item>밤</item>
-		<item>투명하게 (흰색 본문)</item>
-		<item>투명하게 (검은색 본문)</item>
-		<item>오래된 스타일</item>
-	</string-array>
 	<string name="EPr_manage_header">오래된 일정 관리하기</string>
 	<string name="EPr_manage_delete_completed">완료한 일정 지우기</string>
 	<string name="EPr_manage_delete_completed_message">완료한 일정을 모두 삭제하시겠습니까?</string>

astrid/src/main/res/values-nb/strings.xml

@@ -101,7 +101,6 @@
 	<string name="EPr_fontSize_desc">Tekststørrelse for hovedlista</string>
 	<string name="EPr_showNotes_title">Vis notater i oppgaven</string>
 	<string name="EPr_showNotes_desc_enabled">Notater vil alltid vises</string>
-	<string name="EPr_theme_desc">For tiden: %s</string>
 	<string name="AOA_title">Tasks: Tillegg</string>
 	<string name="AOA_internal_author">Tasks-teamet</string>
 	<string name="AOA_tab_installed">Installert</string>

astrid/src/main/res/values-nl/strings.xml

@@ -309,10 +309,6 @@
 	<string name="EPr_hide_plus_button">Verberg plus knop</string>
 	<string name="EPr_list_view">Lijst weergave</string>
 	<string name="EPr_show_task_edit_comments">Toon opmerkingen in taak bewerken</string>
-	<string name="EPr_theme_title">Kleuren Thema</string>
-	<string name="EPr_theme_desc">Nu: %s</string>
-	<string name="EPr_theme_desc_unsupported">Instelllingen vereisen Android 2.0+</string>
-	<string name="EPr_theme_widget_title">Widget Thema</string>
 	<string name="EPr_taskRowPrefs_title">Taakrij Weergave</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Agenda item tijd</string>
 	<string name="EPr_cal_end_at_due_time">Agenda item op tijd afronden</string>
@@ -323,24 +319,6 @@
 	<string name="swipe_lists_helper_title">Swipe tussen lijsten</string>
 	<string name="swipe_lists_helper_header">Swipe links of rechts om snel tussen lijsten te bladeren</string>
 	<string name="swipe_lists_helper_subtitle">Verander instellingen in Instellingen --&gt; Uiterlijk</string>
-	<string-array name="EPr_themes">
-		<item>Dag - Blauw</item>
-		<item>Dag - Rood</item>
-		<item>Hemelsblauw</item>
-		<item>Nacht</item>
-		<item>Transparant (witte tekst)</item>
-		<item>Transparant (Zwarte Tekst)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Zelfde als app</item>
-		<item>Dag - Blauw</item>
-		<item>Dag - Rood</item>
-		<item>Hemelsblauw</item>
-		<item>Nacht</item>
-		<item>Transparant (witte tekst)</item>
-		<item>Transparant (zwarte tekst)</item>
-		<item>Oude Stijl</item>
-	</string-array>
 	<string name="EPr_manage_header">Oude taken beheren</string>
 	<string name="EPr_manage_delete_completed">Voltooide taken verwijderen</string>
 	<string name="EPr_manage_delete_completed_message">Alle voltooide taken werkelijk verwijderen?</string>

astrid/src/main/res/values-pl/strings.xml

@@ -302,10 +302,6 @@
 	<string name="EPr_menu_items">Pozycje menu</string>
 	<string name="EPr_list_view">Widok listy</string>
 	<string name="EPr_show_task_edit_comments">Pokaż komentarze w edycji zadania</string>
-	<string name="EPr_theme_title">Kolorystyka</string>
-	<string name="EPr_theme_desc">Aktualnie: %s</string>
-	<string name="EPr_theme_desc_unsupported">Ustawienia wymagaja Androida 2.0+</string>
-	<string name="EPr_theme_widget_title">Skórka Widgeta</string>
 	<string name="EPr_taskRowPrefs_title">Wygląd rzędu zadań</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Czas zdarzenia kalendarza</string>
 	<string name="EPr_cal_end_at_due_time">Zakończ zadania kalendarza w ustalonym czasie</string>
@@ -316,24 +312,6 @@
 	<string name="swipe_lists_helper_title">Przeciągaj pomiędzy listami</string>
 	<string name="swipe_lists_helper_header">Przeciągnij w lewo lub prawo aby szybko przełączyć się między listami</string>
 	<string name="swipe_lists_helper_subtitle">Zmień ustawienia w Ustawienia -&amp;gl; Wygląd</string>
-	<string-array name="EPr_themes">
-		<item>Dzień - Blue</item>
-		<item>Dzień - Red</item>
-		<item>Błękit nieba</item>
-		<item>Noc</item>
-		<item>Przezroczysty (biały tekst)</item>
-		<item>Przezroczysty (czarny tekst)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Taki jak aplikacji</item>
-		<item>Dzień - Niebieski</item>
-		<item>Dzień - Czerwony</item>
-		<item>Błękit nieba</item>
-		<item>Noc</item>
-		<item>Przezroczysty (biały tekst)</item>
-		<item>Przezroczysty (czarny tekst)</item>
-		<item>Old Style</item>
-	</string-array>
 	<string name="EPr_manage_header">Zarządzaj starymi zadaniami</string>
 	<string name="EPr_manage_delete_completed">Usuń zakończone zadania</string>
 	<string name="EPr_manage_delete_completed_message">Czy na pewno chcesz usunąć wszystkie zadania wykonane?</string>

astrid/src/main/res/values-pt-rBR/strings.xml

@@ -268,34 +268,12 @@
 		<item>Truncar título para uma única linha com data e lista abaixo</item>
 		<item>Single line title only</item>
 	</string-array>
-	<string name="EPr_theme_title">Tema</string>
-	<string name="EPr_theme_desc">Atualmente: %s</string>
-	<string name="EPr_theme_desc_unsupported">Esta opção requer Android 2.0+</string>
-	<string name="EPr_theme_widget_title">Tema do widget</string>
 	<string name="EPr_taskRowPrefs_title">Aparência da Tarefa</string>
 	<string name="EPr_force_phone_layout">Usar layout do telefone</string>
 	<string name="EPr_swipe_lists_performance_title">Navegar entre as listas</string>
 	<string name="swipe_lists_helper_title">Navegar entre as listas</string>
 	<string name="swipe_lists_helper_header">Deslizar para a esquerda ou direita para mover-se rapidamente entre listas</string>
 	<string name="swipe_lists_helper_subtitle">Alterar configurações em Configurações -&gt; Aparência</string>
-	<string-array name="EPr_themes">
-		<item>Dia - Azul</item>
-		<item>Dia - Vermelho</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparente (Texto preto)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Mesmo que o aplicativo</item>
-		<item>Dia - Azul</item>
-		<item>Dia - Vermelho</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>Estilo antigo</item>
-	</string-array>
 	<string name="EPr_manage_header">Gerenciar tarefas antigas</string>
 	<string name="EPr_manage_delete_completed">Exclui as tarefas concluídas</string>
 	<string name="EPr_manage_delete_completed_message">Você realmente deseja excluir todas as tarefas concluídas?</string>

astrid/src/main/res/values-ru/strings.xml

@@ -302,10 +302,6 @@
 	<string name="EPr_menu_items">Элементы меню</string>
 	<string name="EPr_list_view">Списком</string>
 	<string name="EPr_show_task_edit_comments">Показывать комментарии в редакторе задачи</string>
-	<string name="EPr_theme_title">Цветовая тема</string>
-	<string name="EPr_theme_desc">Текущая: %s</string>
-	<string name="EPr_theme_desc_unsupported">Настройка требует Android 2.0+</string>
-	<string name="EPr_theme_widget_title">Тема виджета</string>
 	<string name="EPr_taskRowPrefs_title">Внешний вид задач в списке</string>
 	<string name="EPr_cal_end_or_start_at_due_time">Время события в календаре</string>
 	<string name="EPr_cal_end_at_due_time">Завершение события при наступлении срока</string>
@@ -315,24 +311,6 @@
 	<string name="swipe_lists_helper_title">Свайп между списками</string>
 	<string name="swipe_lists_helper_header">Свайп влево или вправо чтобы быстро переключать списки</string>
 	<string name="swipe_lists_helper_subtitle">Измените настройки в Параметры -&gt; Интерфейс</string>
-	<string-array name="EPr_themes">
-		<item>День - Синий</item>
-		<item>День - Красный</item>
-		<item>Небесно голубой</item>
-		<item>Ночь</item>
-		<item>Прозрачный (белый текст)</item>
-		<item>Прозрачный (черный текст)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Та же что и в приложении</item>
-		<item>День - Синий</item>
-		<item>День - Красный</item>
-		<item>Голубой</item>
-		<item>Ночь</item>
-		<item>Прозрачный (белый текст)</item>
-		<item>Прозрачный (черный текст)</item>
-		<item>Старый стиль</item>
-	</string-array>
 	<string name="EPr_manage_header">Управление старыми задачами</string>
 	<string name="EPr_manage_delete_completed">Удалить завершенные задачи</string>
 	<string name="EPr_manage_delete_completed_message">Вы действительно хотите удалить все завершенные задачи?</string>

astrid/src/main/res/values-sv/strings.xml

@@ -272,34 +272,12 @@
 		<item>Förkorta titel till en rad, med datum och listor nedanför</item>
 		<item>Single line title only</item>
 	</string-array>
-	<string name="EPr_theme_title">Färgtema</string>
-	<string name="EPr_theme_desc">Aktuellt: %s</string>
-	<string name="EPr_theme_desc_unsupported">Inställningen kräver Android 2.0 eller senare version</string>
-	<string name="EPr_theme_widget_title">Widgettema</string>
 	<string name="EPr_taskRowPrefs_title">Utseende på uppgiftsraden</string>
 	<string name="EPr_force_phone_layout">Använd telefonutseende</string>
 	<string name="EPr_swipe_lists_performance_title">Svep för att växla mellan listor</string>
 	<string name="swipe_lists_helper_title">Gör en svepande rörelse för att byta lista</string>
 	<string name="swipe_lists_helper_header">Gör en svepande rörelse åt vänster eller höger för att snabbt växla mellan listor</string>
 	<string name="swipe_lists_helper_subtitle">Ändra inställningar i Inställningar -&gt; Utseende</string>
-	<string-array name="EPr_themes">
-		<item>Dag - blå</item>
-		<item>Dag - röd</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Genomskinlig (svart text)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Same as app</item>
-		<item>Dag - blå</item>
-		<item>Dag - röd</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>Gammalt format</item>
-	</string-array>
 	<string name="EPr_manage_header">Hantera gamla uppgifter</string>
 	<string name="EPr_manage_delete_completed">Radera färdiga uppgifter</string>
 	<string name="EPr_manage_delete_completed_message">Vill du verkligen radera alla dina färdiga uppgifter?</string>

astrid/src/main/res/values-tr/strings.xml

@@ -256,34 +256,12 @@
 	<string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
 	<string name="EPr_fullTask_desc_enabled">Tüm görev başlığı gösterilecek</string>
 	<string name="EPr_fullTask_desc_disabled">Görev başlığının ilk iki satırı gösterilecek</string>
-	<string name="EPr_theme_title">Renk Teması</string>
-	<string name="EPr_theme_desc">Geçerli: %s</string>
-	<string name="EPr_theme_desc_unsupported">Ayarlar için Android 2.0+ zorunludur.</string>
-	<string name="EPr_theme_widget_title">Bileşen Teması</string>
 	<string name="EPr_taskRowPrefs_title">Görev Sırası Görünümü</string>
 	<string name="EPr_force_phone_layout">Telefon yerleşimini kullan</string>
 	<string name="EPr_swipe_lists_performance_title">Listeler arası sürükleme</string>
 	<string name="swipe_lists_helper_title">Listeler arası sürükleme</string>
 	<string name="swipe_lists_helper_header">Listelerde hızlı gezinme için sağa ya da sola kaydır</string>
 	<string name="swipe_lists_helper_subtitle">Ayarlar -&gt; Görünüm içinden ayarları değiştir</string>
-	<string-array name="EPr_themes">
-		<item>Gündüz - Mavi</item>
-		<item>Gündüz - Kırmızı</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Şeffaf (Siyah Metin)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>Uygulama ile aynı</item>
-		<item>Gündüz - Mavi</item>
-		<item>Gündüz - Kırmızı</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>Eski Biçem</item>
-	</string-array>
 	<string name="EPr_manage_header">Eski Görevleri Yönet</string>
 	<string name="EPr_manage_delete_completed">Tamamlanan Görevleri Sil</string>
 	<string name="EPr_manage_delete_completed_message">Gerçekten tüm tamamlanmış görevleri silmek istiyor musun?</string>

astrid/src/main/res/values-zh-rCN/strings.xml

@@ -247,34 +247,12 @@
 		<item>截取标题为一行，并在下方显示日期和列表</item>
 		<item>Single line title only</item>
 	</string-array>
-	<string name="EPr_theme_title">主题</string>
-	<string name="EPr_theme_desc">当前：%s</string>
-	<string name="EPr_theme_desc_unsupported">该设置需要 Android 2.0+</string>
-	<string name="EPr_theme_widget_title">小工具主题</string>
 	<string name="EPr_taskRowPrefs_title">任务栏</string>
 	<string name="EPr_force_phone_layout">使用手机布局</string>
 	<string name="EPr_swipe_lists_performance_title">在列表间滑动</string>
 	<string name="swipe_lists_helper_title">在列表间滑动</string>
 	<string name="swipe_lists_helper_header">向左或向右快速滑动来切换列表</string>
 	<string name="swipe_lists_helper_subtitle">在设置-&amp;gt外观中修改选项</string>
-	<string-array name="EPr_themes">
-		<item>蓝</item>
-		<item>红</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>透明(黑色文字)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>与应用相同</item>
-		<item>日间——蓝色</item>
-		<item>日间——红色</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>老式风格</item>
-	</string-array>
 	<string name="EPr_manage_header">管理旧任务</string>
 	<string name="EPr_manage_delete_completed">删除已完成任务</string>
 	<string name="EPr_manage_delete_completed_message">您真的要删除所有已完成任务吗？</string>

astrid/src/main/res/values-zh-rTW/strings.xml

@@ -266,34 +266,12 @@
 		<item>截取標題為一行，並在下方顯示日期和列表</item>
 		<item>Single line title only</item>
 	</string-array>
-	<string name="EPr_theme_title">主題</string>
-	<string name="EPr_theme_desc">目前設定: %s</string>
-	<string name="EPr_theme_desc_unsupported">該設置需要 Android 2.0+</string>
-	<string name="EPr_theme_widget_title">小工具主題</string>
 	<string name="EPr_taskRowPrefs_title">任務工作欄</string>
 	<string name="EPr_force_phone_layout">使用手機佈局</string>
 	<string name="EPr_swipe_lists_performance_title">在列表間滑動</string>
 	<string name="swipe_lists_helper_title">在列表間滑動</string>
 	<string name="swipe_lists_helper_header">在列表間向左或向右快速滑動</string>
 	<string name="swipe_lists_helper_subtitle">在設置-&amp;gt外觀中修改選項</string>
-	<string-array name="EPr_themes">
-		<item>藍</item>
-		<item>紅</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>透明(黑色文字)</item>
-	</string-array>
-	<string-array name="EPr_themes_widget">
-		<item>與應用相同</item>
-		<item>日間——藍色</item>
-		<item>日間——紅色</item>
-		<item>Sky blue</item>
-		<item>Night</item>
-		<item>Transparent (white text)</item>
-		<item>Transparent (black text)</item>
-		<item>老式風格</item>
-	</string-array>
 	<string name="EPr_manage_header">管理舊任務工作</string>
 	<string name="EPr_manage_delete_completed">刪除已完成任務工作</string>
 	<string name="EPr_manage_delete_completed_message">您真的要刪除所有已完成任務工作嗎？</string>

astrid/src/main/res/values/keys.xml

@@ -200,37 +200,12 @@
   </string-array>
   <string name="p_showNotes">notesVisible</string>
   <string name="p_beastMode">beastMode</string>
-  <string name="p_transparent_deprecated">transparent</string>
+
-  <string name="p_theme">theme</string>
-  <string name="p_theme_widget">theme_widget</string>
-  
   <string name="p_voicePrefSection">voicePrefSection</string>
   <string name="p_voiceInputEnabled">voiceInputEnabled</string>
   <string name="p_voiceInputCreatesTask">voiceInputCreatesTask</string>
   <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
-  
+
-  <string-array name="EPr_theme_settings">
-    <!-- theme_settings: options for preference menu -->
-    <item>white</item>
-    <item>white-red</item>
-    <item>white-alt</item>
-    <item>black</item>
-    <item>transparent</item>
-    <item>transparent-white</item>
-  </string-array>
-    
-  <string-array name="EPr_theme_widget_settings">
-    <!-- theme_settings: options for preference menu -->
-    <item>same-as-app</item>
-    <item>white</item>
-    <item>white-red</item>
-    <item>white-alt</item>
-    <item>black</item>
-    <item>transparent</item>
-    <item>transparent-white</item>
-    <item>legacy-widget</item>
-  </string-array>
-  
   <string-array name="EPr_font_size">
     <!-- font_size: options for preference menu -->
     <item>10</item>
@@ -405,7 +380,10 @@
   <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
   <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
   <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
-  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string> <!-- Deprecated -->
+  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+    <string name="p_use_dark_theme">use_dark_theme</string>
+    <string name="p_use_dark_theme_widget">use_dark_theme_widget</string>
+    <!-- Deprecated -->
       
   <string-array name="TEA_control_sets_prefs">
       <item>@string/TEA_ctrl_when_pref</item>

astrid/src/main/res/values/strings-core.xml

@@ -652,15 +652,6 @@
   <!-- Preference: task edit comments -->
   <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
   
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Color theme</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Currently: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget theme</string>
-  
   <!-- slide 30d/ 34f: Preference screen: all task row settings -->
   <string name="EPr_taskRowPrefs_title">Task row appearance</string>
   
@@ -674,7 +665,6 @@
   <!-- Preference title for showing save and cancel buttons in task edit page -->
   <string name="EPr_show_save_and_cancel">Show save and cancel </string>
   
-  
   <!-- Swipe between lists -->
   <!-- Preference: swipe between lists performance -->
   <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
@@ -692,34 +682,6 @@
       <item>@string/TEA_reminder_mode_nonstop</item>
   </string-array>
     
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Day - Blue</item>
-    <!-- slide 36b -->
-    <item>Day - Red</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (black text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Old Style</item>
-  </string-array>
-  
   <!-- ========================================== Task Management Settings == -->
 
   <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->

astrid/src/main/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="EPr_use_dark_theme">Dark theme</string>
+    <string name="EPr_use_dark_theme_widget">Dark widget theme</string>
+</resources>

astrid/src/main/res/xml/preferences.xml

@@ -11,19 +11,17 @@
     <PreferenceScreen
         android:title="@string/EPr_appearance_header"
         android:summary="@string/EPr_appearance_summary">
-        
+
-        <com.todoroo.astrid.ui.MultilineListPreference
+        <CheckBoxPreference
-            android:key="@string/p_theme"
+            android:title="@string/EPr_use_dark_theme"
-            android:entries="@array/EPr_themes"
+            android:key="@string/p_use_dark_theme"
-            android:entryValues="@array/EPr_theme_settings"
+            android:defaultValue="false"/>
-            android:title="@string/EPr_theme_title" />
+
-        
+        <CheckBoxPreference
-        <com.todoroo.astrid.ui.MultilineListPreference
+            android:title="@string/EPr_use_dark_theme_widget"
-            android:key="@string/p_theme_widget"
+            android:key="@string/p_use_dark_theme_widget"
-            android:entries="@array/EPr_themes_widget"
+            android:defaultValue="false"/>
-            android:entryValues="@array/EPr_theme_widget_settings"
+
-            android:title="@string/EPr_theme_widget_title" />
-        
         <PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
         
 	        <com.todoroo.astrid.ui.MultilineListPreference