aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorSize432015-06-04 16:13:39 +0200
committerSize432015-06-04 16:13:39 +0200
commit40f4d4888aa089b36afe0584632093f7e1a257e2 (patch)
tree54a85ee77c55d7cca8cbf92b55644f82b6b4569b /app/src/main/res
parentAdded hamburger menu, working filters and unified inbox. Open old UI by going... (diff)
Adding Feeds/Filters directly from the hamburger menu
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/fragment_feeds.xml (renamed from app/src/main/res/layout/activity_feeds.xml)0
-rw-r--r--app/src/main/res/layout/fragment_filters.xml (renamed from app/src/main/res/layout/activity_filters.xml)0
-rwxr-xr-xapp/src/main/res/layout/fragment_home_screen.xml2
-rwxr-xr-xapp/src/main/res/menu/global.xml8
-rwxr-xr-xapp/src/main/res/menu/home_screen.xml2
5 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/res/layout/activity_feeds.xml b/app/src/main/res/layout/fragment_feeds.xml
index f71eb1e..f71eb1e 100644
--- a/app/src/main/res/layout/activity_feeds.xml
+++ b/app/src/main/res/layout/fragment_feeds.xml
diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/fragment_filters.xml
index c948344..c948344 100644
--- a/app/src/main/res/layout/activity_filters.xml
+++ b/app/src/main/res/layout/fragment_filters.xml
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>