From 97d17d23c06a8c065ba76c016c5596348a87bb65 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 5 Jul 2019 15:44:39 -0500
Subject: [PATCH] Navigation drawer update

* Close drawer after selecting navigation action
* Remove unused methods
* Fix pre-21 crash
---
 .../adapter/NavigationDrawerAdapter.java      | 20 -----------
 .../tasks/ui/NavigationDrawerFragment.java    | 33 ++++++++++---------
 .../drawer_background.xml                     |  0
 .../drawer_background_selected.xml            |  0
 .../drawer_background_selector.xml            |  5 +++
 .../drawable/drawer_background_selector.xml   |  4 +--
 6 files changed, 24 insertions(+), 38 deletions(-)
 rename app/src/main/res/{drawable => drawable-v21}/drawer_background.xml (100%)
 rename app/src/main/res/{drawable => drawable-v21}/drawer_background_selected.xml (100%)
 create mode 100644 app/src/main/res/drawable-v21/drawer_background_selector.xml

diff --git a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
index 80830637b..e5f816011 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.java
@@ -17,7 +17,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil.ItemCallback;
 import androidx.recyclerview.widget.ListAdapter;
 import com.todoroo.astrid.adapter.FilterViewHolder.OnClick;
@@ -74,22 +73,8 @@ public class NavigationDrawerAdapter extends ListAdapter<FilterListItem, FilterV
   }
 
   public void setData(List<FilterListItem> items) {
-    setData(items, selected);
-  }
-
-  public void setData(List<FilterListItem> items, @Nullable Filter selected) {
-    setData(items, selected, -1);
-  }
-
-  public void setData(List<FilterListItem> items, @Nullable Filter selected, int defaultIndex) {
     this.items = items;
     submitList(items);
-
-    if (selected != null) {
-      this.selected = selected;
-    } else if (defaultIndex >= 0) {
-      this.selected = getFilter(defaultIndex);
-    }
   }
 
   public void setCounts(Map<Filter, Integer> counts) {
@@ -98,11 +83,6 @@ public class NavigationDrawerAdapter extends ListAdapter<FilterListItem, FilterV
     notifyDataSetChanged();
   }
 
-  private Filter getFilter(int position) {
-    FilterListItem item = getItem(position);
-    return item instanceof Filter ? (Filter) item : null;
-  }
-
   @Override
   public long getItemId(int position) {
     return position;
diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
index 8760f91d9..4227ad792 100644
--- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.java
@@ -16,6 +16,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -132,24 +133,24 @@ public class NavigationDrawerFragment extends InjectingFragment {
   }
 
   private void onFilterItemSelected(FilterListItem item) {
-    if (item instanceof Filter) {
-      mDrawerLayout.addDrawerListener(
-          new DrawerLayout.SimpleDrawerListener() {
-            @Override
-            public void onDrawerClosed(View drawerView) {
-              mDrawerLayout.removeDrawerListener(this);
+    mDrawerLayout.addDrawerListener(
+        new SimpleDrawerListener() {
+          @Override
+          public void onDrawerClosed(View drawerView) {
+            mDrawerLayout.removeDrawerListener(this);
+            if (item instanceof Filter) {
               openFilter((Filter) item);
+            } else if (item instanceof NavigationDrawerAction) {
+              NavigationDrawerAction action = (NavigationDrawerAction) item;
+              if (action.requestCode > 0) {
+                startActivityForResult(action.intent, action.requestCode);
+              } else {
+                startActivity(action.intent);
+              }
             }
-          });
-      close();
-    } else if (item instanceof NavigationDrawerAction) {
-      NavigationDrawerAction action = (NavigationDrawerAction) item;
-      if (action.requestCode > 0) {
-        startActivityForResult(action.intent, action.requestCode);
-      } else {
-        startActivity(action.intent);
-      }
-    }
+          }
+        });
+    close();
   }
 
   public boolean isDrawerOpen() {
diff --git a/app/src/main/res/drawable/drawer_background.xml b/app/src/main/res/drawable-v21/drawer_background.xml
similarity index 100%
rename from app/src/main/res/drawable/drawer_background.xml
rename to app/src/main/res/drawable-v21/drawer_background.xml
diff --git a/app/src/main/res/drawable/drawer_background_selected.xml b/app/src/main/res/drawable-v21/drawer_background_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/drawer_background_selected.xml
rename to app/src/main/res/drawable-v21/drawer_background_selected.xml
diff --git a/app/src/main/res/drawable-v21/drawer_background_selector.xml b/app/src/main/res/drawable-v21/drawer_background_selector.xml
new file mode 100644
index 000000000..a39e83834
--- /dev/null
+++ b/app/src/main/res/drawable-v21/drawer_background_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:drawable="@drawable/drawer_background_selected" android:state_selected="true"/>
+  <item android:drawable="@drawable/drawer_background"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/drawer_background_selector.xml b/app/src/main/res/drawable/drawer_background_selector.xml
index a39e83834..08a5e8e83 100644
--- a/app/src/main/res/drawable/drawer_background_selector.xml
+++ b/app/src/main/res/drawable/drawer_background_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:drawable="@drawable/drawer_background_selected" android:state_selected="true"/>
-  <item android:drawable="@drawable/drawer_background"/>
+  <item android:drawable="@color/drawer_color_selected" android:state_selected="true"/>
+  <item android:drawable="@color/drawer_color"/>
 </selector>
\ No newline at end of file