From 3617197cf2b010ce59691e4a263ce5f7e2c18b25 Mon Sep 17 00:00:00 2001
From: Size43
Date: Wed, 10 Jun 2015 12:19:22 +0200
Subject: Added icons, changed filter title edittext to singleline, fixed feed
 settings crash

---
 app/src/main/res/menu/global.xml               |  2 +-
 app/src/main/res/menu/home_screen.xml          |  2 +-
 app/src/main/res/menu/menu_article.xml         |  2 +-
 app/src/main/res/menu/menu_filter.xml          |  2 +-
 app/src/main/res/menu/menu_filter_settings.xml |  6 ++++--
 app/src/main/res/menu/menu_unified_inbox.xml   | 11 -----------
 6 files changed, 8 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 app/src/main/res/menu/menu_filter_settings.xml
 delete mode 100644 app/src/main/res/menu/menu_unified_inbox.xml

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

diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index 86959a3..c4ae1a3 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" />
+    android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
 </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 a894d92..bf901df 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="ifRoom" />
+        android:orderInCategory="100"  app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" />
 </menu>
diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml
index 064831b..80ef7a7 100755
--- a/app/src/main/res/menu/menu_article.xml
+++ b/app/src/main/res/menu/menu_article.xml
@@ -19,7 +19,7 @@
 
     <item
         android:id="@+id/article_action_share"
-        android:title="Share"
+        android:title="@string/menu_article_share"
         android:orderInCategory="100"
         android:icon="@drawable/ic_share_white_24dp"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml
index 86cfe5d..5822314 100755
--- a/app/src/main/res/menu/menu_filter.xml
+++ b/app/src/main/res/menu/menu_filter.xml
@@ -2,5 +2,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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" android:icon="@drawable/ic_action_action_settings" />
 </menu>
diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml
old mode 100644
new mode 100755
index 655ee84..a914ad8
--- a/app/src/main/res/menu/menu_filter_settings.xml
+++ b/app/src/main/res/menu/menu_filter_settings.xml
@@ -8,11 +8,13 @@
     <item
         android:id="@+id/filter_settings_action_title"
         android:title="@string/filter_settings_action_title"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_editor_border_color"/>
 
     <item
         android:id="@+id/filter_settings_action_delete"
         android:title="@string/filter_settings_action_delete"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_action_action_delete"/>
 
 </menu>
diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml
deleted file mode 100644
index 021ceb5..0000000
--- a/app/src/main/res/menu/menu_unified_inbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools" tools:context=".UnifiedInboxActivity">
-
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-    <item android:id="@+id/action_filters" android:title="@string/action_filters"
-        android:orderInCategory="100" app:showAsAction="never" />
-    <item android:id="@+id/action_feeds" android:title="@string/action_feeds"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
-- 
cgit v1.2.3