Update styles, remove date shortcuts, fix tablet

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;
 

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)

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);
         }
     }
 

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);

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<Filter> {
 
     private static final Logger log = LoggerFactory.getLogger(FilterAdapter.class);
@@ -204,7 +202,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         }
 
         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;

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;

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;

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
         }

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$

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;
 

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);
         }
     }
 

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<UrgencyValue> 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));
             }
         }

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;
-    }
 }

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<String> 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();
         }
     }
 

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));

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;

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();

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);
     }

astrid/src/main/res/drawable-v21/filter_row_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/ripple"/>
+    <item android:state_pressed="false" android:drawable="@color/drawer_background"/>
+</selector>

astrid/src/main/res/drawable-v21/ripple.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item android:id="@android:id/mask" android:drawable="@color/drawer_background_selected"/>
+    <item android:drawable="@color/drawer_background_selected"/>
+</ripple>

astrid/src/main/res/drawable/filter_row_normal.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/drawer_background"/>
-</shape>

astrid/src/main/res/drawable/filter_row_selected.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/drawer_selected"/>
-</shape>

astrid/src/main/res/drawable/filter_row_selector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/filter_row_selected"/>
-    <item android:state_pressed="false" android:drawable="@drawable/filter_row_normal"/>
+    <item android:state_pressed="true" android:drawable="@color/drawer_background_selected"/>
+    <item android:state_pressed="false" android:drawable="@color/drawer_background"/>
 </selector>

astrid/src/main/res/layout-land/date_time_picker.xml

@@ -1,58 +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. 
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:minWidth="320dip"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="5dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		<LinearLayout
-		    android:id="@+id/datetime_extras"
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:orientation="horizontal"/>
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"
-		      android:layout_weight="1"
-		      android:layout_marginLeft="5dip"
-		      android:layout_gravity="center_vertical">
-              <com.todoroo.astrid.ui.CalendarView
-	              android:id="@+id/calendar"
-	              android:layout_width="0dip"
-	              android:layout_height="280dip"
-	              android:layout_weight="50" 
-	              android:layout_marginRight="5dip"/>
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="0dip"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="25"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="0dip"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="25"
-	          	  android:orientation="vertical"/>
-		  </LinearLayout>
-		</LinearLayout>
-	</ScrollView>
-</merge>

astrid/src/main/res/layout-w820dp/task_edit_wrapper_activity.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/taskedit_fragment_container">
+
+    <fragment
+	    android:name="com.todoroo.astrid.activity.TaskEditFragment"
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:tag="taskedit_fragment">
+	</fragment>
+</FrameLayout>

astrid/src/main/res/layout-w820dp/task_list_wrapper.xml

@@ -0,0 +1,60 @@
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/toolbar" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/asContentBackground"
+            android:orientation="horizontal">
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="?attr/asSeparatorBackground" />
+
+            <!-- Task List -->
+            <FrameLayout
+                android:id="@+id/tasklist_fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="60" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="?attr/asSeparatorBackground" />
+
+            <!-- Task Edit -->
+            <FrameLayout
+                android:id="@+id/taskedit_fragment_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="40"
+                android:visibility="invisible" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <fragment
+        android:id="@+id/navigation_drawer"
+        android:name="org.tasks.ui.NavigationDrawerFragment"
+        android:layout_width="@dimen/navigation_drawer_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        tools:layout="@layout/fragment_navigation_drawer" />
+
+</android.support.v4.widget.DrawerLayout>
+

astrid/src/main/res/layout/astrid_time_picker.xml

@@ -1,79 +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. 
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-	    <LinearLayout
-	        android:id="@+id/timeComponents"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="8dip"
-	        android:orientation="horizontal">
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/hours"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-		   	<TextView 
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="fill_parent"
-		   	    android:background="@android:color/transparent"
-		   	    android:text=":"
-		   	    android:textColor="?attr/asTextColor"
-		   	    android:gravity="center"
-		   	    />
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/minutes"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-	    </LinearLayout>
-	    
-	    <LinearLayout
-	        android:id="@+id/am_pm_container"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="4dip">
-		    <ToggleButton
-		        android:id="@+id/am_button"
-		        android:layout_width="fill_parent"
-		        android:layout_height="42dip"
-		        android:paddingTop="8dip"
-		        android:paddingBottom="8dip"
-		        android:textSize="18sp"
-		        android:gravity="center"
-		        android:textColor="@color/task_edit_toggle_button_text"
-		        android:layout_weight="1"
-		        android:layout_marginRight="-1dip"/>
-	        <ToggleButton
-		        android:id="@+id/pm_button"
-		        android:layout_width="fill_parent"
-		        android:layout_height="42dip"
-		        android:paddingTop="8dip"
-		        android:paddingBottom="8dip"
-		        android:textSize="18sp"
-		        android:gravity="center"
-		        android:textColor="@color/task_edit_toggle_button_text"
-		        android:layout_weight="1"
-		        android:layout_marginLeft="-1dip"/>
-	    </LinearLayout>
-	    
-	    <ToggleButton
-	        android:id="@+id/hasTime"
-	        android:layout_width="fill_parent"
-	        android:layout_height="42dip"
-	        android:paddingTop="8dip"
-	        android:paddingBottom="8dip"
-	        android:textSize="18sp"
-	        android:gravity="center"
-	        android:textColor="@color/task_edit_toggle_button_text"/>
-    </LinearLayout>
-    
-</merge>

