archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Material navigation drawer

Browse Source
pull/281/head
Alex Baker 9 years ago
parent 48a4a4c32e
commit 2182bb81b0
32 changed files with 490 additions and 371 deletions
Show Stats Download Patch File Download Diff File

5
src/main/AndroidManifest.xml
Unescape Escape View File

@ -142,6 +142,7 @@
<!-- Activity for selecting Android shortcut -->
<activity
android:name="com.todoroo.astrid.activity.FilterShortcutActivity"
android:theme="@style/Tasks"
android:label="@string/FSA_label">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
@ -197,7 +198,9 @@
android:theme="@style/Tasks" />
<!-- Activity that configures widget -->
<activity android:name="com.todoroo.astrid.widget.WidgetConfigActivity">
<activity
android:name="com.todoroo.astrid.widget.WidgetConfigActivity"
android:theme="@style/Tasks">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>

15
src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java
Unescape Escape View File

@ -16,6 +16,7 @@ import android.widget.ListView;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import org.tasks.R;
import org.tasks.filters.FilterCounter;
@ -39,18 +40,12 @@ public class FilterShortcutActivity extends InjectingListActivity {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
preferences.applyTheme();
// Set the result to CANCELED unless a filter is selected.
setResult(RESULT_CANCELED);
preferences.applyLightStatusBarColor();
// Set the view layout resource to use.
setContentView(R.layout.widget_config_activity);
setContentView(R.layout.filter_shortcut_activity);
// set up ui
adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(),
R.layout.filter_adapter_row, true);
adapter.filterStyle = R.style.TextAppearance_FLA_Filter_Widget;
adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false);
setListAdapter(adapter);
Button button = (Button)findViewById(R.id.ok);
@ -81,7 +76,7 @@ public class FilterShortcutActivity extends InjectingListActivity {
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
super.onListItemClick(l, v, position, id);
Filter item = adapter.getItem(position);
FilterListItem item = adapter.getItem(position);
adapter.setSelection(item);
}

22
src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java
Unescape Escape View File

