From 27f75bb3d622efab0ca3f76ee67d8a7fb5cfd972 Mon Sep 17 00:00:00 2001
From: Halzyn
Date: Tue, 9 Jun 2015 15:31:22 +0200
Subject: Icons, prettier hamburger menu

---
 .../org/rssin/android/NavigationDrawerAdapter.java | 53 +++++++++++++++++++---
 .../rssin/android/NavigationDrawerFragment.java    |  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/org')

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
index 39a472c..90ce041 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
@@ -35,23 +35,20 @@ class NavigationDrawerAdapter implements ListAdapter {
         menuItems.clear();
         menuItems.add(new MenuSection("START"));
         menuItems.add(new MenuUnifiedInbox());
-        menuItems.add(new MenuSection("FILTERS"));
+        menuItems.add(new ManageFiltersSection("FILTERS (EDIT)"));
 
         for(Filter f : FiltersList.getInstance(context).getFilters())
         {
             menuItems.add(new MenuFilterItem(f));
         }
 
-        menuItems.add(new FilterListMenuItem());
-
-        menuItems.add(new MenuSection("FEEDS"));
+        menuItems.add(new ManageFeedsSection("FEEDS (EDIT)"));
 
         for(Feed f : FeedsList.getInstance(context).getFeeds())
         {
             menuItems.add(new MenuFeedItem(f));
         }
 
-        menuItems.add(new FeedListMenuItem());
 
         for(DataSetObserver observer : observers)
         {
@@ -61,12 +58,12 @@ class NavigationDrawerAdapter implements ListAdapter {
 
     @Override
     public boolean areAllItemsEnabled() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isEnabled(int position) {
-        return getItemViewType(position) != ITEM_VIEW_TYPE_SEPARATOR;
+        return true;
     }
 
     private List<DataSetObserver> observers = new ArrayList<>();
@@ -320,4 +317,46 @@ class NavigationDrawerAdapter implements ListAdapter {
             return ITEM_VIEW_TYPE_SEPARATOR;
         }
     }
+
+    class ManageFiltersSection extends MenuSection
+    {
+        public ManageFiltersSection(String text)
+        {
+            super(text);
+        }
+
+        @Override
+        public Fragment getFragment() {
+            return NavigationDrawerManageFiltersFragment.newInstance();
+        }
+
+        @Override
+        public int getPreferredMenuId() {
+            return R.menu.menu_filters;
+        }
+    }
+
+    class ManageFeedsSection extends MenuSection
+    {
+        public ManageFeedsSection(String text)
+        {
+            super(text);
+        }
+
+        @Override
+        public void invokeActionSettings(Context context)
+        {
+
+        }
+
+        @Override
+        public Fragment getFragment() {
+            return NavigationDrawerManageFeedsFragment.newInstance();
+        }
+
+        @Override
+        public int getPreferredMenuId() {
+            return R.menu.menu_feeds;
+        }
+    }
 }
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerFragment.java
index 5289de2..3fc286e 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerFragment.java
@@ -144,7 +144,7 @@ public class NavigationDrawerFragment extends Fragment {
         mDrawerToggle = new ActionBarDrawerToggle(
                 getActivity(),                    /* host Activity */
                 mDrawerLayout,                    /* DrawerLayout object */
-                R.drawable.ic_drawer,             /* nav drawer image to replace 'Up' caret */
+                R.drawable.ic_menu_white_24dp,             /* nav drawer image to replace 'Up' caret */
                 R.string.navigation_drawer_open,  /* "open drawer" description for accessibility */
                 R.string.navigation_drawer_close  /* "close drawer" description for accessibility */
         ) {
-- 
cgit v1.2.3