From 40f4d4888aa089b36afe0584632093f7e1a257e2 Mon Sep 17 00:00:00 2001
From: Size43
Date: Thu, 4 Jun 2015 16:13:39 +0200
Subject: Adding Feeds/Filters directly from the hamburger menu

---
 app/src/main/res/layout/activity_feeds.xml       | 13 -------------
 app/src/main/res/layout/activity_filters.xml     | 17 -----------------
 app/src/main/res/layout/fragment_feeds.xml       | 13 +++++++++++++
 app/src/main/res/layout/fragment_filters.xml     | 17 +++++++++++++++++
 app/src/main/res/layout/fragment_home_screen.xml |  2 +-
 app/src/main/res/menu/global.xml                 |  8 ++++----
 app/src/main/res/menu/home_screen.xml            |  2 +-
 7 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_feeds.xml
 delete mode 100644 app/src/main/res/layout/activity_filters.xml
 create mode 100644 app/src/main/res/layout/fragment_feeds.xml
 create mode 100644 app/src/main/res/layout/fragment_filters.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/activity_feeds.xml b/app/src/main/res/layout/activity_feeds.xml
deleted file mode 100644
index f71eb1e..0000000
--- a/app/src/main/res/layout/activity_feeds.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="org.rssin.android.FeedsActivity">
-
-    <ListView
-        android:id="@+id/feeds_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml
deleted file mode 100644
index c948344..0000000
--- a/app/src/main/res/layout/activity_filters.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="0dp"
-    android:paddingRight="0dp"
-    android:paddingTop="0dp"
-    android:paddingBottom="0dp"
-    tools:context="org.rssin.android.FiltersActivity">
-
-    <ListView
-        android:id="@+id/filters_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_feeds.xml b/app/src/main/res/layout/fragment_feeds.xml
new file mode 100644
index 0000000..f71eb1e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_feeds.xml
@@ -0,0 +1,13 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.rssin.android.FeedsActivity">
+
+    <ListView
+        android:id="@+id/feeds_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_filters.xml b/app/src/main/res/layout/fragment_filters.xml
new file mode 100644
index 0000000..c948344
--- /dev/null
+++ b/app/src/main/res/layout/fragment_filters.xml
@@ -0,0 +1,17 @@
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:paddingTop="0dp"
+    android:paddingBottom="0dp"
+    tools:context="org.rssin.android.FiltersActivity">
+
+    <ListView
+        android:id="@+id/filters_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_home_screen.xml b/app/src/main/res/layout/fragment_home_screen.xml
index e33a34e..b8c5e17 100755
--- a/app/src/main/res/layout/fragment_home_screen.xml
+++ b/app/src/main/res/layout/fragment_home_screen.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="0dp"
-    tools:context="org.rssin.android.HomeScreenActivity.AllFeedsaFragment">
+    tools:context="org.rssin.android.HomeScreenActivity.AllFeedsFragment">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/unified_inbox_feeditems"
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index fc41e98..86959a3 100755
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -1,5 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
+xmlns:app="http://schemas.android.com/apk/res-auto">
+<item android:id="@+id/action_settings" android:title="@string/action_settings"
+    android:orderInCategory="100" app:showAsAction="never" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml
index 3358601..a894d92 100755
--- a/app/src/main/res/menu/home_screen.xml
+++ b/app/src/main/res/menu/home_screen.xml
@@ -3,5 +3,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="org.rssin.android.HomeScreenActivity">
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
+        android:orderInCategory="100" app:showAsAction="ifRoom" />
 </menu>
-- 
cgit v1.2.3