astrid/src/main/res/layout/date_time_picker.xml

@@ -1,57 +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. 
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:layout_weight="100"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="5dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		  <LinearLayout
-		      android:id="@+id/datetime_extras"
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"/>
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:layout_marginBottom="3dip"
-		      android:orientation="horizontal"
-		      android:layout_weight="1">
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="fill_parent"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="fill_parent"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>
-
-		  </LinearLayout>
-		  <com.todoroo.astrid.ui.CalendarView
-            android:id="@+id/calendar"
-            android:layout_width="fill_parent"
-            android:layout_height="250dip"
-            android:layout_weight="1" />
-		</LinearLayout>
-	</ScrollView>
-</merge>

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" />
 
     <LinearLayout
-        android:id="@+id/settings_row"
-        android:clickable="true"
         android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:background="@drawable/filter_row_selector"
+        android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:background="@color/drawer_background"
         android:orientation="vertical">
 
         <View
@@ -32,9 +30,13 @@
             android:background="?attr/asSeparatorBackground" />
 
             <!-- filter name -->
-        <TextView android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+        <TextView
+            android:id="@+id/settings_row"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:clickable="true"
+            android:longClickable="false"
+            android:background="@drawable/filter_row_selector"
             android:drawableLeft="?attr/ic_action_settings"
             android:paddingLeft="10dp"
             android:drawablePadding="10dp"

astrid/src/main/res/layout/task_edit_activity.xml

@@ -11,8 +11,6 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <include layout="@layout/toolbar" />
-
     <ScrollView
         android:id="@+id/edit_scroll"
         android:background="?attr/asEditBackground"

astrid/src/main/res/layout/task_edit_wrapper_activity.xml

@@ -4,15 +4,25 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:id="@+id/taskedit_fragment_container">
-	<fragment
-	    android:name="com.todoroo.astrid.activity.TaskEditFragment"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:tag="taskedit_fragment">
-	</fragment>
-</FrameLayout>
+    android:layout_width="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/taskedit_fragment_container">
+
+        <fragment
+            android:name="com.todoroo.astrid.activity.TaskEditFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:tag="taskedit_fragment">
+        </fragment>
+    </FrameLayout>
+
+</LinearLayout>
+

astrid/src/main/res/layout/task_list_wrapper_activity_3pane.xml

@@ -1,53 +0,0 @@
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:background="?attr/asContentBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
-
-        <include layout="@layout/toolbar"/>
-
-        <View
-            android:layout_width="1px"
-            android:layout_height="match_parent"
-            android:background="?attr/asSeparatorBackground" />
-
-        <!-- Task List -->
-        <FrameLayout
-            android:id="@+id/tasklist_fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="60" />
-
-        <View
-            android:layout_width="1px"
-            android:layout_height="match_parent"
-            android:background="?attr/asSeparatorBackground" />
-
-        <!-- Task Edit -->
-        <FrameLayout
-            android:id="@+id/taskedit_fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="40"
-            android:visibility="invisible" />
-
-    </LinearLayout>
-
-    <fragment
-        android:id="@+id/navigation_drawer"
-        android:name="org.tasks.ui.NavigationDrawerFragment"
-        android:layout_width="@dimen/navigation_drawer_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        tools:layout="@layout/fragment_navigation_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
-

astrid/src/main/res/layout/toolbar.xml

@@ -1,8 +1,6 @@
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tasks="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
-    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:minHeight="?attr/actionBarSize"
+    android:layout_height="wrap_content"
     android:background="?attr/asAbBackgroundColor"
-    tasks:popupTheme="@style/ActionBarPopupThemeOverlay" />
+    android:minHeight="?attr/actionBarSize" />

astrid/src/main/res/values-v11/styles.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="android:displayOptions">showHome|showTitle</item>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
-    <style name="AstridActionBarStyle.Dialog">
-        <item name="android:background">@android:color/white</item>
-        <item name="android:displayOptions">showHome|showTitle</item>
+    <style name="DialogTheme" parent="@android:style/Theme.Dialog">
     </style>
 
     <style name="TEA_Dialog_Light_ICS" parent="@android:style/Theme.Holo.Light.Dialog">

