From ec2447d1908f8bde5a3fd8b86b8016c7eb3bf85d Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 27 Mar 2013 14:39:44 -0700
Subject: [PATCH] Removed save and cancel buttons from task edit by default
 (can restore them in preferences)

---
 astrid/res/values/keys.xml                    |  3 +++
 astrid/res/values/strings-core.xml            |  3 +++
 astrid/res/xml/preferences.xml                |  5 +++++
 .../astrid/activity/TaskEditActivity.java     | 13 ++++++++----
 .../astrid/activity/TaskEditFragment.java     | 21 ++++++++++++-------
 .../utility/AstridDefaultPreferenceSpec.java  |  2 ++
 .../utility/AstridLitePreferenceSpec.java     |  2 ++
 7 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index d15ca08fc..e1d1fab35 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -83,6 +83,9 @@
   <!-- show comments in task edit -->
   <string name="p_show_task_edit_comments">p_show_task_edit_comments</string>
   
+  <!-- show save and cancel buttons in task edit -->
+  <string name="p_save_and_cancel">p_save_and_cancel</string>
+  
   <!-- menu items to show -->
   <string name="p_menu_items">p_menu_items</string>
   <string name="p_show_menu_search">p_show_menu_search</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 15fa82f1d..7e68c6076 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -791,6 +791,9 @@
   <!-- default configuration name for the above dialog -->
   <string name="EPr_config_dialog_default_id">default</string>
   
+  <!-- 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 -->
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index c5dc16fad..ec8ad0785 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -77,6 +77,11 @@
 	            android:title="@string/EPr_show_task_edit_comments"
 	            android:defaultValue="true"/>
 	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_save_and_cancel"
+	            android:title="@string/EPr_show_save_and_cancel"
+	            android:defaultValue="false"/>
+	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	            android:key="@string/p_use_date_shortcuts"
 	            android:title="@string/EPr_use_date_shortcuts"
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 65ec79f57..c2d8252e6 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.ActionBar;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.service.ThemeService;
 
@@ -24,10 +25,14 @@ public class TaskEditActivity extends AstridActivity {
 	protected void onCreate(Bundle savedInstanceState) {
         ThemeService.applyTheme(this);
         ActionBar actionBar = getSupportActionBar();
-        if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt)
-            actionBar.setLogo(R.drawable.ic_menu_save_blue_alt);
-        else
-            actionBar.setLogo(R.drawable.ic_menu_save);
+        if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) {
+            if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt)
+                actionBar.setLogo(R.drawable.ic_menu_save_blue_alt);
+            else
+                actionBar.setLogo(R.drawable.ic_menu_save);
+        } else {
+            actionBar.setLogo(null);
+        }
 
         super.onCreate(savedInstanceState);
 		setContentView(R.layout.task_edit_wrapper_activity);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 3f47658e1..676a3b094 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -104,6 +104,7 @@ import com.todoroo.astrid.ui.NestableViewPager;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.ui.ReminderControlSet;
 import com.todoroo.astrid.ui.TaskEditMoreControls;
+import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
 import com.todoroo.astrid.voice.VoiceRecognizer;
@@ -1175,14 +1176,20 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }
 
-        item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-        item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        boolean useSaveAndCancel = Preferences.getBoolean(R.string.p_save_and_cancel, false);
 
-        if (!(getActivity() instanceof TaskEditActivity)) {
-            item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
-            item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
-            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        if (useSaveAndCancel || AstridPreferences.useTabletLayout(getActivity())) {
+            if (useSaveAndCancel) {
+                item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
+                item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
+                item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+            }
+
+            if (!(getActivity() instanceof TaskEditActivity)) {
+                item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
+                item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
+                item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+            }
         }
 
         boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null;
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index fe5dee55a..11505ae17 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -129,6 +129,8 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
 
+        setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
+
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
         editor.commit();
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index d80946b52..8c5b276ff 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -117,6 +117,8 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false, ifUnset);
 
+        setPreference(prefs, editor, r, R.string.p_save_and_cancel, false, ifUnset);
+
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
         editor.commit();