Remove TaskEditTextHint style

app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -351,12 +351,10 @@ public class RepeatControlSet extends TaskEditControlFragment
 
     private void refreshDisplayView() {
         if (rrule == null) {
-            displayView.setText(R.string.repeat_option_does_not_repeat);
-            displayView.setTextColor(getColor(context, R.color.text_tertiary));
+            displayView.setText(null);
             repeatTypeContainer.setVisibility(View.GONE);
         } else {
             displayView.setText(repeatRuleToString.toString(rrule));
-            displayView.setTextColor(getColor(context, R.color.text_primary));
             repeatTypeContainer.setVisibility(View.VISIBLE);
         }
     }

app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java

@@ -372,12 +372,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
 
     private void refreshDisplayView() {
         selectedTags = getSelectedTags();
-        CharSequence tagString = buildTagString();
-        if (TextUtils.isEmpty(tagString)) {
-            tagsDisplay.setText(R.string.tag_FEx_untagged);
-        } else {
-            tagsDisplay.setText(tagString);
-        }
+        tagsDisplay.setText(buildTagString());
     }
 
     private boolean synchronizeTags(long taskId, String taskUuid) {

app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java

@@ -37,8 +37,6 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 
-import static android.support.v4.content.ContextCompat.getColor;
-
 /**
  * Control Set for managing repeats
  *
@@ -207,13 +205,7 @@ public class TimerControlSet extends TaskEditControlFragment {
             toDisplay = null;
         }
 
-        if (!TextUtils.isEmpty(toDisplay)) {
-            displayEdit.setText(toDisplay);
-            displayEdit.setTextColor(getColor(context, R.color.text_primary));
-        } else {
-            displayEdit.setText(R.string.TEA_timer_controls);
-            displayEdit.setTextColor(getColor(context, R.color.text_tertiary));
-        }
+        displayEdit.setText(toDisplay);
     }
 
     private void updateChronometer() {

app/src/main/java/org/tasks/ui/CalendarControlSet.java

@@ -294,15 +294,12 @@ public class CalendarControlSet extends TaskEditControlFragment {
     private void refreshDisplayView() {
         if (!Strings.isNullOrEmpty(eventUri)) {
             calendar.setText(R.string.gcal_TEA_showCalendar_label);
-            calendar.setTextColor(getColor(context, R.color.text_primary));
             cancelButton.setVisibility(View.VISIBLE);
         } else if (calendarId != null) {
             calendar.setText(getCalendarName());
-            calendar.setTextColor(getColor(context, R.color.text_primary));
             cancelButton.setVisibility(View.GONE);
         } else {
-            calendar.setText(R.string.dont_add_to_calendar);
-            calendar.setTextColor(getColor(context, R.color.text_tertiary));
+            calendar.setText(null);
             cancelButton.setVisibility(View.GONE);
         }
     }

app/src/main/res/layout/control_set_files.xml

@@ -23,13 +23,13 @@
         android:orientation="horizontal">
 
         <TextView
-            style="@style/TaskEditTextHint"
+            style="@style/TaskEditTextPrimary"
             android:id="@+id/add_attachment"
             android:gravity="start"
             android:textAlignment="viewStart"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/add_attachment"/>
+            android:hint="@string/add_attachment"/>
 
     </LinearLayout>
 

app/src/main/res/layout/control_set_gcal_display.xml

@@ -16,6 +16,7 @@
         android:layout_gravity="top"
         android:layout_weight="100"
         android:gravity="start"
+        android:hint="@string/dont_add_to_calendar"
         android:textAlignment="viewStart" />
 
     <include layout="@layout/control_set_clear_button" />

app/src/main/res/layout/control_set_reminders.xml

@@ -44,10 +44,10 @@
 
             <TextView
                 android:id="@+id/alarms_add"
-                style="@style/TaskEditTextHint"
+                style="@style/TaskEditTextPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/add_reminder" />
+                android:hint="@string/add_reminder" />
 
             <Spinner
                 android:id="@+id/alarms_add_spinner"

app/src/main/res/layout/control_set_repeat_display.xml

@@ -16,6 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:gravity="start"
+        android:hint="@string/repeat_option_does_not_repeat"
         android:textAlignment="viewStart" />
 
     <LinearLayout

app/src/main/res/layout/control_set_tags.xml

@@ -4,9 +4,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/TaskEditTextHint"
+    style="@style/TaskEditTextPrimary"
     android:id="@+id/display_row_edit"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="start"
-    android:textAlignment="viewStart" />
+    android:textAlignment="viewStart"
+    android:hint="@string/tag_FEx_untagged"/>

app/src/main/res/layout/control_set_timers.xml

@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:gravity="start"
             android:textAlignment="viewStart"
-            android:text="@string/TEA_timer_controls" />
+            android:hint="@string/TEA_timer_controls" />
 
     </LinearLayout>
 

app/src/main/res/values/styles.xml

@@ -26,10 +26,6 @@
         <item name="android:textSize">@dimen/task_edit_text_size</item>
     </style>
 
-    <style name="TaskEditTextHint" parent="TaskEditTextPrimary">
-        <item name="android:textColor">?android:attr/textColorTertiary</item>
-    </style>
-
     <style name="WhiteToolbarTheme">
         <item name="dark_status_bar">false</item>
         <item name="overlay_theme">@style/WhiteToolbarOverlay</item>