From bf9ed3d03958cb542a36f690e01868d6d7a3e7e8 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 6 Mar 2012 17:19:44 -0800
Subject: [PATCH] Use different title in task edit when task is a new task

---
 astrid/res/values/strings-core.xml               |  2 ++
 .../astrid/activity/TaskEditActivity.java        |  6 ++++++
 .../astrid/activity/TaskEditFragment.java        | 16 +++++++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 6b2bdece3..5ece91950 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -441,6 +441,8 @@
   
   <string name="TEA_date_and_time">Date/Time</string>
   
+  <string name="TEA_new_task">New Task</string>
+  
   <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
   
   <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index c655f43ab..9d41f37ef 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -32,6 +32,12 @@ public class TaskEditActivity extends AstridActivity {
 		((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
 	}
 
+	public void updateTitle(boolean isNewTask) {
+	    ActionBar actionBar = getSupportActionBar();
+	    if (actionBar != null)
+	        ((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
+	}
+
     /* (non-Javadoc)
      * @see android.support.v4.app.FragmentActivity#onResume()
      */
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index f74588dad..a3ccdf437 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -222,7 +222,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     // --- other instance variables
 
     /** true if editing started with a new task */
-    boolean isNewTask = false;
+    private boolean isNewTask = false;
 
     /** task model */
     Task model = null;
@@ -716,7 +716,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     protected void loadItem(Intent intent) {
         if (model != null) {
             // came from bundle
-            isNewTask = (model.getValue(Task.TITLE).length() == 0);
+            setIsNewTask(model.getValue(Task.TITLE).length() == 0);
             return;
         }
 
@@ -747,7 +747,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         if (model.getValue(Task.TITLE).length() == 0) {
             StatisticsService.reportEvent(StatisticsConstants.CREATE_TASK);
-            isNewTask = true;
+            setIsNewTask(true);
 
             // set deletion date until task gets a title
             model.setValue(Task.DELETION_DATE, DateUtilities.now());
@@ -767,6 +767,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     }
 
+    private void setIsNewTask(boolean isNewTask) {
+        this.isNewTask = isNewTask;
+        if (isNewTask) {
+            Activity activity = getActivity();
+            if (activity instanceof TaskEditActivity) {
+                ((TaskEditActivity) activity).updateTitle(isNewTask);
+            }
+        }
+    }
+
     /** Convenience method to populate fields after setting model to null */
     public void repopulateFromScratch(Intent intent) {
         model = null;