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/java/org/rssin/android/FeedsActivity.java   |   2 +-
 .../java/org/rssin/android/FilterSettingsActivity.java   |   1 +
 .../java/org/rssin/android/NavigationDrawerAdapter.java  |   5 +++--
 .../main/res/drawable-hdpi/ic_action_action_delete.png   | Bin 0 -> 239 bytes
 .../main/res/drawable-hdpi/ic_action_action_settings.png | Bin 0 -> 654 bytes
 .../res/drawable-hdpi/ic_action_editor_border_color.png  | Bin 0 -> 410 bytes
 .../main/res/drawable-mdpi/ic_action_action_delete.png   | Bin 0 -> 190 bytes
 .../main/res/drawable-mdpi/ic_action_action_settings.png | Bin 0 -> 399 bytes
 .../res/drawable-mdpi/ic_action_editor_border_color.png  | Bin 0 -> 262 bytes
 .../main/res/drawable-xhdpi/ic_action_action_delete.png  | Bin 0 -> 306 bytes
 .../res/drawable-xhdpi/ic_action_action_settings.png     | Bin 0 -> 903 bytes
 .../res/drawable-xhdpi/ic_action_editor_border_color.png | Bin 0 -> 489 bytes
 .../main/res/drawable-xxhdpi/ic_action_action_delete.png | Bin 0 -> 444 bytes
 .../res/drawable-xxhdpi/ic_action_action_settings.png    | Bin 0 -> 1289 bytes
 .../drawable-xxhdpi/ic_action_editor_border_color.png    | Bin 0 -> 678 bytes
 .../res/drawable-xxxhdpi/ic_action_action_delete.png     | Bin 0 -> 659 bytes
 .../res/drawable-xxxhdpi/ic_action_action_settings.png   | Bin 0 -> 2029 bytes
 .../drawable-xxxhdpi/ic_action_editor_border_color.png   | Bin 0 -> 940 bytes
 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 -----------
 app/src/main/res/values/strings.xml                      |   1 +
 25 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100755 app/src/main/res/drawable-hdpi/ic_action_action_delete.png
 create mode 100755 app/src/main/res/drawable-hdpi/ic_action_action_settings.png
 create mode 100755 app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_action_action_delete.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_action_action_settings.png
 create mode 100755 app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_action_delete.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
 create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
 create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
 create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png
 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')

diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java
index 32f256a..87edab0 100755
--- a/app/src/main/java/org/rssin/android/FeedsActivity.java
+++ b/app/src/main/java/org/rssin/android/FeedsActivity.java
@@ -45,7 +45,7 @@ public class FeedsActivity extends ActionBarActivity {
 
         Intent intent = getIntent();
         String ac = intent.getAction();
-        if (ac.equals(Intent.ACTION_VIEW)) {
+        if (ac != null && ac.equals(Intent.ACTION_VIEW)) {
             //open with
             startUri = intent.getData().toString();
             openAddDialog();
diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
index 3041859..a38c7bc 100755
--- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
+++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java
@@ -187,6 +187,7 @@ public class FilterSettingsActivity extends ActionBarActivity {
 
         final EditText input = new EditText(this);
         input.setText(filter.getTitle());
+        input.setSingleLine(true);
         input.setFocusable(true);
         input.requestFocus();
 
diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
index 2a24342..8f0a068 100755
--- a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java
@@ -57,12 +57,13 @@ class NavigationDrawerAdapter implements ListAdapter {
 
     @Override
     public boolean areAllItemsEnabled() {
-        return true;
+        return false;
     }
 
     @Override
     public boolean isEnabled(int position) {
-        return true;
+        // Position 0 is always "Start"
+        return position != 0;
     }
 
     private List<DataSetObserver> observers = new ArrayList<>();
diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..9449c35
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..116e9a0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..b044320
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..eb03dce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..1a8017b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..6216372
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..a0b397e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..b764d9c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..a754a2d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..c1fbf46
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..a68f6f9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..ef5e602
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png
new file mode 100755
index 0000000..d152354
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
new file mode 100755
index 0000000..f18ff96
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png
new file mode 100755
index 0000000..a57ae9b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png differ
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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 591a878..df130b3 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,4 +74,5 @@
     <string name="feeds_activity_url">URL:</string>
     <string name="filter_settings_title">Title</string>
     <string name="filter_settings_new_title">New title:</string>
+    <string name="menu_article_share">Share</string>
 </resources>
-- 
cgit v1.2.3