@ -16,7 +16,6 @@ import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.api.FilterWithUpdate;
import com.todoroo.astrid.data.Task;
import org.tasks.R;
@ -54,9 +53,6 @@ public class ShortcutActivity extends Activity {
/** token for passing a ComponentNameto launch */
public static final String TOKEN_CUSTOM_CLASS = "class"; //$NON-NLS-1$
/** token for passing a image url*/
public static final String TOKEN_IMAGE_URL = "imageUrl"; //$NON-NLS-1$ TODO: Remove this
/** List of the above constants for searching */
private static final String[] CUSTOM_EXTRAS = {
TOKEN_SINGLE_TASK,
@ -64,8 +60,7 @@ public class ShortcutActivity extends Activity {
TOKEN_FILTER_SQL,
TOKEN_FILTER_VALUES,
TOKEN_FILTER_VALUES_ITEM,
TOKEN_CUSTOM_CLASS,
TOKEN_IMAGE_URL
TOKEN_CUSTOM_CLASS
};
// --- implementation
@ -128,14 +123,7 @@ public class ShortcutActivity extends Activity {
Filter filter;
if (extras.containsKey(TOKEN_CUSTOM_CLASS)) {
if (extras.containsKey(TOKEN_IMAGE_URL)) {
filter = new FilterWithUpdate(title, title, sql, values);
((FilterWithUpdate) filter).imageUrl = extras.getString(TOKEN_IMAGE_URL);
}
else {
filter = new FilterWithCustomIntent(title, title, sql, values);
}
filter = new FilterWithCustomIntent(title, title, sql, values);
Bundle customExtras = new Bundle();
Set<String> keys = extras.keySet();
for (String key : keys) {
@ -172,12 +160,6 @@ public class ShortcutActivity extends Activity {
shortcutIntent.putExtras(customFilter.customExtras);
}
shortcutIntent.putExtra(TOKEN_CUSTOM_CLASS, customFilter.customTaskList.flattenToString());
if (filter instanceof FilterWithUpdate) {
FilterWithUpdate filterWithUpdate = (FilterWithUpdate) filter;
if (filterWithUpdate.imageUrl != null) {
shortcutIntent.putExtra(TOKEN_IMAGE_URL, filterWithUpdate.imageUrl);
}
}
}
shortcutIntent.setAction(Intent.ACTION_VIEW);

225
src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
Unescape Escape View File

@ -10,12 +10,11 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.graphics.Color;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
@ -24,59 +23,47 @@ import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithUpdate;
import org.tasks.R;
import org.tasks.filters.FilterCounter;
import org.tasks.filters.FilterProvider;
import org.tasks.filters.NavigationDrawerAction;
import org.tasks.filters.NavigationDrawerSubheader;
import org.tasks.filters.NavigationDrawerSeparator;
import org.tasks.preferences.BasicPreferences;
import static org.tasks.preferences.ResourceResolver.getData;
import java.util.List;
public class FilterAdapter extends ArrayAdapter<Filter> {
import static org.tasks.preferences.ResourceResolver.getData;
import static org.tasks.preferences.ResourceResolver.getResource;
// --- style constants
public class FilterAdapter extends ArrayAdapter<FilterListItem> {
public int filterStyle = R.style.TextAppearance_FLA_Filter;
private static final int VIEW_TYPE_COUNT = FilterListItem.Type.values().length;
// --- instance variables
public static final int REQUEST_SETTINGS = 10123;
private final FilterProvider filterProvider;
private final FilterCounter filterCounter;
/** parent activity */
private final Activity activity;
/** owner listview */
private ListView listView;
/** display metrics for scaling icons */
private final DisplayMetrics metrics = new DisplayMetrics();
private final ListView listView;
private boolean navigationDrawer;
private final FilterListUpdateReceiver filterListUpdateReceiver = new FilterListUpdateReceiver();
/** row layout to inflate */
private final int layout;
/** layout inflater */
private final LayoutInflater inflater;
/** whether to skip Filters that launch intents instead of being real filters */
private final boolean skipIntentFilters;
public FilterAdapter(FilterProvider filterProvider, FilterCounter filterCounter, Activity activity, ListView listView,
int rowLayout, boolean skipIntentFilters) {
public FilterAdapter(FilterProvider filterProvider, FilterCounter filterCounter, Activity activity, ListView listView, boolean navigationDrawer) {
super(activity, 0);
this.filterProvider = filterProvider;
this.filterCounter = filterCounter;
this.activity = activity;
this.listView = listView;
this.layout = rowLayout;
this.skipIntentFilters = skipIntentFilters;
inflater = (LayoutInflater) activity.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
this.navigationDrawer = navigationDrawer;
activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@Override
@ -85,11 +72,16 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
}
@Override
public void add(Filter item) {
public void add(FilterListItem item) {
if (getPosition(item) >= 0) {
return;
}
super.add(item);
// load sizes
filterCounter.registerFilter(item);
notifyDataSetChanged();
if (item instanceof Filter) {
filterCounter.registerFilter((Filter) item);
}
}
@Override
@ -102,24 +94,6 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
});
}
private void addOrLookup(Filter filter) {
int index = getPosition(filter);
if (index >= 0) {
Filter existing = getItem(index);
transferImageReferences(filter, existing);
return;
}
add(filter);
}
// Helper function: if a filter was created from serialized extras, it may not
// have the same image data we can get from the in-app broadcast
private void transferImageReferences(Filter from, Filter to) {
if (from instanceof FilterWithUpdate && to instanceof FilterWithUpdate) {
((FilterWithUpdate) to).imageUrl = ((FilterWithUpdate) from).imageUrl;
}
}
public void refreshFilterCount() {
filterCounter.refreshFilterCounts(new Runnable() {
@Override
@ -129,20 +103,28 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
});
}
public void setListView(ListView listView) {
this.listView = listView;
}
/**
* Create or reuse a view
*/
private View newView(View convertView, ViewGroup parent) {
private View newView(View convertView, ViewGroup parent, FilterListItem.Type viewType) {
if(convertView == null) {
convertView = inflater.inflate(layout, parent, false);
ViewHolder viewHolder = new ViewHolder();
switch(viewType) {
case ITEM:
convertView = inflater.inflate(R.layout.filter_adapter_row, parent, false);
viewHolder.name = (TextView)convertView.findViewById(R.id.name);
viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon);
viewHolder.size = (TextView)convertView.findViewById(R.id.size);
break;
case SEPARATOR:
convertView = inflater.inflate(R.layout.filter_adapter_separator, parent, false);
break;
case SUBHEADER:
convertView = inflater.inflate(R.layout.filter_adapter_subheader, parent, false);
viewHolder.name = (TextView) convertView.findViewById(R.id.subheader_text);
break;
}
viewHolder.view = convertView;
viewHolder.name = (TextView)convertView.findViewById(R.id.name);
viewHolder.size = (TextView)convertView.findViewById(R.id.size);
convertView.setTag(viewHolder);
}
return convertView;
@ -151,31 +133,57 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
public static class ViewHolder {
public FilterListItem item;
public TextView name;
public ImageView icon;
public TextView size;
public View view;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
convertView = newView(convertView, parent);
FilterListItem item = getItem(position);
convertView = newView(convertView, parent, item.getItemType());
ViewHolder viewHolder = (ViewHolder) convertView.getTag();
viewHolder.item = getItem(position);
populateView(viewHolder);
Filter selected = null;
if (activity instanceof AstridActivity) {
TaskListFragment tlf = ((AstridActivity) activity).getTaskListFragment();
selected = tlf.getFilter();
}
if (selected != null && selected.equals(viewHolder.item)) {
convertView.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
switch(item.getItemType()) {
case ITEM:
populateItem(viewHolder);
Filter selected = null;
if (activity instanceof AstridActivity) {
TaskListFragment tlf = ((AstridActivity) activity).getTaskListFragment();
selected = tlf.getFilter();
}
if (selected != null && selected.equals(viewHolder.item)) {
convertView.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
}
break;
case SUBHEADER:
populateHeader(viewHolder);
break;
case SEPARATOR:
break;
}
return convertView;
}
@Override
public int getViewTypeCount() {
return VIEW_TYPE_COUNT;
}
@Override
public boolean isEnabled(int position) {
return getItem(position).getItemType() == FilterListItem.Type.ITEM;
}
@Override
public int getItemViewType(int position) {
return getItem(position).getItemType().ordinal();
}
@Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
return getView(position, convertView, parent);
@ -215,16 +223,39 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
}
}
public void getLists() {
for (FilterListItem filter : filterProvider.getFilters()) {
if(skipIntentFilters && !(filter instanceof Filter)) {
continue;
}
public void addSubMenu(final int titleResource, List<Filter> filters) {
if (filters.size() > 0) {
add(new NavigationDrawerSubheader(activity.getResources().getString(titleResource)));
}
if (filter instanceof Filter){
addOrLookup((Filter) filter);
}
for (FilterListItem filterListItem : filters) {
add(filterListItem);
}
}
public void populateList() {
clear();
add(filterProvider.getMyTasksFilter());
addSubMenu(R.string.filters, filterProvider.getFilters());
addSubMenu(R.string.tags, filterProvider.getTags());
addSubMenu(R.string.gtasks_GPr_header, filterProvider.getGoogleTaskFilters());
if (navigationDrawer) {
add(new NavigationDrawerSeparator());
add(new NavigationDrawerAction(
activity.getResources().getString(R.string.TLA_menu_settings),
getResource(activity, R.attr.ic_action_settings),
new Intent(activity, BasicPreferences.class),
REQUEST_SETTINGS));
}
notifyDataSetChanged();
filterCounter.refreshFilterCounts(new Runnable() {
@Override
public void run() {
@ -238,7 +269,8 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
*/
public void registerRecevier() {
activity.registerReceiver(filterListUpdateReceiver, new IntentFilter(AstridApiConstants.BROADCAST_EVENT_REFRESH));
getLists();
populateList();
refreshFilterCount();
}
@ -254,45 +286,40 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
* ================================================================ views
* ====================================================================== */
private void populateView(ViewHolder viewHolder) {
private void populateItem(ViewHolder viewHolder) {
FilterListItem filter = viewHolder.item;
if(filter == null) {
return;
}
viewHolder.view.setBackgroundResource(0);
viewHolder.name.setTextAppearance(activity, filterStyle);
viewHolder.name.setShadowLayer(0, 0, 0, 0);
int icon = filter.icon;
viewHolder.icon.setImageResource(icon);
viewHolder.icon.setVisibility(icon == 0 ? View.INVISIBLE : View.VISIBLE);
String title = filter.listingTitle;
if(!title.equals(viewHolder.name.getText())) {
viewHolder.name.setText(title);
}
int countInt;
int countInt = 0;
if(filterCounter.containsKey(filter)) {
viewHolder.size.setVisibility(View.VISIBLE);
countInt = filterCounter.get(filter);
viewHolder.size.setText(Integer.toString(countInt));
} else {
viewHolder.size.setVisibility(View.GONE);
countInt = -1;
}
viewHolder.size.setVisibility(countInt > 0 ? View.VISIBLE : View.GONE);
if(countInt == 0) {
viewHolder.size.setVisibility(View.GONE);
if (selection == viewHolder.item) {
viewHolder.view.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
}
}
viewHolder.name.getLayoutParams().height = (int) (58 * metrics.density);
if (filter.color != 0) {
viewHolder.name.setTextColor(filter.color);
private void populateHeader(ViewHolder viewHolder) {
FilterListItem filter = viewHolder.item;
if (filter == null) {
return;
}
// selection
if(selection == viewHolder.item) {
// TODO: convert to color
viewHolder.view.setBackgroundColor(Color.rgb(128, 230, 0));
}
viewHolder.name.setText(filter.listingTitle);
}
}

13
src/main/java/com/todoroo/astrid/api/Filter.java
Unescape Escape View File

@ -130,14 +130,6 @@ public class Filter extends FilterListItem {
// --- parcelable
/**
* {@inheritDoc}
*/
@Override
public int describeContents() {
return 0;
}
@Override
public int hashCode() {
final int prime = 31;
@ -177,6 +169,11 @@ public class Filter extends FilterListItem {
return true;
}
@Override
public Type getItemType() {
return Type.ITEM;
}
/**
* {@inheritDoc}
*/

32
src/main/java/com/todoroo/astrid/api/FilterListItem.java
Unescape Escape View File

@ -17,15 +17,30 @@ import android.os.Parcelable;
*/
abstract public class FilterListItem implements Parcelable {
public enum Type {
ITEM(0),
SUBHEADER(1),
SEPARATOR(2);
private int viewType;
Type(int viewType) {
this.viewType = viewType;
}
public int getViewType() {
return viewType;
}
}
public abstract Type getItemType();
/**
* Title of this item displayed on the Filters page
*/
public String listingTitle = null;
/**
* Text Color. <code>0</code> => default color
*/
public int color = 0;
public int icon = 0;
/**
* Context Menu labels. The context menu will be displayed when users
@ -40,6 +55,11 @@ abstract public class FilterListItem implements Parcelable {
*/
public Intent contextMenuIntents[] = new Intent[0];
@Override
public int describeContents() {
return 0;
}
// --- parcelable helpers
/**
@ -48,7 +68,7 @@ abstract public class FilterListItem implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(listingTitle);
dest.writeInt(color);
dest.writeInt(icon);
// write array lengths before arrays
dest.writeStringArray(contextMenuLabels);
@ -60,7 +80,7 @@ abstract public class FilterListItem implements Parcelable {
*/
public void readFromParcel(Parcel source) {
listingTitle = source.readString();
color = source.readInt();
icon = source.readInt();
contextMenuLabels = source.createStringArray();
contextMenuIntents = source.createTypedArray(Intent.CREATOR);

8
src/main/java/com/todoroo/astrid/api/FilterWithCustomIntent.java
Unescape Escape View File

@ -58,14 +58,6 @@ public class FilterWithCustomIntent extends Filter {
// --- parcelable
/**
* {@inheritDoc}
*/
@Override
public int describeContents() {
return 0;
}
/**
* {@inheritDoc}
*/

93
src/main/java/com/todoroo/astrid/api/FilterWithUpdate.java
Unescape Escape View File

@ -1,93 +0,0 @@
/**
* Copyright (c) 2012 Todoroo Inc
*
* See the file "LICENSE" for the full license governing this code.
*/
package com.todoroo.astrid.api;
import android.content.ContentValues;
import android.os.Parcel;
import android.os.Parcelable;
import com.todoroo.andlib.sql.QueryTemplate;
public class FilterWithUpdate extends FilterWithCustomIntent {
/**
* Update image URL
*/
public String imageUrl = null;
/**
* Update message text
*/
public String updateText = null;
protected FilterWithUpdate() {
super();
}
public FilterWithUpdate(String listingTitle, String title,
QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
super(listingTitle, title, sqlQuery, valuesForNewTasks);
}
public FilterWithUpdate(String listingTitle, String title,
String sqlQuery, ContentValues valuesForNewTasks) {
super(listingTitle, title, sqlQuery, valuesForNewTasks);
}
// --- parcelable
/**
* {@inheritDoc}
*/
@Override
public int describeContents() {
return 0;
}
/**
* {@inheritDoc}
*/
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
dest.writeString(imageUrl);
dest.writeString(updateText);
}
@Override
public void readFromParcel(Parcel source) {
super.readFromParcel(source);
imageUrl = source.readString();
updateText = source.readString();
}
/**
* Parcelable Creator Object
*/
public static final Parcelable.Creator<FilterWithUpdate> CREATOR = new Parcelable.Creator<FilterWithUpdate>() {
/**
* {@inheritDoc}
*/
@Override
public FilterWithUpdate createFromParcel(Parcel source) {
FilterWithUpdate item = new FilterWithUpdate();
item.readFromParcel(source);
return item;
}
/**
* {@inheritDoc}
*/
@Override
public FilterWithUpdate[] newArray(int size) {
return new FilterWithUpdate[size];
}
};
}

10
src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
Unescape Escape View File

@ -15,7 +15,6 @@ import com.todoroo.andlib.sql.Query;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
@ -50,12 +49,15 @@ public final class BuiltInFilterExposer {
this.preferences = preferences;
}
public List<FilterListItem> getFilters() {
public Filter getMyTasksFilter() {
return getMyTasksFilter(context.getResources());
}
public List<Filter> getFilters() {
Resources r = context.getResources();
// core filters
List<FilterListItem> filters = new ArrayList<>(3);
List<Filter> filters = new ArrayList<>();
filters.add(getMyTasksFilter(r));
if (preferences.getBoolean(R.string.p_show_today_filter, true)) {
filters.add(getTodayFilter(r));
}

8
src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
Unescape Escape View File

@ -19,9 +19,7 @@ import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.QueryTemplate;
import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.FilterWithCustomIntent;
import com.todoroo.astrid.api.FilterWithUpdate;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.TagData;
@ -54,8 +52,8 @@ public class TagFilterExposer {
this.tagService = tagService;
}
public List<FilterListItem> getFilters() {
ArrayList<FilterListItem> list = new ArrayList<>();
public List<Filter> getFilters() {
ArrayList<Filter> list = new ArrayList<>();
list.addAll(filterFromTags(tagService.getTagList()));
@ -75,7 +73,7 @@ public class TagFilterExposer {
contentValues.put(TaskToTagMetadata.TAG_NAME.name, tag.getName());
contentValues.put(TaskToTagMetadata.TAG_UUID.name, tag.getUuid());
FilterWithUpdate filter = new FilterWithUpdate(tag.getName(),
FilterWithCustomIntent filter = new FilterWithCustomIntent(tag.getName(),
title, tagTemplate,
contentValues);

13
src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java
Unescape Escape View File

@ -71,11 +71,7 @@ public class WidgetConfigActivity extends InjectingListActivity {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
// Set the result to CANCELED. This will cause the widget host to cancel
// out of the widget placement if they press the back button.
setResult(RESULT_CANCELED);
preferences.applyLightStatusBarColor();
// Set the view layout resource to use.
setContentView(R.layout.widget_config_activity);
@ -99,9 +95,7 @@ public class WidgetConfigActivity extends InjectingListActivity {
}
// set up ui
adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(),
R.layout.filter_adapter_row, true);
adapter.filterStyle = R.style.TextAppearance_FLA_Filter_Widget;
adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false);
setListAdapter(adapter);
Button button = (Button) findViewById(R.id.ok);
@ -129,11 +123,10 @@ public class WidgetConfigActivity extends InjectingListActivity {
});
}
@Override
protected void onListItemClick(ListView l, View v, int position, long id) {
super.onListItemClick(l, v, position, id);
Filter item = adapter.getItem(position);
FilterListItem item = adapter.getItem(position);
adapter.setSelection(item);
}

20
src/main/java/org/tasks/filters/FilterProvider.java
Unescape Escape View File

@ -1,6 +1,6 @@
package org.tasks.filters;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.core.CustomFilterExposer;
import com.todoroo.astrid.gtasks.GtasksFilterExposer;
@ -31,13 +31,23 @@ public class FilterProvider {
this.gtasksFilterExposer = gtasksFilterExposer;
}
public List<? extends FilterListItem> getFilters() {
return new ArrayList<FilterListItem>() {{
public Filter getMyTasksFilter() {
return builtInFilterExposer.getMyTasksFilter();
}
public List<Filter> getFilters() {
return new ArrayList<Filter>() {{
addAll(builtInFilterExposer.getFilters());
addAll(timerFilterExposer.getFilters());
addAll(customFilterExposer.getFilters());
addAll(tagFilterExposer.getFilters());
addAll(gtasksFilterExposer.getFilters());
}};
}
public List<Filter> getTags() {
return tagFilterExposer.getFilters();
}
public List<Filter> getGoogleTaskFilters() {
return gtasksFilterExposer.getFilters();
}
}

85
src/main/java/org/tasks/filters/NavigationDrawerAction.java
Unescape Escape View File

@ -0,0 +1,85 @@
package org.tasks.filters;
import android.content.Intent;
import android.os.Parcel;
import android.os.Parcelable;
import com.todoroo.astrid.api.FilterListItem;
public class NavigationDrawerAction extends FilterListItem {
public Intent intent;
public int requestCode;
private NavigationDrawerAction() {
}
public NavigationDrawerAction(String listingTitle, int icon, Intent intent, int requestCode) {
this.listingTitle = listingTitle;
this.icon = icon;
this.intent = intent;
this.requestCode = requestCode;
}
@Override
public Type getItemType() {
return Type.ITEM;
}
/**
* {@inheritDoc}
*/
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
dest.writeParcelable(intent, 0);
dest.writeInt(requestCode);
}
@Override
public void readFromParcel(Parcel source) {
super.readFromParcel(source);
intent = source.readParcelable(Intent.class.getClassLoader());
requestCode = source.readInt();
}
/**
* Parcelable Creator Object
*/
public static final Parcelable.Creator<NavigationDrawerAction> CREATOR = new Parcelable.Creator<NavigationDrawerAction>() {
/**
* {@inheritDoc}
*/
@Override
public NavigationDrawerAction createFromParcel(Parcel source) {
NavigationDrawerAction item = new NavigationDrawerAction();
item.readFromParcel(source);
return item;
}
/**
* {@inheritDoc}
*/
@Override
public NavigationDrawerAction[] newArray(int size) {
return new NavigationDrawerAction[size];
}
};
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
NavigationDrawerAction that = (NavigationDrawerAction) o;
return requestCode == that.requestCode;
}
@Override
public int hashCode() {
return requestCode;
}
}

11
src/main/java/org/tasks/filters/NavigationDrawerSeparator.java
Unescape Escape View File

@ -0,0 +1,11 @@
package org.tasks.filters;
import com.todoroo.astrid.api.FilterListItem;
public class NavigationDrawerSeparator extends FilterListItem {
@Override
public Type getItemType() {
return Type.SEPARATOR;
}
}

15
src/main/java/org/tasks/filters/NavigationDrawerSubheader.java
Unescape Escape View File

@ -0,0 +1,15 @@
package org.tasks.filters;
import com.todoroo.astrid.api.FilterListItem;
public class NavigationDrawerSubheader extends FilterListItem {
public NavigationDrawerSubheader(String listingTitle) {
this.listingTitle = listingTitle;
}
@Override
public Type getItemType() {
return Type.SUBHEADER;
}
}

64
src/main/java/org/tasks/ui/NavigationDrawerFragment.java
Unescape Escape View File

@ -41,11 +41,11 @@ import org.slf4j.LoggerFactory;
import org.tasks.R;
import org.tasks.filters.FilterCounter;
import org.tasks.filters.FilterProvider;
import org.tasks.filters.NavigationDrawerAction;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingFragment;
import org.tasks.location.GeofenceService;
import org.tasks.preferences.AppearancePreferences;
import org.tasks.preferences.BasicPreferences;
import org.tasks.preferences.Preferences;
import javax.inject.Inject;
@ -63,7 +63,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
private static final int CONTEXT_MENU_SHORTCUT = R.string.FLA_context_shortcut;
private static final int CONTEXT_MENU_INTENT = Menu.FIRST + 4;
public static final int ACTIVITY_SETTINGS = 1;
public static final int REQUEST_CUSTOM_INTENT = 10;
public static final int REQUEST_NEW_LIST = 4;
@ -108,7 +107,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ACTIVITY_SETTINGS && resultCode == Activity.RESULT_OK && data != null) {
if (requestCode == FilterAdapter.REQUEST_SETTINGS && resultCode == Activity.RESULT_OK && data != null) {
if (data.getBooleanExtra(ReminderPreferences.TOGGLE_GEOFENCES, false)) {
if (preferences.geofencesEnabled()) {
geofenceService.setupGeofences();
@ -131,8 +130,7 @@ public class NavigationDrawerFragment extends InjectingFragment {
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
if (atLeastLollipop()) {
((ScrimInsetsFrameLayout) layout.findViewById(R.id.scrim_layout)).setOnInsetsCallback(new ScrimInsetsFrameLayout.OnInsetsCallback() {
@ -149,19 +147,12 @@ public class NavigationDrawerFragment extends InjectingFragment {
selectItem(position);
}
});
layout.findViewById(R.id.settings_row).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
closeMenu();
startActivityForResult(new Intent(getActivity(), BasicPreferences.class), ACTIVITY_SETTINGS);
}
});
mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
return layout;
}
private void setUpList() {
adapter.setListView(mDrawerListView);
adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), mDrawerListView, true);
mDrawerListView.setAdapter(adapter);
registerForContextMenu(mDrawerListView);
}
@ -198,14 +189,19 @@ public class NavigationDrawerFragment extends InjectingFragment {
}
private void selectItem(int position) {
Filter item = adapter.getItem(position);
mCurrentSelectedPosition = position;
if (mDrawerListView != null) {
mDrawerListView.setItemChecked(position, true);
}
closeMenu();
if (mCallbacks != null) {
mCallbacks.onFilterItemClicked(item);
FilterListItem item = adapter.getItem(position);
if (item instanceof Filter) {
mCurrentSelectedPosition = position;
if (mDrawerListView != null) {
mDrawerListView.setItemChecked(position, true);
}
if (mCallbacks != null) {
mCallbacks.onFilterItemClicked(item);
}
} else if (item instanceof NavigationDrawerAction) {
NavigationDrawerAction action = (NavigationDrawerAction) item;
startActivityForResult(action.intent, action.requestCode);
}
}
@ -213,7 +209,6 @@ public class NavigationDrawerFragment extends InjectingFragment {
public void onAttach(Activity activity) {
super.onAttach(activity);
mCallbacks = (OnFilterItemClickedListener) activity;
adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), null, R.layout.filter_adapter_row, false);
}
@Override
@ -359,29 +354,30 @@ public class NavigationDrawerFragment extends InjectingFragment {
}
public void refresh() {
adapter.clear();
adapter.getLists();
adapter.populateList();
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
Filter item = adapter.getItem(info.position);
FilterListItem item = adapter.getItem(info.position);
MenuItem menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut);
menuItem.setIntent(ShortcutActivity.createIntent(context, item));
if (item instanceof Filter) {
MenuItem menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut);
menuItem.setIntent(ShortcutActivity.createIntent(context, (Filter) item));
for(int i = 0; i < item.contextMenuLabels.length; i++) {
if(item.contextMenuIntents.length <= i) {
break;
for (int i = 0; i < item.contextMenuLabels.length; i++) {
if (item.contextMenuIntents.length <= i) {
break;
}
menuItem = menu.add(0, CONTEXT_MENU_INTENT, 0, item.contextMenuLabels[i]);
menuItem.setIntent(item.contextMenuIntents[i]);
}
menuItem = menu.add(0, CONTEXT_MENU_INTENT, 0, item.contextMenuLabels[i]);
menuItem.setIntent(item.contextMenuIntents[i]);
}
if(menu.size() > 0) {
menu.setHeaderTitle(item.listingTitle);
if (menu.size() > 0) {
menu.setHeaderTitle(item.listingTitle);
}
}
}

32
src/main/res/layout/filter_adapter_row.xml
Unescape Escape View File

@ -8,15 +8,33 @@
are defined in FilterAdapter.java -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:paddingLeft="7dip"
android:layout_height="48dp"
android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
android:paddingRight="@dimen/navigation_drawer_horizontal_margins"
android:paddingEnd="@dimen/navigation_drawer_horizontal_margins"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:alpha="0.87"
android:src="?attr/ic_action_settings"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:scaleType="fitStart"/>
<!-- filter name -->
<TextView android:id="@+id/name"
<TextView
android:id="@+id/name"
android:textColor="?attr/asTextColor"
android:textSize="14sp"
android:layout_toRightOf="@id/icon"
android:layout_toEndOf="@id/icon"
android:fontFamily="@string/font_fontFamily_medium"
android:alpha="0.87"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingRight="30dp"
android:checked="false"
android:lines="1"
android:singleLine="true"
@ -28,7 +46,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@string/font_fontFamily_medium"
android:alpha="0.54"
android:layout_marginRight="5dip"
android:layout_marginEnd="5dip"
android:layout_centerVertical="true"
android:paddingLeft="7dip"
android:paddingRight="7dip"

15
src/main/res/layout/filter_adapter_separator.xml
Unescape Escape View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:focusable="false">
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:background="?attr/asListDividerColor" />
</LinearLayout>

26
src/main/res/layout/filter_adapter_subheader.xml
Unescape Escape View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="vertical"
android:paddingTop="8dp">
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_gravity="top"
android:background="?attr/asListDividerColor" />
<TextView
android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
android:gravity="center_vertical"
android:id="@+id/subheader_text"
android:textColor="?attr/asTextColor"
android:textSize="14sp"
android:fontFamily="@string/font_fontFamily_medium"
android:alpha="0.54"
android:layout_width="match_parent"
android:layout_height="fill_parent"/>
</LinearLayout>

39
src/main/res/layout/filter_shortcut_activity.xml
Unescape Escape View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- See the file "LICENSE" for the full license governing this code.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/asContentBackground"
android:orientation="vertical">
<!-- Title -->
<TextView
style="TextAppearance.ActionBar_ListsHeader"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="10dp"
android:text="@string/WCA_title"
android:textSize="18sp" />
<!-- List -->
<ListView android:id="@android:id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:listSelector="?attr/selectableItemBackground"
android:drawSelectorOnTop="true"
android:divider="@android:color/transparent"
android:cacheColorHint="@android:color/transparent"
android:scrollingCache="false"
android:scrollbars="vertical"/>
<!-- List -->
<Button android:id="@+id/ok"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/ok"/>
</LinearLayout>

55
src/main/res/layout/fragment_navigation_drawer.xml
Unescape Escape View File

@ -8,50 +8,19 @@
android:background="?attr/drawer_background"
app:insetForeground="#4000">
<LinearLayout
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:scrollbars="vertical"
android:clipToPadding="false"
tools:context=".NavigationDrawerFragment" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="?attr/asSeparatorBackground" />
<Button
android:id="@+id/settings_row"
android:layout_width="match_parent"
android:layout_height="45dp"
android:gravity="start|center_vertical"
android:drawableStart="?attr/ic_action_settings"
android:drawableLeft="?attr/ic_action_settings"
android:drawablePadding="10dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:textAppearance="@style/TextAppearance.FLA_Filter"
android:layout_gravity="start"
android:text="@string/TLA_menu_settings"
android:background="?attr/selectableItemBackground" />
</LinearLayout>
</LinearLayout>
android:layout_weight="1"
android:choiceMode="singleChoice"
android:divider="@android:color/transparent"
android:scrollbars="vertical"
android:clipToPadding="false"
android:listSelector="?attr/selectableItemBackground"
android:drawSelectorOnTop="true"
tools:context=".NavigationDrawerFragment"
android:cacheColorHint="@android:color/transparent"
android:scrollingCache="false" />
</org.tasks.ui.ScrimInsetsFrameLayout>

7
src/main/res/layout/widget_config_activity.xml
Unescape Escape View File

@ -69,10 +69,15 @@
<!-- List -->
<ListView android:id="@android:id/list"
style="@style/ListView"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:cacheColorHint="#00000000"
android:listSelector="?attr/selectableItemBackground"
android:drawSelectorOnTop="true"
android:divider="@android:color/transparent"
android:cacheColorHint="@android:color/transparent"
android:scrollingCache="false"
android:scrollbars="vertical"/>
<!-- List -->

4
src/main/res/values-land/dimens.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_width">320dp</dimen>
</resources>

4
src/main/res/values-sw360dp/dimens.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_width">304dp</dimen>
</resources>

4
src/main/res/values-sw384dp/dimens.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_width">320dp</dimen>
</resources>

4
src/main/res/values-sw600dp/dimens.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_horizontal_margins">24dp</dimen>
</resources>

4
src/main/res/values-v21/fonts.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="font_fontFamily_medium">sans-serif-medium</string>
</resources>

7
src/main/res/values-w820dp/dimens.xml
Unescape Escape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>

3
src/main/res/values/dimens.xml
Unescape Escape View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="navigation_drawer_width">300dp</dimen>
<dimen name="navigation_drawer_width">260dp</dimen>
<dimen name="navigation_drawer_horizontal_margins">16dp</dimen>
<dimen name="widget_margin">8dp</dimen>
<dimen name="task_edit_title_padding_top_bottom">18dp</dimen>

4
src/main/res/values/fonts.xml
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="font_fontFamily_medium">sans-serif</string>
</resources>

2
src/main/res/values/strings.xml
Unescape Escape View File

@ -103,6 +103,8 @@
<string name="geofence_radius_title">Radius (meters)</string>
<string name="geofence_responsiveness_title">Response time (higher value conserves battery)</string>
<string name="geolocation_reminders">Geolocation Reminders</string>
<string name="tags">Tags</string>
<string name="filters">Filters</string>
<string-array name="sync_SPr_interval_entries">
<!-- sync_SPr_interval_entries: Synchronization Intervals -->

12
src/main/res/values/styles.xml
Unescape Escape View File

@ -185,20 +185,10 @@
<item name="android:textColor">?attr/asDueDateCompletedColor</item>
</style>
<!-- ============================================== FilterListAdapter == -->
<style name="TextAppearance.FLA_Filter">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.FLA_Filter_Widget" parent="TextAppearance.FLA_Filter">
<item name="android:textColor">?attr/asTextColor</item>
</style>
<!-- ========================================================= Widget == -->
<style name="TextAppearance.Widget">
<item name="android:textSize">16sp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/widget_text_color_light</item>
</style>

Write Preview
Loading…
Cancel
Save