Enhancements to reminder control, hide until control, timer control, due date control, and assignment control

astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java

@@ -794,14 +794,16 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     @Override
     protected void refreshDisplayView() {
+        String displayString;
         if (!TextUtils.isEmpty(assignedCustom.getText())) {
-            assignedDisplay.setText(assignedCustom.getText());
+            displayString = activity.getString(R.string.TEA_assigned_to, assignedCustom.getText());
         } else {
             AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(assignedList.getCheckedItemPosition());
             if (user == null)
                 user = (AssignedToUser) assignedList.getAdapter().getItem(0);
-            assignedDisplay.setText(user.toString());
+            displayString = activity.getString(R.string.TEA_assigned_to, user.toString());
         }
+        assignedDisplay.setText(displayString);
     }
 
     @Override

astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java

@@ -6,7 +6,10 @@
 package com.todoroo.astrid.timers;
 
 import android.app.Activity;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.view.View;
+import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.Property.IntegerProperty;
@@ -24,11 +27,16 @@ import com.todoroo.astrid.ui.TimeDurationControlSet;
  */
 public class TimerControlSet extends PopupControlSet implements TimerActionListener {
 
-    TaskEditControlSet estimated, elapsed;
+    TimeDurationTaskEditControlSet estimated, elapsed;
+    private final TextView displayEdit;
 
     public TimerControlSet(final Activity activity, int viewLayout, int displayViewLayout, int title) {
         super(activity, viewLayout, displayViewLayout, title);
 
+        displayEdit = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
+        displayEdit.setText(R.string.TEA_timer_controls);
+        displayEdit.setTextColor(unsetColor);
+
         estimated = new TimeDurationTaskEditControlSet(activity, getView(), Task.ESTIMATED_SECONDS,
                 R.id.estimatedDuration, 0, R.string.DLG_hour_minutes
                 );
@@ -92,11 +100,42 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
             task.setValue(property, controlSet.getTimeDurationInSeconds());
             return null;
         }
+
+        public String getDisplayString() {
+            int seconds = controlSet.getTimeDurationInSeconds();
+            if (seconds > 0)
+                return DateUtils.formatElapsedTime(controlSet.getTimeDurationInSeconds());
+            return null;
+        }
     }
 
     @Override
     protected void refreshDisplayView() {
-        // Nothing to do here yet
+        String est = estimated.getDisplayString();
+        if (!TextUtils.isEmpty(est))
+            est = activity.getString(R.string.TEA_timer_est, est);
+        String elap = elapsed.getDisplayString();
+        if (!TextUtils.isEmpty(elap))
+            elap = activity.getString(R.string.TEA_timer_elap, elap);
+
+        String toDisplay;
+
+        if (!TextUtils.isEmpty(est) && !TextUtils.isEmpty(elap))
+            toDisplay = est + ", " + elap; //$NON-NLS-1$
+        else if (!TextUtils.isEmpty(est))
+            toDisplay = est;
+        else if (!TextUtils.isEmpty(elap))
+            toDisplay = elap;
+        else
+            toDisplay = null;
+
+        if (!TextUtils.isEmpty(toDisplay)) {
+            displayEdit.setText(toDisplay);
+            displayEdit.setTextColor(themeColor);
+        } else {
+            displayEdit.setText(R.string.TEA_timer_controls);
+            displayEdit.setTextColor(unsetColor);
+        }
     }
 
     @Override

astrid/res/values/strings-core.xml

@@ -321,7 +321,11 @@
   <!-- Task importance label -->
   <string name="TEA_importance_label">Priority</string>
   
-  <!-- Task urgency label -->
+  <!-- Task due date hint -->
+  <string name="TEA_deadline_hint">Set due date</string>
+  
+  <!-- Task assigned to string (%s -> assigned person name) -->
+  <string name="TEA_assigned_to">Assigned to %s</string>
   
   <!-- Task urgency specific time checkbox -->
   <string name="TEA_urgency_specific_time">At specific time?</string>
@@ -331,6 +335,9 @@
   
   <!-- Task hide until label -->
   <string name="TEA_hideUntil_label">Hide until</string>
+
+  <!-- Task hide until label -->
+  <string name="TEA_hideUntil_display">Hide until %s</string>
   
   <!-- Task hide until toast -->
   <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
@@ -386,6 +393,10 @@
   <!-- slide 15d: Task edit tab: web services -->
   <string name="TEA_tab_web">Ideas</string>
   
+  <string name="TEA_timer_est">Est. %s</string>
+
+  <string name="TEA_timer_elap">Elapsed %s</string>
+  
   <string-array name="TEA_urgency">
       <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
       <item>No date</item>

astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java

@@ -52,7 +52,14 @@ public class DeadlineControlSet extends PopupControlSet {
             }
         }
         TextView dateDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        dateDisplay.setText(displayString);
+        if (TextUtils.isEmpty(displayString)) {
+            dateDisplay.setText(R.string.TEA_deadline_hint);
+            dateDisplay.setTextColor(unsetColor);
+        } else {
+            dateDisplay.setText(displayString);
+            dateDisplay.setTextColor(themeColor);
+        }
+
     }
 
     @Override

astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java

@@ -193,7 +193,18 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
     @Override
     protected void refreshDisplayView() {
         TextView auxDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
-        auxDisplay.setText(adapter.getItem(selection).toString());
+        HideUntilValue value = adapter.getItem(selection);
+        if (value.setting == Task.HIDE_UNTIL_NONE) {
+            auxDisplay.setText(R.string.TEA_hideUntil_label);
+            auxDisplay.setTextColor(unsetColor);
+        } else {
+            String display = value.toString();
+            if (value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY && value.setting != Task.HIDE_UNTIL_SPECIFIC_DAY_TIME)
+                display = display.toLowerCase();
+
+            auxDisplay.setText(activity.getString(R.string.TEA_hideUntil_display, display));
+            auxDisplay.setTextColor(themeColor);
+        }
     }
 
     @Override

astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java

@@ -42,6 +42,9 @@ public class ReminderControlSet extends PopupControlSet {
     public ReminderControlSet(Activity activity, int viewLayout, int displayViewLayout) {
         super(activity, viewLayout, displayViewLayout, R.string.TEA_reminders_group_label);
         extraViews = new ArrayList<View>();
+        TextView label = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
+        label.setText(R.string.TEA_reminders_group_label);
+        label.setTextColor(unsetColor);
     }
 
     public void addViewToBody(View v) {