From 1ff6fb4f5043a7a453cd13478aa70efb448af915 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 12 Nov 2014 11:08:18 -0600
Subject: [PATCH] Highlight selected items, dont show zero counts

---
 .../com/todoroo/astrid/adapter/FilterAdapter.java | 15 +++++++--------
 astrid/src/main/res/values/attrs.xml              |  1 +
 astrid/src/main/res/values/styles.xml             |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 0e128b148..fb8823c00 100644
--- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -44,6 +44,8 @@ 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);
@@ -197,15 +199,12 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
         Filter selected = null;
         if (activity instanceof AstridActivity) {
-            boolean shouldHighlightSelected = ((AstridActivity) activity).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE;
-            if (shouldHighlightSelected) {
-                TaskListFragment tlf = ((AstridActivity) activity).getTaskListFragment();
-                selected = tlf.getFilter();
-            }
+            TaskListFragment tlf = ((AstridActivity) activity).getTaskListFragment();
+            selected = tlf.getFilter();
         }
 
-        if (selected == null || !selected.equals(viewHolder.item)) {
-            convertView.setBackgroundColor(activity.getResources().getColor(android.R.color.transparent));
+        if (selected != null && selected.equals(viewHolder.item)) {
+            convertView.setBackgroundColor(getData(activity, R.attr.drawer_selected));
         }
 
         return convertView;
@@ -390,7 +389,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         }
 
         if(countInt == 0 && filter instanceof FilterWithCustomIntent) {
-            viewHolder.name.setTextColor(Color.GRAY);
+            viewHolder.size.setVisibility(View.GONE);
         }
 
         viewHolder.name.getLayoutParams().height = (int) (58 * metrics.density);
diff --git a/astrid/src/main/res/values/attrs.xml b/astrid/src/main/res/values/attrs.xml
index f752bea43..3bed067ee 100644
--- a/astrid/src/main/res/values/attrs.xml
+++ b/astrid/src/main/res/values/attrs.xml
@@ -37,6 +37,7 @@
     <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"/>
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index 3a6a4f9ba..6f8501d24 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -48,6 +48,7 @@
         <item name="tea_icn_reminder">@drawable/tea_icn_reminder_lightblue</item>
         <item name="drawer_background">#303030</item>
         <item name="drawer_text">#ffffff</item>
+        <item name="drawer_selected">#555555</item>
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle</item>
@@ -105,6 +106,7 @@
 
         <item name="drawer_background">#efefef</item>
         <item name="drawer_text">#000</item>
+        <item name="drawer_selected">#dddddd</item>
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Light</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.Light</item>