HideUntilControlSet extends TaskEditControlSetBase

src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -394,7 +394,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         controlSetMap.put(getString(R.string.TEA_ctrl_reminders_pref),
                 reminderControl);
 
-        HideUntilControlSet hideUntilControls = new HideUntilControlSet(preferences, this);
+        HideUntilControlSet hideUntilControls = new HideUntilControlSet(this);
         controls.add(hideUntilControls);
         controlSetMap.put(getString(R.string.TEA_ctrl_hide_until_pref), hideUntilControls);
 

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

@@ -11,18 +11,17 @@ import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.TaskEditFragment;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.helper.TaskEditControlSetBase;
 
 import org.joda.time.DateTime;
 import org.tasks.R;
 import org.tasks.dialogs.DateAndTimePickerDialog;
-import org.tasks.preferences.ActivityPreferences;
 
 import java.util.Date;
 
@@ -35,7 +34,7 @@ import static org.tasks.date.DateTimeUtils.newDateTime;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class HideUntilControlSet extends PopupControlSet implements OnItemSelectedListener {
+public class HideUntilControlSet extends TaskEditControlSetBase implements OnItemSelectedListener {
 
     private static final int title = R.string.hide_until_prompt;
 
@@ -49,9 +48,10 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     private long existingDate = EXISTING_TIME_UNSET;
     private TaskEditFragment taskEditFragment;
+    private TextView textDisplay;
 
-    public HideUntilControlSet(ActivityPreferences preferences, TaskEditFragment taskEditFragment) {
-        super(preferences, taskEditFragment.getActivity(), R.layout.control_set_hide_spinner, R.layout.control_set_hide, title);
+    public HideUntilControlSet(TaskEditFragment taskEditFragment) {
+        super(taskEditFragment.getActivity(), R.layout.control_set_hide);
         this.taskEditFragment = taskEditFragment;
     }
 
@@ -167,44 +167,37 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     // --- setting up values
 
-    @Override
-    protected OnClickListener getDisplayClickListener() {
-        return new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (spinner == null) // Force load
-                {
-                    getView();
-                }
-                spinner.performClick();
-            }
-        };
-    }
-
-    @Override
-    protected void refreshDisplayView() {
-        TextView auxDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit);
+    private void refreshDisplayView() {
         HideUntilValue value = adapter.getItem(selection);
         if (value.setting == Task.HIDE_UNTIL_NONE) {
-            auxDisplay.setText(R.string.TEA_hideUntil_label);
-            auxDisplay.setTextColor(unsetColor);
+            textDisplay.setText(R.string.TEA_hideUntil_label);
+            textDisplay.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);
+            textDisplay.setText(activity.getString(R.string.TEA_hideUntil_display, display));
+            textDisplay.setTextColor(themeColor);
         }
     }
 
     @Override
     protected void afterInflate() {
+        textDisplay = (TextView) getView().findViewById(R.id.display_row_edit);
+        textDisplay.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (spinner == null) {
+                    getView();
+                }
+                spinner.performClick();
+            }
+        });
         this.spinner = (Spinner) getView().findViewById(R.id.hideUntil);
         this.spinner.setOnItemSelectedListener(this);
         this.spinner.setPromptId(title);
-        ((LinearLayout) getDisplayView()).addView(getView()); // hack to make listeners work
     }
 
     @Override

src/main/res/layout/control_set_hide.xml

@@ -21,18 +21,30 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/display_row_edit"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
-            android:textColor="?attr/asTextColor"
-            android:textColorHint="?attr/asTextColorHint"
-            android:textSize="@dimen/task_edit_text_size"
+            android:orientation="horizontal"
             android:paddingTop="@dimen/task_edit_padding_top_bottom"
             android:paddingBottom="@dimen/task_edit_padding_top_bottom"
             android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
-            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom" />
+            android:layout_marginBottom="@dimen/task_edit_padding_top_bottom">
+
+            <TextView
+                android:id="@+id/display_row_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="start|center_vertical"
+                android:textColor="?attr/asTextColor"
+                android:textColorHint="?attr/asTextColorHint"
+                android:textSize="@dimen/task_edit_text_size" />
+
+            <Spinner
+                android:id="@+id/hideUntil"
+                android:layout_width="0dip"
+                android:layout_height="0dip" />
+
+        </LinearLayout>
 
         <include layout="@layout/task_edit_divider" />
 

src/main/res/layout/control_set_hide_spinner.xml

@@ -1,16 +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:orientation="vertical"
-  android:layout_width="0dip"
-  android:layout_height="0dip">
-  <Spinner
-    android:id="@+id/hideUntil"
-    android:layout_width="0dip"
-    android:layout_height="0dip" />
-</LinearLayout>