From bf22b8ed007fcbffd628342264cab9221922a4b0 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 17 Nov 2014 11:21:51 -0600 Subject: [PATCH] Update styles, remove date shortcuts, fix tablet --- .../FloatingActionButton.java | 3 - .../astrid/activity/TaskEditActivity.java | 10 ++- .../astrid/activity/TaskListActivity.java | 17 ++-- .../astrid/activity/TaskListFragment.java | 3 +- .../todoroo/astrid/adapter/FilterAdapter.java | 4 +- .../astrid/gtasks/GtasksListFragment.java | 1 - .../reminders/NotificationFragment.java | 3 - .../astrid/repeats/RepeatControlSet.java | 2 +- .../todoroo/astrid/service/TaskService.java | 2 - .../subtasks/SubtasksTagListFragment.java | 1 - .../todoroo/astrid/ui/AstridTimePicker.java | 18 ++--- .../todoroo/astrid/ui/DateAndTimePicker.java | 42 +++------- .../todoroo/astrid/ui/DeadlineControlSet.java | 19 +---- .../com/todoroo/astrid/ui/QuickAddBar.java | 42 +++------- .../utility/AstridDefaultPreferenceSpec.java | 2 - .../astrid/voice/VoiceInputAssistant.java | 6 -- .../todoroo/astrid/voice/VoiceRecognizer.java | 9 --- .../tasks/preferences/ResourceResolver.java | 4 - .../res/drawable-v21/filter_row_selector.xml | 5 ++ astrid/src/main/res/drawable-v21/ripple.xml | 6 ++ .../main/res/drawable/filter_row_normal.xml | 4 - .../main/res/drawable/filter_row_selected.xml | 4 - .../main/res/drawable/filter_row_selector.xml | 4 +- .../main/res/layout-land/date_time_picker.xml | 58 -------------- .../task_edit_wrapper_activity.xml | 19 +++++ .../res/layout-w820dp/task_list_wrapper.xml | 60 ++++++++++++++ .../main/res/layout/astrid_time_picker.xml | 79 ------------------- .../src/main/res/layout/date_time_picker.xml | 57 ------------- .../res/layout/fragment_navigation_drawer.xml | 18 +++-- .../main/res/layout/task_edit_activity.xml | 2 - .../res/layout/task_edit_wrapper_activity.xml | 32 +++++--- ...ity_no_swipe.xml => task_list_wrapper.xml} | 0 .../task_list_wrapper_activity_3pane.xml | 53 ------------- astrid/src/main/res/layout/toolbar.xml | 6 +- astrid/src/main/res/values-v11/styles.xml | 7 +- astrid/src/main/res/values-v21/styles.xml | 6 ++ astrid/src/main/res/values/attrs.xml | 2 - astrid/src/main/res/values/colors.xml | 3 + astrid/src/main/res/values/keys.xml | 2 - astrid/src/main/res/values/strings-core.xml | 2 - astrid/src/main/res/values/styles.xml | 29 +++---- astrid/src/main/res/xml/preferences.xml | 5 -- 42 files changed, 194 insertions(+), 457 deletions(-) create mode 100644 astrid/src/main/res/drawable-v21/filter_row_selector.xml create mode 100644 astrid/src/main/res/drawable-v21/ripple.xml delete mode 100644 astrid/src/main/res/drawable/filter_row_normal.xml delete mode 100644 astrid/src/main/res/drawable/filter_row_selected.xml delete mode 100644 astrid/src/main/res/layout-land/date_time_picker.xml create mode 100644 astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml create mode 100644 astrid/src/main/res/layout-w820dp/task_list_wrapper.xml delete mode 100644 astrid/src/main/res/layout/astrid_time_picker.xml delete mode 100644 astrid/src/main/res/layout/date_time_picker.xml rename astrid/src/main/res/layout/{task_list_wrapper_activity_no_swipe.xml => task_list_wrapper.xml} (100%) delete mode 100644 astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml create mode 100644 astrid/src/main/res/values-v21/styles.xml diff --git a/astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java b/astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java index 43f935553..214802693 100644 --- a/astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java +++ b/astrid/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java @@ -6,15 +6,12 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.Point; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Build; import android.util.AttributeSet; -import android.view.Display; import android.view.MotionEvent; import android.view.View; -import android.view.WindowManager; import org.tasks.R; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 8a0031dd5..94e4ddb70 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -33,11 +33,13 @@ public class TaskEditActivity extends AstridActivity { setContentView(R.layout.task_edit_wrapper_activity); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + if (toolbar != null) { + setSupportActionBar(toolbar); - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowTitleEnabled(false); + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowTitleEnabled(false); + } } /* (non-Javadoc) diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 7403d5022..c557342a0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -83,9 +83,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList super.onCreate(savedInstanceState); preferences.applyTheme(); - setContentView(preferences.useTabletLayout() - ? R.layout.task_list_wrapper_activity_3pane - : R.layout.task_list_wrapper_activity_no_swipe); + setContentView(R.layout.task_list_wrapper); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -239,10 +237,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList } else { TaskListFragment tlf = getTaskListFragment(); if (tlf != null) { - Task result = tlf.quickAddBar.quickAddTask("", true); //$NON-NLS-1$ - if (result != null) { - onTaskListItemClicked(result.getId()); - } + tlf.quickAddBar.quickAddTask(); //$NON-NLS-1$ } } if (fragmentLayout == LAYOUT_SINGLE) { @@ -302,6 +297,11 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList @Override public void onBackPressed() { + if (navigationDrawer.isDrawerOpen()) { + navigationDrawer.closeMenu(); + return; + } + // manage task edit visibility View taskeditFragmentContainer = findViewById(R.id.taskedit_fragment_container); if(taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) { @@ -499,8 +499,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList public void onSpeechResult(String result) { TaskListFragment tlf = getTaskListFragment(); if (tlf != null) { - Task task = tlf.quickAddBar.quickAddTask(result, true); - onTaskListItemClicked(task.getId()); + tlf.quickAddBar.quickAddTask(result); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 9b55d5694..4f050c079 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -60,7 +60,6 @@ import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.gtasks.GtasksListFragment; import com.todoroo.astrid.gtasks.GtasksPreferenceService; -import com.todoroo.astrid.gtasks.GtasksPreferences; import com.todoroo.astrid.helper.SyncActionHelper; import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.TaskDeleter; @@ -282,7 +281,7 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel fab.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - quickAddBar.quickAddTask("", true); + quickAddBar.quickAddTask(); } }); View body = getListBody(parent); diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index fb8823c00..843a47785 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -44,8 +44,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.tasks.preferences.ResourceResolver.getData; - public class FilterAdapter extends ArrayAdapter { private static final Logger log = LoggerFactory.getLogger(FilterAdapter.class); @@ -204,7 +202,7 @@ public class FilterAdapter extends ArrayAdapter { } if (selected != null && selected.equals(viewHolder.item)) { - convertView.setBackgroundColor(getData(activity, R.attr.drawer_selected)); + convertView.setBackgroundColor(activity.getResources().getColor(R.color.drawer_background_selected)); } return convertView; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index 43bfd6ec2..ed92604e9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -10,7 +10,6 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java index f268b5c81..8f299bc85 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java @@ -5,13 +5,10 @@ */ package com.todoroo.astrid.reminders; -import android.view.View; - import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.service.TaskService; -import org.tasks.R; import org.tasks.preferences.Preferences; import javax.inject.Inject; diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 312e3ae37..ccf1d9d10 100644 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -415,7 +415,7 @@ public class RepeatControlSet extends PopupControlSet { arrayResource); String date = String.format("%s %s", repeatValue, dates[intervalValue]); //$NON-NLS-1$ if (repeatUntilValue > 0) { - return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, false, useAbbrev, useAbbrev)); + return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, useAbbrev, useAbbrev)); } else { return activity.getString(R.string.repeat_detail_duedate, date); // Every freq int } diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 47b501dc5..2b5745b26 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -55,8 +55,6 @@ public class TaskService { public static final String TRANS_REPEAT_CHANGED = "repeat_changed"; //$NON-NLS-1$ - public static final String TRANS_TAGS = "tags"; //$NON-NLS-1$ - public static final String TRANS_EDIT_SAVE = "task-edit-save"; //$NON-NLS-1$ public static final String TRANS_REPEAT_COMPLETE = "repeat-complete"; //$NON-NLS-1$ diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index ad624158e..4637c02b7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.subtasks; import android.app.Activity; -import android.support.v4.widget.SwipeRefreshLayout; import android.view.View; import android.view.ViewGroup; diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java index 5b2ba49d2..48e38fa6f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java @@ -35,19 +35,15 @@ public class AstridTimePicker extends LinearLayout { private boolean is24Hour; private boolean lastSelectionWasPm; // false for AM, true for PM - private final boolean useShortcuts; public interface TimePickerEnabledChangedListener { public void timePickerEnabledChanged(boolean hasTime); } - - public AstridTimePicker(Context context, AttributeSet attrs) { super(context, attrs); LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - useShortcuts = Preferences.getBoolean(R.string.p_use_date_shortcuts, true); - int layout = useShortcuts ? R.layout.astrid_time_picker : R.layout.astrid_time_picker_horizontal; + int layout = R.layout.astrid_time_picker_horizontal; inflater.inflate(layout, this, true); noTimeCheck = (ToggleButton) findViewById(R.id.hasTime); @@ -95,13 +91,11 @@ public class AstridTimePicker extends LinearLayout { minutes.findViewById(R.id.decrement).setBackgroundDrawable( CustomBorderDrawable.customButton(0, 0, cornerRadius, 0, onColorValue, offColorValue, borderColorValue, strokeWidth)); - if (!useShortcuts) { - View[] pickers = new View[] { hours, minutes }; - for (View view : pickers) { - View v = view.findViewById(R.id.timepicker_input); - LayoutParams lp = (LinearLayout.LayoutParams) v.getLayoutParams(); - lp.height = (int) (46 * r.getDisplayMetrics().density); - } + View[] pickers = new View[] { hours, minutes }; + for (View view : pickers) { + View v = view.findViewById(R.id.timepicker_input); + LayoutParams lp = (LayoutParams) v.getLayoutParams(); + lp.height = (int) (46 * r.getDisplayMetrics().density); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java index 2db3d3990..bf88b006e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java @@ -18,7 +18,6 @@ import android.widget.LinearLayout; import android.widget.ToggleButton; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.ui.AstridTimePicker.TimePickerEnabledChangedListener; import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener; @@ -54,27 +53,19 @@ public class DateAndTimePicker extends LinearLayout { private final CalendarView calendarView; private final AstridTimePicker timePicker; private final LinearLayout dateShortcuts; - private final boolean useShortcuts; private UrgencyValue todayUrgency; public DateAndTimePicker(Context context, AttributeSet attrs) { super(context, attrs); LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - useShortcuts = Preferences.getBoolean(R.string.p_use_date_shortcuts, true); - inflater.inflate(useShortcuts ? R.layout.date_time_picker : R.layout.date_time_picker_no_shortcuts, this, true); - + inflater.inflate(R.layout.date_time_picker_no_shortcuts, this, true); calendarView = (CalendarView) findViewById(R.id.calendar); timePicker = (AstridTimePicker) findViewById(R.id.time_picker); - if (useShortcuts) { - dateShortcuts = (LinearLayout) findViewById(R.id.date_shortcuts); - } else { - findViewById(R.id.date_shortcuts).setVisibility(View.GONE); - dateShortcuts = (LinearLayout) timePicker.findViewById(R.id.date_shortcuts); - } - + findViewById(R.id.date_shortcuts).setVisibility(View.GONE); + dateShortcuts = (LinearLayout) timePicker.findViewById(R.id.date_shortcuts); setUpListeners(); constructShortcutList(context, attrs); @@ -155,15 +146,6 @@ public class DateAndTimePicker extends LinearLayout { ArrayList urgencyValues = new ArrayList<>(); todayUrgency = new UrgencyValue(labels[2], Task.URGENCY_TODAY); - if (useShortcuts) { - urgencyValues.add(todayUrgency); - urgencyValues.add(new UrgencyValue(labels[3], - Task.URGENCY_TOMORROW)); - urgencyValues.add(new UrgencyValue(labels[5], - Task.URGENCY_NEXT_WEEK)); - urgencyValues.add(new UrgencyValue(labels[7], - Task.URGENCY_NEXT_MONTH)); - } urgencyValues.add(new UrgencyValue(labels[0], Task.URGENCY_NONE)); @@ -179,7 +161,7 @@ public class DateAndTimePicker extends LinearLayout { int strokeWidth = (int) (1 * r.getDisplayMetrics().density); for (int i = 0; i < urgencyValues.size(); i++) { - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, (int) ((useShortcuts ? 42 : 38) * metrics.density), 0); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, (int) ((38) * metrics.density), 0); UrgencyValue uv = urgencyValues.get(i); ToggleButton tb = new ToggleButton(context); @@ -188,11 +170,7 @@ public class DateAndTimePicker extends LinearLayout { tb.setTextOn(label); tb.setTag(uv); if (i == 0) { - if (useShortcuts) { - tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); - } else { - tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); - } + tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); } else if (i == urgencyValues.size() - 2) { lp.topMargin = (int) (-1 * metrics.density); tb.setBackgroundDrawable(CustomBorderDrawable.customButton(cornerRadius, cornerRadius, cornerRadius, cornerRadius, onColorValue, offColorValue, borderColorValue, strokeWidth)); @@ -265,16 +243,16 @@ public class DateAndTimePicker extends LinearLayout { return dueDate > DateUtilities.now(); } - public String getDisplayString(Context context, boolean useNewline, boolean hideYear) { + public String getDisplayString(Context context) { long dueDate = constructDueDate(); - return getDisplayString(context, dueDate, useNewline, hideYear, false); + return getDisplayString(context, dueDate, false, false); } public static String getDisplayString(Context context, long forDate) { - return getDisplayString(context, forDate, false, false, false); + return getDisplayString(context, forDate, false, false); } - public static String getDisplayString(Context context, long forDate, boolean useNewline, boolean hideYear, boolean hideTime) { + public static String getDisplayString(Context context, long forDate, boolean hideYear, boolean hideTime) { StringBuilder displayString = new StringBuilder(); Date d = newDate(forDate); if (d.getTime() > 0) { @@ -284,7 +262,7 @@ public class DateAndTimePicker extends LinearLayout { displayString.append(DateUtilities.getDateString(d)); } if (Task.hasDueTime(forDate) && !hideTime) { - displayString.append(useNewline ? "\n" : ", "); //$NON-NLS-1$ //$NON-NLS-2$ + displayString.append(", "); //$NON-NLS-1$ //$NON-NLS-2$ displayString.append(DateUtilities.getTimeString(context, d)); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java index d3367846d..8cddbc54a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -30,7 +30,6 @@ import static org.tasks.preferences.ResourceResolver.getResource; public class DeadlineControlSet extends PopupControlSet { - private boolean isQuickadd = false; private DateAndTimePicker dateAndTimePicker; private final View[] extraViews; private final RepeatControlSet repeatControlSet; @@ -50,13 +49,13 @@ public class DeadlineControlSet extends PopupControlSet { boolean isOverdue; if (initialized) { isOverdue = !dateAndTimePicker.isAfterNow(); - displayString.append(dateAndTimePicker.getDisplayString(activity, isQuickadd, isQuickadd)); + displayString.append(dateAndTimePicker.getDisplayString(activity)); } else { isOverdue = model.getDueDate() < DateUtilities.now(); - displayString.append(DateAndTimePicker.getDisplayString(activity, model.getDueDate(), isQuickadd, isQuickadd, false)); + displayString.append(DateAndTimePicker.getDisplayString(activity, model.getDueDate(), false, false)); } - if (!isQuickadd && repeatControlSet != null) { + if (repeatControlSet != null) { String repeatString = repeatControlSet.getStringForExternalDisplay(); if (!TextUtils.isEmpty(repeatString)) { displayString.append("\n"); //$NON-NLS-1$ @@ -130,16 +129,4 @@ public class DeadlineControlSet extends PopupControlSet { private void initializeWithDate(long dueDate) { dateAndTimePicker.initializeWithDate(dueDate); } - - public boolean isDeadlineSet() { - return (dateAndTimePicker != null && dateAndTimePicker.constructDueDate() != 0); - } - - /** - * Set whether date and time should be separated by a newline or a comma - * in the display view - */ - public void setIsQuickadd() { - this.isQuickadd = true; - } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java index c3220ced7..01d5f27e1 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java @@ -22,8 +22,6 @@ import org.tasks.R; import org.tasks.injection.Injector; import org.tasks.preferences.ActivityPreferences; -import java.util.HashSet; - import javax.inject.Inject; /** @@ -48,30 +46,23 @@ public class QuickAddBar { injector.inject(this); // TODO: get rid of this activity = myActivity; fragment = myFragment; - resetControlSets(); - } - - private void resetControlSets() { - Task empty = new Task(); - TagData tagData = fragment.getActiveTagData(); - if (tagData != null) { - HashSet tagsTransitory = new HashSet<>(); - tagsTransitory.add(tagData.getName()); - empty.putTransitory(TaskService.TRANS_TAGS, tagsTransitory); - } } // --- quick add task logic + public void quickAddTask() { + quickAddTask(""); + } + /** * Quick-add a new task */ - public Task quickAddTask(String title, boolean selectNewTask) { + public void quickAddTask(String title) { TagData tagData = fragment.getActiveTagData(); if(tagData != null && (!tagData.containsNonNullValue(TagData.NAME) || tagData.getName().length() == 0)) { DialogUtilities.okDialog(activity, activity.getString(R.string.tag_no_title_error), null); - return null; + return; } try { @@ -86,27 +77,20 @@ public class QuickAddBar { taskService.createWithValues(task, fragment.getFilter().valuesForNewTasks, title); - resetControlSets(); - taskCreator.addToCalendar(task, title); - if (selectNewTask) { - fragment.loadTaskListContent(); - fragment.selectCustomId(task.getId()); - if (task.getTransitory(TaskService.TRANS_QUICK_ADD_MARKUP) != null) { - showAlertForMarkupTask(activity, task, title); - } else if (!TextUtils.isEmpty(task.getRecurrence())) { - showAlertForRepeatingTask(activity, task); - } - activity.onTaskListItemClicked(task.getId()); + fragment.loadTaskListContent(); + fragment.selectCustomId(task.getId()); + if (task.getTransitory(TaskService.TRANS_QUICK_ADD_MARKUP) != null) { + showAlertForMarkupTask(activity, task, title); + } else if (!TextUtils.isEmpty(task.getRecurrence())) { + showAlertForRepeatingTask(activity, task); } + activity.onTaskListItemClicked(task.getId()); fragment.onTaskCreated(task); - - return task; } catch (Exception e) { log.error(e.getMessage(), e); - return new Task(); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 88285f05b..30cc0d4b8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -48,8 +48,6 @@ public class AstridDefaultPreferenceSpec { setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, true); - setPreference(prefs, editor, r, R.string.p_use_date_shortcuts, false); - setPreference(prefs, editor, r, R.string.p_rmd_quietStart_old, 22); // enable quiet hours by default setIntIfUnset(prefs, editor, r, R.string.p_rmd_quietStart, r.getInteger(R.integer.default_quiet_hours_start)); diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java index 00e40b60e..c9b59335e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -6,8 +6,6 @@ package com.todoroo.astrid.voice; import android.app.Activity; -import android.content.ActivityNotFoundException; -import android.content.DialogInterface; import android.content.Intent; import android.speech.RecognizerIntent; import android.support.v4.app.Fragment; @@ -17,15 +15,11 @@ import android.widget.EditText; import android.widget.ImageButton; import com.todoroo.andlib.service.ContextManager; -import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.utility.DialogUtilities; -import com.todoroo.astrid.utility.Constants; import junit.framework.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.tasks.R; import java.security.InvalidParameterException; import java.util.ArrayList; diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java index 5849d124c..0e89c671c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceRecognizer.java @@ -14,8 +14,6 @@ import android.content.pm.ResolveInfo; import android.speech.RecognizerIntent; import android.speech.SpeechRecognizer; import android.support.v4.app.Fragment; -import android.widget.EditText; -import android.widget.ImageButton; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.utility.Constants; @@ -86,13 +84,6 @@ public class VoiceRecognizer { } } - public boolean handleActivityResult(int requestCode, int resultCode, Intent data, EditText textField) { - if (instance != null && instance.voiceInputAssistant != null) { - return instance.voiceInputAssistant.handleActivityResult(requestCode, resultCode, data, textField); - } - return false; - } - public void destroyRecognizerApi() { if (instance != null && instance.recognizerApi != null) { instance.recognizerApi.destroy(); diff --git a/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java b/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java index e19d7c11f..7b986ae59 100644 --- a/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java +++ b/astrid/src/main/java/org/tasks/preferences/ResourceResolver.java @@ -16,10 +16,6 @@ public class ResourceResolver { this.activity = activity; } - public int getResource(int attr) { - return getResource(activity, attr); - } - public int getData(int attr) { return getData(activity, attr); } diff --git a/astrid/src/main/res/drawable-v21/filter_row_selector.xml b/astrid/src/main/res/drawable-v21/filter_row_selector.xml new file mode 100644 index 000000000..261b9e33e --- /dev/null +++ b/astrid/src/main/res/drawable-v21/filter_row_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/src/main/res/drawable-v21/ripple.xml b/astrid/src/main/res/drawable-v21/ripple.xml new file mode 100644 index 000000000..e20c0dadc --- /dev/null +++ b/astrid/src/main/res/drawable-v21/ripple.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/astrid/src/main/res/drawable/filter_row_normal.xml b/astrid/src/main/res/drawable/filter_row_normal.xml deleted file mode 100644 index 61d586605..000000000 --- a/astrid/src/main/res/drawable/filter_row_normal.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/astrid/src/main/res/drawable/filter_row_selected.xml b/astrid/src/main/res/drawable/filter_row_selected.xml deleted file mode 100644 index 5b47a42f5..000000000 --- a/astrid/src/main/res/drawable/filter_row_selected.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/astrid/src/main/res/drawable/filter_row_selector.xml b/astrid/src/main/res/drawable/filter_row_selector.xml index 16d125508..45120591c 100644 --- a/astrid/src/main/res/drawable/filter_row_selector.xml +++ b/astrid/src/main/res/drawable/filter_row_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/astrid/src/main/res/layout-land/date_time_picker.xml b/astrid/src/main/res/layout-land/date_time_picker.xml deleted file mode 100644 index 1bd2c2b39..000000000 --- a/astrid/src/main/res/layout-land/date_time_picker.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml b/astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml new file mode 100644 index 000000000..408292118 --- /dev/null +++ b/astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/astrid/src/main/res/layout-w820dp/task_list_wrapper.xml b/astrid/src/main/res/layout-w820dp/task_list_wrapper.xml new file mode 100644 index 000000000..ecedd4635 --- /dev/null +++ b/astrid/src/main/res/layout-w820dp/task_list_wrapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/astrid/src/main/res/layout/astrid_time_picker.xml b/astrid/src/main/res/layout/astrid_time_picker.xml deleted file mode 100644 index 488318abc..000000000 --- a/astrid/src/main/res/layout/astrid_time_picker.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout/date_time_picker.xml b/astrid/src/main/res/layout/date_time_picker.xml deleted file mode 100644 index 6d6bb7761..000000000 --- a/astrid/src/main/res/layout/date_time_picker.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout/fragment_navigation_drawer.xml b/astrid/src/main/res/layout/fragment_navigation_drawer.xml index 5b9535dcb..44f743155 100644 --- a/astrid/src/main/res/layout/fragment_navigation_drawer.xml +++ b/astrid/src/main/res/layout/fragment_navigation_drawer.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="?attr/drawer_background" + android:background="@color/drawer_background" android:cacheColorHint="@android:color/transparent" android:choiceMode="singleChoice" android:divider="@android:color/transparent" @@ -18,12 +18,10 @@ tools:context=".NavigationDrawerFragment" /> - - - - - - - + android:layout_width="match_parent" + android:orientation="vertical"> + + + + + + + + + + + diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml b/astrid/src/main/res/layout/task_list_wrapper.xml similarity index 100% rename from astrid/src/main/res/layout/task_list_wrapper_activity_no_swipe.xml rename to astrid/src/main/res/layout/task_list_wrapper.xml diff --git a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml deleted file mode 100644 index 106571904..000000000 --- a/astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/astrid/src/main/res/layout/toolbar.xml b/astrid/src/main/res/layout/toolbar.xml index 4afe4d677..bff11f26b 100644 --- a/astrid/src/main/res/layout/toolbar.xml +++ b/astrid/src/main/res/layout/toolbar.xml @@ -1,8 +1,6 @@ + android:minHeight="?attr/actionBarSize" /> diff --git a/astrid/src/main/res/values-v11/styles.xml b/astrid/src/main/res/values-v11/styles.xml index 0a7cb36b4..6ed1b39b5 100644 --- a/astrid/src/main/res/values-v11/styles.xml +++ b/astrid/src/main/res/values-v11/styles.xml @@ -1,12 +1,9 @@ - - + \ No newline at end of file diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml index d5b2bb75f..a72f73312 100644 --- a/astrid/src/main/res/values/attrs.xml +++ b/astrid/src/main/res/values/attrs.xml @@ -32,11 +32,9 @@ - - diff --git a/astrid/src/main/res/values/colors.xml b/astrid/src/main/res/values/colors.xml index c96a52462..4cdbbd0e8 100644 --- a/astrid/src/main/res/values/colors.xml +++ b/astrid/src/main/res/values/colors.xml @@ -29,5 +29,8 @@ #ffffbb33 #ff99cc00 #ffff4444 + + #dddddd + #efefef diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index 9c97b3325..c678f5b67 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -127,8 +127,6 @@ p_time_increment - p_use_date_shortcuts - p_show_timer_shortcut diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 6702efffd..c0f1027e5 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -446,8 +446,6 @@ 5 minute increments - Use date shortcuts - Show timer shortcut diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml index 3bcbb67e6..8950e5feb 100644 --- a/astrid/src/main/res/values/styles.xml +++ b/astrid/src/main/res/values/styles.xml @@ -2,7 +2,13 @@ - + + + + @@ -64,10 +65,6 @@ false - - - - -