From a73d34ea3a7d2466096827ff35e3a18ee238fb9f Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 3 Dec 2012 11:34:50 -0800
Subject: [PATCH] Simpler edit text style preference

---
 astrid/res/layout/control_set_notes.xml       |  1 +
 astrid/res/values/keys.xml                    |  3 +++
 astrid/res/values/strings-core.xml            |  6 ++---
 astrid/res/values/styles.xml                  | 20 ++++++++++++++++
 astrid/res/xml/preferences.xml                |  6 ++++-
 .../astrid/activity/EditPreferences.java      |  2 ++
 .../todoroo/astrid/service/ThemeService.java  | 23 ++++++++++++++++++-
 .../astrid/utility/AstridPreferences.java     |  3 +++
 8 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index 2a03dff3e..21f0c28bf 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -37,6 +37,7 @@
 	      android:layout_weight="100"
 	      android:scrollbars="vertical"
 	      android:gravity="top"
+	      android:background="@null"
 	      android:hint="@string/TEA_notes_hint"
 	      android:autoText="true"
 	      android:capitalize="sentences"
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index fab97b62e..8710ae330 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -72,6 +72,9 @@
   
   <!-- account status section key -->
   <string name="p_account">account</string>
+
+  <!-- simple input box style -->
+  <string name="p_simple_input_boxes">simple_input_boxes</string>
   
   <string-array name="TEA_reminder_random_hours">
     <!-- values (in hours) associated with items above. -->
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 03704b8e9..d0a1b6dbc 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -704,6 +704,9 @@
 
   <!-- Preference: show list members in shared list -->
   <string name="EPr_show_list_members_title">Show list members in shared lists</string>
+
+  <!-- Preference: simple input box style -->
+  <string name="EPr_simple_input_boxes">Simple input boxes</string>
   
   
   <!-- slide 30f/ 36f: Preference: Theme -->
@@ -718,9 +721,6 @@
   <!-- slide 30d/ 34f: Preference screen: all task row settings -->
   <string name="EPr_taskRowPrefs_title">Task row appearance</string>
   
-  <!-- slide 33b/ 49e: Preference screen: Astrid Labs (experimental features)-->
-  <!-- slide 33f -->
-  
   <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
   <string name="EPr_use_contact_picker">Use contact picker</string>
   <!-- slide 49b -->
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 3eb975e78..1258e6db9 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -52,6 +52,10 @@
         <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
     </style>
     
+    <style name="Theme.Simple" parent="Theme">
+        <item name="asEditTextBackground">@null</item>
+    </style>
+    
     <style name="Theme.Transparent" parent="Theme">
 		<item name="asContentBackground">#22000000</item>
         <item name="abBackground">#aa000000</item>
@@ -64,6 +68,10 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
+    
+    <style name="Theme.Transparent.Simple" parent="Theme.Transparent">
+        <item name="asEditTextBackground">@null</item>
+    </style>
         
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
         <item name="asContentBackground">@android:color/white</item>
@@ -102,6 +110,10 @@
         <item name="abLogo">@drawable/home_button_red</item>
     </style>
     
+    <style name="Theme.White.Simple" parent="Theme.White">
+        <item name="asEditTextBackground">@null</item>
+    </style>
+    
     <style name="Theme.White.Blue">
         <item name="asAddButtonImg">@drawable/plus_button_dark_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_dark_blue</item>
@@ -118,6 +130,10 @@
         <item name="abLogo">@drawable/home_button_dark_blue</item>
     </style>
     
+    <style name="Theme.White.Blue.Simple" parent="Theme.White.Blue">
+        <item name="asEditTextBackground">@null</item>
+    </style>
+    
     <style name="Theme.TransparentWhite" parent="Theme.White.Blue">
         <item name="asContentBackground">#22000000</item>
         <item name="abBackground">#aa000000</item>
@@ -131,6 +147,10 @@
         <item name="android:windowShowWallpaper">true</item>
     </style>
     
+    <style name="Theme.TransparentWhite.Simple" parent="Theme.TransparentWhite">
+        <item name="asEditTextBackground">@null</item>
+    </style>
+    
     <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
         <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index c79bddb65..d15b36a68 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -68,6 +68,11 @@
             android:entryValues="@array/EPr_theme_widget_settings"
             android:title="@string/EPr_theme_widget_title" />
 
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+            android:key="@string/p_simple_input_boxes"
+            android:title="@string/EPr_simple_input_boxes"
+            android:defaultValue="false"/>
+        
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_showSmartConfirmation_key"
             android:title="@string/EPr_showSmartConfirmation_title"
@@ -108,7 +113,6 @@
 	        android:key="@string/p_use_contact_picker"
 	        android:title="@string/EPr_use_contact_picker"/>
         
-        
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_voiceInputEnabled"
             android:title="@string/EPr_voiceInputEnabled_title"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index f386266a7..80e1ec4cd 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -640,6 +640,8 @@ 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_simple_input_boxes)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
+
         findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
         findPreference(getString(R.string.p_theme_widget)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index e37508a18..5283e1c16 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -49,7 +49,11 @@ public class ThemeService {
 
     public static int getTheme() {
         String preference = Preferences.getStringValue(R.string.p_theme);
-        return getStyleForSetting(preference);
+        boolean simple = Preferences.getBoolean(R.string.p_simple_input_boxes, false);
+        int style = getStyleForSetting(preference);
+        if (simple)
+            style = simplifyStyle(style);
+        return style;
     }
 
     public static int getWidgetTheme() {
@@ -75,6 +79,23 @@ public class ThemeService {
             return R.style.Theme_White_Blue;
     }
 
+    private static int simplifyStyle(int original) {
+        switch (original) {
+        case R.style.Theme:
+            return R.style.Theme_Simple;
+        case R.style.Theme_Transparent:
+            return R.style.Theme_Transparent_Simple;
+        case R.style.Theme_TransparentWhite:
+            return R.style.Theme_TransparentWhite_Simple;
+        case R.style.Theme_White:
+            return R.style.Theme_White_Simple;
+        case R.style.Theme_White_Blue:
+            return R.style.Theme_White_Blue_Simple;
+        default:
+            return original;
+        }
+    }
+
     public static int getThemeColor() {
         int theme = getTheme();
         switch(theme) {
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index 4bd62025b..c97dcaf51 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -5,6 +5,7 @@
  */
 package com.todoroo.astrid.utility;
 
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -162,6 +163,8 @@ public class AstridPreferences {
 
         Preferences.setIfUnset(prefs, editor, r, R.string.p_use_filters, false);
 
+        Preferences.setIfUnset(prefs, editor, r, R.string.p_simple_input_boxes, true);
+
         Preferences.setIfUnset(prefs, editor, r, R.string.p_show_list_members, false);
 
         SharedPreferences publicPrefs = getPublicPrefs(context);