From 0cf0c338f4205e2a4a3cb522362b20025848868e Mon Sep 17 00:00:00 2001 From: Size43 Date: Tue, 9 Jun 2015 15:22:22 +0200 Subject: Single feedsorter for all filters --- app/src/main/res/menu/menu_filter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/src/main/res/menu/menu_filter.xml (limited to 'app/src/main/res/menu') diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml old mode 100644 new mode 100755 index aaf1ca1..86cfe5d --- a/app/src/main/res/menu/menu_filter.xml +++ b/app/src/main/res/menu/menu_filter.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" tools:context="org.rssin.android.HomeScreenActivity"> -- cgit v1.2.3 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 +- .../main/res/drawable-hdpi/ic_add_white_24dp.png | Bin 0 -> 127 bytes .../main/res/drawable-hdpi/ic_menu_white_24dp.png | Bin 0 -> 92 bytes .../main/res/drawable-hdpi/ic_share_white_24dp.png | Bin 0 -> 397 bytes .../main/res/drawable-mdpi/ic_add_white_24dp.png | Bin 0 -> 88 bytes .../main/res/drawable-mdpi/ic_menu_white_24dp.png | Bin 0 -> 83 bytes .../main/res/drawable-mdpi/ic_share_white_24dp.png | Bin 0 -> 268 bytes .../main/res/drawable-xhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes .../main/res/drawable-xhdpi/ic_menu_white_24dp.png | Bin 0 -> 93 bytes .../res/drawable-xhdpi/ic_share_white_24dp.png | Bin 0 -> 496 bytes .../main/res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 0 -> 97 bytes .../res/drawable-xxhdpi/ic_menu_white_24dp.png | Bin 0 -> 95 bytes .../res/drawable-xxhdpi/ic_share_white_24dp.png | Bin 0 -> 698 bytes .../res/drawable-xxxhdpi/ic_add_white_24dp.png | Bin 0 -> 102 bytes .../res/drawable-xxxhdpi/ic_menu_white_24dp.png | Bin 0 -> 99 bytes .../res/drawable-xxxhdpi/ic_share_white_24dp.png | Bin 0 -> 938 bytes .../main/res/layout/fragment_navigation_drawer.xml | 7 +-- app/src/main/res/layout/item_navigation_drawer.xml | 3 +- .../res/layout/separator_navigation_drawer.xml | 3 +- app/src/main/res/menu/menu_article.xml | 7 +++ app/src/main/res/menu/menu_feeds.xml | 1 + app/src/main/res/menu/menu_filters.xml | 1 + 23 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_share_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_share_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png (limited to 'app/src/main/res/menu') 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 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 */ ) { diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png new file mode 100644 index 0000000..694179b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000..238cfd6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png new file mode 100644 index 0000000..b09a692 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_share_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png new file mode 100644 index 0000000..3856041 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000..d3cec05 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png new file mode 100644 index 0000000..e944fd7 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_share_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000..67bb598 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000..193185f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000..22a8783 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_share_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000..0fdced8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000..9cb0348 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000..a35b3cd Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png new file mode 100644 index 0000000..d64c22e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000..623d147 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000..e351c7b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png differ diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml index 6b9ec1d..caa58c8 100755 --- a/app/src/main/res/layout/fragment_navigation_drawer.xml +++ b/app/src/main/res/layout/fragment_navigation_drawer.xml @@ -1,7 +1,8 @@ \ No newline at end of file + android:background="#121212" + tools:context="org.rssin.android.NavigationDrawerFragment" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml index 32a8837..6555bb3 100755 --- a/app/src/main/res/layout/item_navigation_drawer.xml +++ b/app/src/main/res/layout/item_navigation_drawer.xml @@ -8,7 +8,7 @@ android:orientation="vertical" android:layout_marginTop="0dp" - android:background="?android:attr/activatedBackgroundIndicator" + android:background="#121212" > diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml index 856093c..81a9d0a 100755 --- a/app/src/main/res/layout/separator_navigation_drawer.xml +++ b/app/src/main/res/layout/separator_navigation_drawer.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:orientation="vertical" android:layout_marginTop="0dp" -android:background="?android:attr/activatedBackgroundIndicator" +android:background="#252525" > diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml index c0f4281..064831b 100755 --- a/app/src/main/res/menu/menu_article.xml +++ b/app/src/main/res/menu/menu_article.xml @@ -16,4 +16,11 @@ android:orderInCategory="100" android:icon="@drawable/ic_action_action_thumb_down" app:showAsAction="ifRoom" /> + + diff --git a/app/src/main/res/menu/menu_feeds.xml b/app/src/main/res/menu/menu_feeds.xml index 20a4fea..b3c3044 100644 --- a/app/src/main/res/menu/menu_feeds.xml +++ b/app/src/main/res/menu/menu_feeds.xml @@ -7,6 +7,7 @@ diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml index 5973bd0..b91df52 100644 --- a/app/src/main/res/menu/menu_filters.xml +++ b/app/src/main/res/menu/menu_filters.xml @@ -8,6 +8,7 @@ -- cgit v1.2.3