From fa4e8a8f05ea9b16edefae274caf241856c04dec Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 9 Apr 2015 17:25:22 -0500 Subject: [PATCH] Created control_set_template Reminder control not being laid out properly --- .../astrid/activity/TaskEditFragment.java | 15 ++- .../todoroo/astrid/files/FilesControlSet.java | 5 + .../todoroo/astrid/gcal/GCalControlSet.java | 5 + .../astrid/helper/TaskEditControlSet.java | 2 + .../astrid/helper/TaskEditControlSetBase.java | 17 ++- .../astrid/repeats/RepeatControlSet.java | 7 +- .../todoroo/astrid/tags/TagsControlSet.java | 5 + .../astrid/timers/TimerActionControlSet.java | 9 +- .../astrid/timers/TimerControlSet.java | 14 ++- .../todoroo/astrid/ui/DeadlineControlSet.java | 9 +- .../astrid/ui/DescriptionControlSet.java | 5 + .../astrid/ui/EditTitleControlSet.java | 5 + .../astrid/ui/HideUntilControlSet.java | 5 + .../astrid/ui/ImportanceControlSet.java | 11 +- .../todoroo/astrid/ui/PopupControlSet.java | 8 +- .../todoroo/astrid/ui/ReminderControlSet.java | 5 + src/main/res/layout/control_set_deadline.xml | 44 ++----- .../res/layout/control_set_description.xml | 61 +++------ src/main/res/layout/control_set_files.xml | 40 ++---- .../res/layout/control_set_files_dialog.xml | 40 +++--- .../res/layout/control_set_gcal_display.xml | 53 ++------ src/main/res/layout/control_set_hide.xml | 51 ++------ .../res/layout/control_set_importance.xml | 50 ++------ src/main/res/layout/control_set_reminders.xml | 119 +++++++----------- .../res/layout/control_set_repeat_display.xml | 47 ++----- src/main/res/layout/control_set_tags.xml | 38 +----- src/main/res/layout/control_set_template.xml | 33 +++++ src/main/res/layout/control_set_timers.xml | 35 +----- 28 files changed, 288 insertions(+), 450 deletions(-) create mode 100644 src/main/res/layout/control_set_template.xml diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index ec317a0fa..c7a0e5300 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -31,6 +31,7 @@ import android.webkit.MimeTypeMap; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.Toast; @@ -83,6 +84,7 @@ import org.tasks.location.GeofenceService; import org.tasks.location.LocationApi; import org.tasks.notifications.NotificationManager; import org.tasks.preferences.ActivityPreferences; +import org.tasks.preferences.ResourceResolver; import java.io.File; import java.util.ArrayList; @@ -174,6 +176,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Inject ActFmCameraModule actFmCameraModule; @Inject GeofenceService geofenceService; @Inject LocationApi locationApi; + @Inject ResourceResolver resourceResolver; // --- UI components @@ -362,7 +365,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // deadline control, because // otherwise the correct date may not be written to the calendar event. // Order matters! - DeadlineControlSet deadlineControl = new DeadlineControlSet(preferences, getActivity(), R.layout.control_set_deadline); + DeadlineControlSet deadlineControl = new DeadlineControlSet(preferences, getActivity()); controlSetMap.put(getString(R.string.TEA_ctrl_when_pref), deadlineControl); controls.add(repeatControls); @@ -392,10 +395,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // TODO: Fix the fact that hideUntil doesn't update accordingly with date changes when lazy loaded. Until then, don't lazy load. hideUntilControls.getView(); - TimerControlSet timerControl = new TimerControlSet(preferences, getActivity(), - R.layout.control_set_timers_dialog, - R.layout.control_set_timers, - R.string.TEA_timer_controls); + TimerControlSet timerControl = new TimerControlSet(preferences, getActivity()); timerAction.addListener(timerControl); controls.add(timerControl); controlSetMap.put(getString(R.string.TEA_ctrl_timer_pref), timerControl); @@ -442,6 +442,10 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } if (controlSet != null) { + ImageView icon = (ImageView) controlSet.findViewById(R.id.icon); + if (icon != null) { + icon.setImageResource(resourceResolver.getResource(curr.getIcon())); + } basicControls.addView(controlSet); } @@ -566,7 +570,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { controlSet.readFromTask(model); } } - } /** Save task model from values in UI components */ diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 785ecea88..6c3885532 100644 --- a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -74,6 +74,11 @@ public class FilesControlSet extends PopupControlSet { refreshDisplayView(); } + @Override + public int getIcon() { + return R.attr.ic_action_attachment; + } + public void refreshMetadata() { if (model != null) { files.clear(); diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index e0c57e4ef..1ff80978c 100644 --- a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -246,4 +246,9 @@ public class GCalControlSet extends TaskEditControlSetBase { } } } + + @Override + public int getIcon() { + return R.attr.ic_action_calendar_month; + } } diff --git a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java index 20c2897f7..4cbf2e169 100644 --- a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java +++ b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java @@ -10,4 +10,6 @@ public interface TaskEditControlSet { void readFromTask(Task task); void writeToModel(Task task); + + int getIcon(); } diff --git a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java index b0978b7ea..ebb458783 100644 --- a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java +++ b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java @@ -12,6 +12,7 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; +import android.widget.LinearLayout; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.ui.EditDialogOkBackground; @@ -29,6 +30,7 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet { protected final Activity activity; private final int viewLayout; + private boolean useTemplate; private View view; protected Task model; protected boolean initialized = false; @@ -36,8 +38,13 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet { protected final int unsetColor; public TaskEditControlSetBase(Activity activity, int viewLayout) { + this(activity, viewLayout, true); + } + + public TaskEditControlSetBase(Activity activity, int viewLayout, boolean useTemplate) { this.activity = activity; this.viewLayout = viewLayout; + this.useTemplate = useTemplate; if (viewLayout == -1) { initialized = true; } @@ -46,11 +53,19 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet { unsetColor = getData(activity, R.attr.asTextColorHint); } + protected View inflateWithTemplate(int layout) { + LayoutInflater layoutInflater = LayoutInflater.from(activity); + View template = layoutInflater.inflate(R.layout.control_set_template, null); + LinearLayout content = (LinearLayout) template.findViewById(R.id.content); + content.addView(layoutInflater.inflate(layout, null)); + return template; + } + @Override public View getView() { if (view == null && !initialized) { if (viewLayout != -1) { - view = LayoutInflater.from(activity).inflate(viewLayout, null); + view = useTemplate ? inflateWithTemplate(viewLayout) : LayoutInflater.from(activity).inflate(viewLayout, null); afterInflate(); setupOkButton(view); } diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 93b9a08bb..38201f8ea 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -89,7 +89,7 @@ public class RepeatControlSet extends PopupControlSet { private final List listeners = new LinkedList<>(); public interface RepeatChangedListener { - public void repeatChanged(boolean repeat); + void repeatChanged(boolean repeat); } // --- implementation @@ -192,6 +192,11 @@ public class RepeatControlSet extends PopupControlSet { refreshDisplayView(); } + @Override + public int getIcon() { + return R.attr.ic_action_reload; + } + @Override protected void readFromTaskOnInitialize() { Date date; diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index 741961ef8..a4cb2458a 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -247,6 +247,11 @@ public final class TagsControlSet extends PopupControlSet { } } + @Override + public int getIcon() { + return R.attr.ic_action_tags; + } + @Override protected void readFromTaskOnInitialize() { newTags.removeAllViews(); diff --git a/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java index 215a5707b..0883e0074 100644 --- a/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -112,9 +112,14 @@ public class TimerActionControlSet extends TaskEditControlSetBase { } } + @Override + public int getIcon() { + return -1; + } + public interface TimerActionListener { - public void timerStopped(Task task); - public void timerStarted(Task task); + void timerStopped(Task task); + void timerStarted(Task task); } public void addListener(TimerActionListener listener) { diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java index d363474b1..d09bfce0a 100644 --- a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java +++ b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java @@ -32,8 +32,8 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe TimeDurationTaskEditControlSet estimated, elapsed; private final TextView displayEdit; - public TimerControlSet(ActivityPreferences preferences, final Activity activity, int viewLayout, int displayViewLayout, int title) { - super(preferences, activity, viewLayout, displayViewLayout, title); + public TimerControlSet(ActivityPreferences preferences, final Activity activity) { + super(preferences, activity, R.layout.control_set_timers_dialog, R.layout.control_set_timers, R.string.TEA_timer_controls); displayEdit = (TextView) getView().findViewById(R.id.display_row_edit); displayEdit.setText(R.string.TEA_timer_controls); @@ -62,6 +62,11 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe } } + @Override + public int getIcon() { + return R.attr.ic_action_alarm; + } + // --- TimeDurationTaskEditControlSet /** @@ -102,6 +107,11 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe } return null; } + + @Override + public int getIcon() { + return -1; + } } @Override diff --git a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java index 76c5c5001..47bd91191 100644 --- a/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -28,8 +28,8 @@ public class DeadlineControlSet extends PopupControlSet { private DateAndTimePicker dateAndTimePicker; - public DeadlineControlSet(ActivityPreferences preferences, Activity activity, int displayViewLayout) { - super(preferences, activity, R.layout.control_set_deadline_dialog, displayViewLayout, 0); + public DeadlineControlSet(ActivityPreferences preferences, Activity activity) { + super(preferences, activity, R.layout.control_set_deadline_dialog, R.layout.control_set_deadline, 0); } @Override @@ -102,4 +102,9 @@ public class DeadlineControlSet extends PopupControlSet { private void initializeWithDate(long dueDate) { dateAndTimePicker.initializeWithDate(dueDate); } + + @Override + public int getIcon() { + return R.attr.ic_action_clock; + } } diff --git a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java index 7349ca43b..6fd0c4d09 100644 --- a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java @@ -35,4 +35,9 @@ public class DescriptionControlSet extends TaskEditControlSetBase { protected void writeToModelAfterInitialized(Task task) { task.setNotes(editText.getText().toString().trim()); } + + @Override + public int getIcon() { + return R.attr.ic_action_list; + } } diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java index 13e28af69..ebc34d460 100644 --- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -144,6 +144,11 @@ public class EditTitleControlSet implements TaskEditControlSet, ImportanceChange } } + @Override + public int getIcon() { + return -1; + } + @Override public View getView() { throw new RuntimeException(); diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 6f6344e45..5a6501595 100644 --- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -235,6 +235,11 @@ public class HideUntilControlSet extends TaskEditControlSetBase implements OnIte super.readFromTask(task); } + @Override + public int getIcon() { + return R.attr.ic_action_box; + } + @Override protected void readFromTaskOnInitialize() { adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java index e72c58476..a6ed4eb82 100644 --- a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -37,7 +37,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase { private static final int TEXT_SIZE = 18; public interface ImportanceChangedListener { - public void importanceChanged(int i); + void importanceChanged(int i); } public ImportanceControlSet(Activity activity) { @@ -88,7 +88,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase { final ToggleButton button = new ToggleButton(activity); LinearLayout.LayoutParams params; - int dimension = 38; + int dimension = 25; params = new LinearLayout.LayoutParams((int) (metrics.density * dimension), (int) (metrics.density * dimension)); button.setLayoutParams(params); @@ -117,7 +117,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase { buttons.add(button); View padding = new View(activity); - LinearLayout.LayoutParams paddingParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); + LinearLayout.LayoutParams paddingParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, 0); paddingParams.weight = 1.0f; padding.setLayoutParams(paddingParams); container.addView(padding); @@ -131,6 +131,11 @@ public class ImportanceControlSet extends TaskEditControlSetBase { setImportance(model.getImportance()); } + @Override + public int getIcon() { + return R.attr.ic_action_flag; + } + // Same as above because we need the setImportance listeners to fire even in // the case when the UI hasn't been created yet @Override diff --git a/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java b/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java index 9125dbbc3..8fe6741b5 100644 --- a/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.util.DisplayMetrics; -import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; @@ -31,7 +30,7 @@ public abstract class PopupControlSet extends TaskEditControlSetBase { private final String titleString; public interface PopupDialogClickListener { - public boolean onClick(DialogInterface d, int which); + boolean onClick(DialogInterface d, int which); } final PopupDialogClickListener okListener = new PopupDialogClickListener() { @@ -49,10 +48,10 @@ public abstract class PopupControlSet extends TaskEditControlSetBase { }; public PopupControlSet(ActivityPreferences preferences, Activity activity, int viewLayout, int taskEditViewLayout, final int title) { - super(activity, viewLayout); + super(activity, viewLayout, false); this.preferences = preferences; if (taskEditViewLayout != -1) { - this.displayView = LayoutInflater.from(activity).inflate(taskEditViewLayout, null); + this.displayView = inflateWithTemplate(taskEditViewLayout); } else { this.displayView = null; } @@ -63,6 +62,7 @@ public abstract class PopupControlSet extends TaskEditControlSetBase { displayView.setOnClickListener(getDisplayClickListener()); } } + @Override public View getView() { return displayView; diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 377fc947f..7c6595a84 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -396,4 +396,9 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte @Override public void onNothingSelected(AdapterView parent) { } + + @Override + public int getIcon() { + return R.attr.ic_action_bell; + } } diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml index 3b4db4d60..791f6ee9f 100644 --- a/src/main/res/layout/control_set_deadline.xml +++ b/src/main/res/layout/control_set_deadline.xml @@ -3,41 +3,13 @@ ** ** See the file "LICENSE" for the full license governing this code. --> - - - - - - - - - - - - - + android:layout_gravity="top" + android:gravity="start" + android:textColor="?attr/asThemeTextColor" + android:textSize="@dimen/task_edit_text_size" + android:paddingRight="@dimen/task_edit_padding_right" + android:paddingEnd="@dimen/task_edit_padding_right" /> diff --git a/src/main/res/layout/control_set_description.xml b/src/main/res/layout/control_set_description.xml index e02438967..16ce8c8b0 100644 --- a/src/main/res/layout/control_set_description.xml +++ b/src/main/res/layout/control_set_description.xml @@ -1,48 +1,17 @@ - - + - - - - - - - - - - - + android:paddingRight="@dimen/task_edit_padding_right" + android:paddingEnd="@dimen/task_edit_padding_right" + android:scrollbars="vertical" + android:hint="@string/TEA_notes_empty" + android:textColorHint="?attr/asTextColorHint" + android:textSize="@dimen/task_edit_text_size" + android:inputType="textCapSentences|textMultiLine" + android:imeOptions="flagNoExtractUi" + android:textColor="?attr/asTextColor" + android:freezesText="true" + android:background="@android:color/transparent" /> diff --git a/src/main/res/layout/control_set_files.xml b/src/main/res/layout/control_set_files.xml index cf40ec9c9..2e160f493 100644 --- a/src/main/res/layout/control_set_files.xml +++ b/src/main/res/layout/control_set_files.xml @@ -4,37 +4,11 @@ ** See the file "LICENSE" for the full license governing this code. --> - - - - - - - - - - + android:layout_height="0dp" + android:layout_weight="1" + android:gravity="start" + android:orientation="vertical" + android:paddingRight="@dimen/task_edit_padding_right" + android:paddingEnd="@dimen/task_edit_padding_right" /> \ No newline at end of file diff --git a/src/main/res/layout/control_set_files_dialog.xml b/src/main/res/layout/control_set_files_dialog.xml index 02566f6b3..d730de54d 100644 --- a/src/main/res/layout/control_set_files_dialog.xml +++ b/src/main/res/layout/control_set_files_dialog.xml @@ -1,26 +1,24 @@ - - - - - - - - - - + + + + + + + + diff --git a/src/main/res/layout/control_set_gcal_display.xml b/src/main/res/layout/control_set_gcal_display.xml index 017d8e401..03f967d32 100644 --- a/src/main/res/layout/control_set_gcal_display.xml +++ b/src/main/res/layout/control_set_gcal_display.xml @@ -1,54 +1,25 @@ - + android:gravity="start" + android:textColor="?attr/asThemeTextColor" + android:textSize="@dimen/task_edit_text_size" /> - - - - - - - - - - - - - + - diff --git a/src/main/res/layout/control_set_hide.xml b/src/main/res/layout/control_set_hide.xml index 876400305..9343028e2 100644 --- a/src/main/res/layout/control_set_hide.xml +++ b/src/main/res/layout/control_set_hide.xml @@ -4,49 +4,22 @@ ** See the file "LICENSE" for the full license governing this code. --> - + android:gravity="start|center_vertical" + android:textColor="?attr/asTextColor" + android:textColorHint="?attr/asTextColorHint" + android:textSize="@dimen/task_edit_text_size" /> - + - - - - - - - - - - - diff --git a/src/main/res/layout/control_set_importance.xml b/src/main/res/layout/control_set_importance.xml index d9e82f538..368b4098b 100644 --- a/src/main/res/layout/control_set_importance.xml +++ b/src/main/res/layout/control_set_importance.xml @@ -4,49 +4,21 @@ ** See the file "LICENSE" for the full license governing this code. --> + android:paddingRight="@dimen/task_edit_padding_right" + android:paddingEnd="@dimen/task_edit_padding_right"> - - - - - - - - - - - - - + android:gravity="start|center_vertical" + android:text="@string/TEA_importance_label" + android:textColor="?attr/asTextColor" + android:textSize="@dimen/task_edit_text_size" /> diff --git a/src/main/res/layout/control_set_reminders.xml b/src/main/res/layout/control_set_reminders.xml index e4f3bd96e..a3bd07a88 100644 --- a/src/main/res/layout/control_set_reminders.xml +++ b/src/main/res/layout/control_set_reminders.xml @@ -4,95 +4,68 @@ ** See the file "LICENSE" for the full license governing this code. --> - - + android:orientation="vertical"> + android:layout_height="wrap_content" /> + + - - - - + + - - - - + android:text="@string/add_reminder" + android:textColor="?attr/asTextColorHint" /> - + - - - - - - - + - + + + - + - - + diff --git a/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml index 357773463..791f6ee9f 100644 --- a/src/main/res/layout/control_set_repeat_display.xml +++ b/src/main/res/layout/control_set_repeat_display.xml @@ -1,44 +1,15 @@ - - - - - - - - - - - - - - - + android:layout_gravity="top" + android:gravity="start" + android:textColor="?attr/asThemeTextColor" + android:textSize="@dimen/task_edit_text_size" + android:paddingRight="@dimen/task_edit_padding_right" + android:paddingEnd="@dimen/task_edit_padding_right" /> diff --git a/src/main/res/layout/control_set_tags.xml b/src/main/res/layout/control_set_tags.xml index 41b5b3ae7..43f7d576a 100644 --- a/src/main/res/layout/control_set_tags.xml +++ b/src/main/res/layout/control_set_tags.xml @@ -3,36 +3,10 @@ ** ** See the file "LICENSE" for the full license governing this code. --> - - - - - - - - - - - - + android:layout_gravity="top" + android:textColor="?attr/asThemeTextColor" + android:textSize="@dimen/task_edit_text_size" /> diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml new file mode 100644 index 000000000..3fb8b4dce --- /dev/null +++ b/src/main/res/layout/control_set_template.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml index bcc467cb9..292b45354 100644 --- a/src/main/res/layout/control_set_timers.xml +++ b/src/main/res/layout/control_set_timers.xml @@ -3,36 +3,9 @@ ** ** See the file "LICENSE" for the full license governing this code. --> - - - - - - - - - - - - + android:textColor="?attr/asThemeTextColor" + android:textSize="@dimen/task_edit_text_size" />