astrid/src/main/res/values-v21/styles.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+    </style>
+</resources>

astrid/src/main/res/values/attrs.xml

@@ -32,11 +32,9 @@
     <attr name="ic_action_mic" format="reference" />
     <attr name="ic_action_search" format="reference"/>
     <attr name="ic_action_settings" format="reference"/>
-    <attr name="drawer_background" format="color"/>
     <attr name="drawer_text" format="color"/>
     <attr name="task_edit_theme_color" format="color"/>
     <attr name="importance_background_selected" format="reference"/>
-    <attr name="drawer_selected" format="color"/>
 
     <attr name="tea_icn_files" format="reference"/>
     <attr name="tea_icn_addcal" format="reference"/>

astrid/src/main/res/values/colors.xml

@@ -29,5 +29,8 @@
     <color name="refresh_color_2">#ffffbb33</color>
     <color name="refresh_color_3">#ff99cc00</color>
     <color name="refresh_color_4">#ffff4444</color>
+
+    <color name="drawer_background_selected">#dddddd</color>
+    <color name="drawer_background">#efefef</color>
 </resources>
 

astrid/src/main/res/values/keys.xml

@@ -127,8 +127,6 @@
   
   <string name="p_time_increment">p_time_increment</string>
   
-  <string name="p_use_date_shortcuts">p_use_date_shortcuts</string>
-  
   <string name="p_show_timer_shortcut">p_show_timer_shortcut</string>
 
   <!-- ========================================================= DEFAULTS == -->

astrid/src/main/res/values/strings-core.xml

@@ -446,8 +446,6 @@
   
   <string name="EPr_time_increment">5 minute increments</string>
   
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
   <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
   
   <!-- slide 35h -->

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

@@ -2,7 +2,13 @@
 
     <!-- ========================================================== General  -->
 
-    <style name="Tasks" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    </style>
+
+    <style name="DialogTheme" parent="@android:style/Theme.Dialog">
+    </style>
+
+    <style name="Tasks" parent="AppTheme">
         <!--<item name="colorPrimary">@android:color/holo_orange_light</item>-->
         <item name="colorPrimaryDark">#636363</item>
         <!--<item name="colorAccent">@android:color/holo_purple</item>-->
@@ -13,7 +19,6 @@
         <item name="asSeparatorBackground">#888888</item>
         <item name="asEditTextBackground">@null</item>
 
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
         <item name="asContentBackground">@android:color/white</item>
         <item name="asEditBackground">@android:color/white</item>
@@ -47,14 +52,10 @@
         <item name="tea_icn_hide">@drawable/tea_icn_hide</item>
         <item name="tea_icn_reminder">@drawable/tea_icn_reminder</item>
 
-        <item name="drawer_background">#efefef</item>
         <item name="drawer_text">#000</item>
-        <item name="drawer_selected">#dddddd</item>
 
         <!-- actionbar-styling -->
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <item name="android:actionBarStyle">@style/AstridActionBarStyle</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
@@ -64,10 +65,6 @@
         <item name="spinBars">false</item>
     </style>
 
-    <style name="AstridActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">
-        <item name="displayOptions">showHome|showTitle</item>
-    </style>
-
     <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
         <item name="android:windowIsTranslucent">true</item>
 	    <item name="android:windowBackground">@android:color/transparent</item>
@@ -75,12 +72,7 @@
 	    <item name="android:windowIsFloating">true</item>
 	</style>
 
-    <style name="AstridActionBarStyle.Dialog">
-        <item name="background">@android:color/white</item>
-        <item name="displayOptions">showHome|showTitle</item>
-    </style>
-    
-    <style name="Tasks.Dialog" parent="@android:style/Theme.Dialog">
+    <style name="Tasks.Dialog" parent="DialogTheme">
         <!--<item name="android:windowBackground">@null</item>-->
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
@@ -103,10 +95,7 @@
         <item name="asTextColor">#ff000000</item>
         <item name="asDetailsColor">#ff6666aa</item>
         <item name="asDueDateColor">#878787</item>
-        <!-- actionbar-styling -->
-        <item name="android:actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
-        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
-        
+
         <item name="asEditBackground">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>

astrid/src/main/res/xml/preferences.xml

@@ -43,11 +43,6 @@
 	            android:title="@string/EPr_show_task_edit_comments"
 	            android:defaultValue="true"/>
 	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_use_date_shortcuts"
-	            android:title="@string/EPr_use_date_shortcuts"
-	            android:defaultValue="true"/>
-	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
                 android:key="@string/p_time_increment"
                 android:title="@string/EPr_time_increment"