From 75836832356d62e7e992b730b7507b910cd0bcd8 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 21 Aug 2012 11:40:20 -0700 Subject: [PATCH] Polish featured lists dropdown, started introducing hooks for showing/hiding comments in different filter modes --- .../astrid/people/PeopleFilterMode.java | 5 +++++ .../reusable/FeaturedListFilterAdapter.java | 21 +++++++++++++++++++ .../tags/reusable/FeaturedListFilterMode.java | 5 ++++- .../astrid/activity/DefaultFilterMode.java | 5 +++++ .../astrid/activity/FilterModeSpec.java | 1 + .../todoroo/astrid/adapter/FilterAdapter.java | 2 +- 6 files changed, 37 insertions(+), 2 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java index 8828eacfa..47668e7a4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java +++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java @@ -56,4 +56,9 @@ public class PeopleFilterMode implements FilterModeSpec { TaskListFragment.MENU_ADDONS_ID, MainMenuPopover.MAIN_MENU_ITEM_FRIENDS }; + + @Override + public boolean showComments() { + return true; + } } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java index 9b45cc937..5cc493388 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java @@ -3,6 +3,8 @@ package com.todoroo.astrid.tags.reusable; import android.app.Activity; import android.content.Intent; import android.content.IntentFilter; +import android.view.View; +import android.view.ViewGroup; import android.widget.ListView; import com.todoroo.astrid.adapter.FilterAdapter; @@ -34,4 +36,23 @@ public class FeaturedListFilterAdapter extends FilterAdapter { public void unregisterRecevier() { activity.unregisterReceiver(filterReceiver); } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + View v = super.getView(position, convertView, parent); + + ViewHolder viewHolder = (ViewHolder) v.getTag(); + viewHolder.size.setVisibility(View.GONE); + viewHolder.name.setSingleLine(false); + viewHolder.name.setLines(2); + viewHolder.name.setMaxLines(2); + + int right = (int) (metrics.density * 10); + int top = (int) (metrics.density * 2); + viewHolder.name.setPadding(0, top, right, 0); + viewHolder.name.setTextSize(14); + viewHolder.name.setLineSpacing(0.0f, 1.2f); + + return v; + } } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java index 17b88d631..bfa5ad148 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java @@ -48,6 +48,9 @@ public class FeaturedListFilterMode implements FilterModeSpec { // } - + @Override + public boolean showComments() { + return false; + } } diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java index 6f01049ec..05d9b3812 100644 --- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java +++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java @@ -39,4 +39,9 @@ public class DefaultFilterMode implements FilterModeSpec { // } + @Override + public boolean showComments() { + return true; + } + } diff --git a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java index 396c5fd8a..1b90dbd7b 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java @@ -13,5 +13,6 @@ public interface FilterModeSpec { public Filter getDefaultFilter(Context context); public int getMainMenuIconAttr(); public void onFilterItemClickedCallback(FilterListItem item); + public boolean showComments(); } diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 8fda3e699..86cff545a 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -80,7 +80,7 @@ public class FilterAdapter extends ArrayAdapter { protected ListView listView; /** display metrics for scaling icons */ - private final DisplayMetrics metrics = new DisplayMetrics(); + protected final DisplayMetrics metrics = new DisplayMetrics(); /** receiver for new filters */ protected final FilterReceiver filterReceiver = new FilterReceiver();