From 790373c3cb76b2312ef293f4b3fdb9c53d8a69d9 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 19 Jan 2012 19:44:28 -0800
Subject: [PATCH] Polished background color of list view, highlight currently
 selected list

---
 .../res/layout-land/filter_list_activity.xml  |  1 +
 .../filter_list_activity.xml                  |  1 +
 .../res/layout-large/filter_list_activity.xml |  3 +-
 .../task_list_wrapper_activity.xml            |  1 +
 astrid/res/layout/filter_list_activity.xml    |  1 +
 astrid/res/values/colors.xml                  |  4 +++
 astrid/res/values/styles.xml                  |  4 +--
 .../activity/AstridWrapperActivity.java       |  2 ++
 .../astrid/activity/FilterListActivity.java   | 28 ++++++++++++-------
 .../activity/TaskListWrapperActivity.java     | 14 ----------
 .../todoroo/astrid/adapter/FilterAdapter.java | 16 +++++++++++
 11 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml
index 56c500350..08aa2bd49 100644
--- a/astrid/res/layout-land/filter_list_activity.xml
+++ b/astrid/res/layout-land/filter_list_activity.xml
@@ -13,6 +13,7 @@
         android:layout_height="200dip"
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
     <!-- Footer -->
diff --git a/astrid/res/layout-large-land/filter_list_activity.xml b/astrid/res/layout-large-land/filter_list_activity.xml
index 808ef6401..9e2d6a58d 100644
--- a/astrid/res/layout-large-land/filter_list_activity.xml
+++ b/astrid/res/layout-large-land/filter_list_activity.xml
@@ -37,6 +37,7 @@
         android:layout_alignParentTop="true"
         android:layout_above="@id/lists_footer"
         android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
 </RelativeLayout>
diff --git a/astrid/res/layout-large/filter_list_activity.xml b/astrid/res/layout-large/filter_list_activity.xml
index 808ef6401..7ae60813b 100644
--- a/astrid/res/layout-large/filter_list_activity.xml
+++ b/astrid/res/layout-large/filter_list_activity.xml
@@ -3,7 +3,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
-    android:background="@drawable/list_popover_bg">
+    android:background="@color/tablet_list_bg">
 
     <!-- Footer -->
     <LinearLayout
@@ -37,6 +37,7 @@
         android:layout_alignParentTop="true"
         android:layout_above="@id/lists_footer"
         android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
 </RelativeLayout>
diff --git a/astrid/res/layout-large/task_list_wrapper_activity.xml b/astrid/res/layout-large/task_list_wrapper_activity.xml
index aeda8c70c..4cc724633 100644
--- a/astrid/res/layout-large/task_list_wrapper_activity.xml
+++ b/astrid/res/layout-large/task_list_wrapper_activity.xml
@@ -8,6 +8,7 @@
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
 	    android:layout_weight="67"
+	    android:background="@android:color/white"
 	    android:id="@+id/filterlist_fragment_container">
 	</FrameLayout>
 	<View 
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 895a3f031..c7f793dab 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -13,6 +13,7 @@
         android:layout_height="300dip"
         android:layout_alignParentTop="true"
         android:scrollbars="vertical"
+        android:divider="@android:color/transparent"
         android:cacheColorHint="#00000000"/>
     
     <!-- Footer -->
diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml
index 02917340e..f223bcc3b 100644
--- a/astrid/res/values/colors.xml
+++ b/astrid/res/values/colors.xml
@@ -26,6 +26,10 @@
     
     <color name="task_edit_details">#0b78a5</color>
     <color name="task_edit_deadline_gray">#888888</color>
+    
+    <color name="red_text_color">#d00000</color>
+    <color name="tablet_list_bg">#292929</color>
+    <color name="tablet_list_selected">#101010</color>
         
 </resources>
 
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 627644d58..cbcb5942d 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -63,7 +63,7 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">#d00000</item>
+        <item name="asAbTextColor">@color/red_text_color</item>
     </style>
     
     <style name="Theme.TransparentWhite" parent="@style/Theme.White">
@@ -75,7 +75,7 @@
         <item name="abBackground">@android:color/white</item>
         <item name="abDisplayOptions">useLogo|showHome|showTitle</item>
         <item name="abLogo">@drawable/icon_48</item>
