From 7e6cad193781a8772c44992cbaa7e2244605fd2b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 6 Mar 2018 13:39:36 -0600 Subject: [PATCH] Remove TaskEditTextHint style --- .../com/todoroo/astrid/repeats/RepeatControlSet.java | 4 +--- .../java/com/todoroo/astrid/tags/TagsControlSet.java | 7 +------ .../com/todoroo/astrid/timers/TimerControlSet.java | 10 +--------- app/src/main/java/org/tasks/ui/CalendarControlSet.java | 5 +---- app/src/main/res/layout/control_set_files.xml | 4 ++-- app/src/main/res/layout/control_set_gcal_display.xml | 1 + app/src/main/res/layout/control_set_reminders.xml | 4 ++-- app/src/main/res/layout/control_set_repeat_display.xml | 1 + app/src/main/res/layout/control_set_tags.xml | 5 +++-- app/src/main/res/layout/control_set_timers.xml | 2 +- app/src/main/res/values/styles.xml | 4 ---- 11 files changed, 14 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 414ef1d02..349ef3d14 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/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); } } diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index 3eb1b9dbf..31d1802fd 100644 --- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/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) { diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java index 57ddb7c77..a6b00f0a6 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java +++ b/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() { diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.java b/app/src/main/java/org/tasks/ui/CalendarControlSet.java index b48e9ff27..b36b53390 100644 --- a/app/src/main/java/org/tasks/ui/CalendarControlSet.java +++ b/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); } } diff --git a/app/src/main/res/layout/control_set_files.xml b/app/src/main/res/layout/control_set_files.xml index 77fa06d44..cfc320242 100644 --- a/app/src/main/res/layout/control_set_files.xml +++ b/app/src/main/res/layout/control_set_files.xml @@ -23,13 +23,13 @@ android:orientation="horizontal"> + android:hint="@string/add_attachment"/> diff --git a/app/src/main/res/layout/control_set_gcal_display.xml b/app/src/main/res/layout/control_set_gcal_display.xml index b2094a6ff..9d90a30e1 100644 --- a/app/src/main/res/layout/control_set_gcal_display.xml +++ b/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" /> diff --git a/app/src/main/res/layout/control_set_reminders.xml b/app/src/main/res/layout/control_set_reminders.xml index 98f7fdc9d..dc56d7a20 100644 --- a/app/src/main/res/layout/control_set_reminders.xml +++ b/app/src/main/res/layout/control_set_reminders.xml @@ -44,10 +44,10 @@ + android:hint="@string/add_reminder" /> + android:textAlignment="viewStart" + android:hint="@string/tag_FEx_untagged"/> diff --git a/app/src/main/res/layout/control_set_timers.xml b/app/src/main/res/layout/control_set_timers.xml index d492bc93a..d6bb5bbf9 100644 --- a/app/src/main/res/layout/control_set_timers.xml +++ b/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" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 31be6dabf..ecbe93c22 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -26,10 +26,6 @@ @dimen/task_edit_text_size - -