-        <item name="asAbTextColor">#d00000</item>
+        <item name="asAbTextColor">@color/red_text_color</item>
     </style>
     
     <style name="Theme_Dialog" parent="@android:style/Theme.Dialog">
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
index 2c9b42baa..f03fa4232 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridWrapperActivity.java
@@ -99,7 +99,9 @@ public class AstridWrapperActivity extends FragmentActivity
             if(item instanceof Filter) {
                 Filter filter = (Filter)item;
                 if(filter instanceof FilterWithCustomIntent) {
+                    int lastSelectedList = intent.getIntExtra(FilterListActivity.TOKEN_LAST_SELECTED, 0);
                     intent = ((FilterWithCustomIntent)filter).getCustomIntent();
+                    intent.putExtra(FilterListActivity.TOKEN_LAST_SELECTED, lastSelectedList);
                 } else {
                     intent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
                 }
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index dd3c982c7..744a40b25 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -69,6 +69,8 @@ public class FilterListActivity extends ListFragment {
 
     public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment";
 
+    public static final String TOKEN_LAST_SELECTED = "lastSelected";
+
     // -- extra codes
     //public static final String SHOW_BACK_BUTTON = "show_back"; //$NON-NLS-1$
 
@@ -92,12 +94,15 @@ public class FilterListActivity extends ListFragment {
     @Autowired ExceptionService exceptionService;
 
     protected FilterAdapter adapter = null;
-    private boolean mDualFragments;
 
     private final RefreshReceiver refreshReceiver = new RefreshReceiver();
 
     private OnFilterItemClickedListener mListener;
 
+    private boolean mDualFragments;
+
+    private int mSelectedIndex;
+
     /* ======================================================================
      * ======================================================= initialization
      * ====================================================================== */
@@ -175,10 +180,11 @@ public class FilterListActivity extends ListFragment {
             }
         });
 
-        onNewIntent(getActivity().getIntent());
-
-        Fragment tasklistFrame = getFragmentManager().findFragmentByTag(TaskListActivity.TAG_TASKLIST_FRAGMENT);
-        mDualFragments = (tasklistFrame != null) && tasklistFrame.isInLayout();
+        AstridWrapperActivity activity = (AstridWrapperActivity) getActivity();
+        mDualFragments = activity.isMultipleFragments();
+        if (mDualFragments)
+            mSelectedIndex = activity.getIntent().getIntExtra(TOKEN_LAST_SELECTED, 0);
+        onNewIntent(activity.getIntent());
 
         if (mDualFragments) {
             // In dual-pane mode, the list view highlights the selected item.
@@ -299,6 +305,8 @@ public class FilterListActivity extends ListFragment {
                 R.layout.filter_adapter_row, false);
         setListAdapter(adapter);
 
+        adapter.setLastSelected(mSelectedIndex);
+
         registerForContextMenu(getListView());
     }
 
@@ -310,12 +318,12 @@ public class FilterListActivity extends ListFragment {
 
     @Override
     public void onListItemClick(ListView parent, View v, int position, long id) {
-//        if (mDualFragments)
-//        {
-//            setSelectedChild(groupPosition, childPosition, false);
-//            setItemChecked((int) getSelectedPosition(), true);
-//        }
+        if (mDualFragments)
+            getListView().setItemChecked(position, true);
         Filter item = adapter.getItem(position);
+        mSelectedIndex = position;
+        adapter.setLastSelected(mSelectedIndex);
+        getActivity().getIntent().putExtra(TOKEN_LAST_SELECTED, mSelectedIndex);
         mListener.onFilterItemClicked(item);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
index 4187ea3d4..cbd502772 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java
@@ -4,15 +4,12 @@ import android.os.Bundle;
 import android.support.v4.app.ActionBar;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.FrameLayout;
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.service.ThemeService;
@@ -24,19 +21,8 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
     private View listsNav;
     private TextView lists;
 
-    private FilterAdapter listDropdownAdapter;
     private ListDropdownPopover popover;
 
-    private final OnItemClickListener listClickListener = new OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            Filter item = listDropdownAdapter.getItem(position);
-            onFilterItemClicked(item);
-            popover.dismiss();
-            lists.setText(item.title);
-        }
-    };
-
     private final OnClickListener popupMenuClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 32da6ec2b..f39816ed0 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -88,6 +88,8 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     /** whether rows are selectable */
     private final boolean selectable;
 
+    private int mSelectedIndex;
+
     // Previous solution involved a queue of filters and a filterSizeLoadingThread. The filterSizeLoadingThread had
     // a few problems: how to make sure that the thread is resumed when the controlling activity is resumed, and
     // how to make sure that the the filterQueue does not accumulate filters without being processed. I am replacing
@@ -157,6 +159,10 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         offerFilter(item);
     }
 
+    public void setLastSelected(int lastSelected) {
+        mSelectedIndex = lastSelected;
+    }
+
 
     /**
      * Create or reuse a view
@@ -200,6 +206,12 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         viewHolder.item = (FilterListItem) getItem(position);
         populateView(viewHolder, false);
 
+        if (listView.isItemChecked(position)) {
+            convertView.setBackgroundColor(activity.getResources().getColor(R.color.tablet_list_selected));
+        } else {
+            convertView.setBackgroundColor(activity.getResources().getColor(android.R.color.transparent));
+        }
+
         return convertView;
     }
 
@@ -286,6 +298,10 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
                     add((Filter) filter);
                 }
             }
+
+            if (mSelectedIndex < getCount()) {
+                listView.setItemChecked(mSelectedIndex, true);
+            }
             notifyDataSetChanged();
         }
     }