aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rwxr-xr-xapp/src/main/res/drawable-hdpi/ic_action_action_delete.pngbin0 -> 239 bytes
-rwxr-xr-xapp/src/main/res/drawable-hdpi/ic_action_action_settings.pngbin0 -> 654 bytes
-rwxr-xr-xapp/src/main/res/drawable-hdpi/ic_action_editor_border_color.pngbin0 -> 410 bytes
-rwxr-xr-xapp/src/main/res/drawable-mdpi/ic_action_action_delete.pngbin0 -> 190 bytes
-rwxr-xr-xapp/src/main/res/drawable-mdpi/ic_action_action_settings.pngbin0 -> 399 bytes
-rwxr-xr-xapp/src/main/res/drawable-mdpi/ic_action_editor_border_color.pngbin0 -> 262 bytes
-rwxr-xr-xapp/src/main/res/drawable-xhdpi/ic_action_action_delete.pngbin0 -> 306 bytes
-rwxr-xr-xapp/src/main/res/drawable-xhdpi/ic_action_action_settings.pngbin0 -> 903 bytes
-rwxr-xr-xapp/src/main/res/drawable-xhdpi/ic_action_editor_border_color.pngbin0 -> 489 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxhdpi/ic_action_action_delete.pngbin0 -> 444 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxhdpi/ic_action_action_settings.pngbin0 -> 1289 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.pngbin0 -> 678 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxxhdpi/ic_action_action_delete.pngbin0 -> 659 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxxhdpi/ic_action_action_settings.pngbin0 -> 2029 bytes
-rwxr-xr-xapp/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.pngbin0 -> 940 bytes
-rwxr-xr-xapp/src/main/res/menu/global.xml2
-rwxr-xr-xapp/src/main/res/menu/home_screen.xml2
-rwxr-xr-xapp/src/main/res/menu/menu_article.xml2
-rwxr-xr-xapp/src/main/res/menu/menu_filter.xml2
-rwxr-xr-x[-rw-r--r--]app/src/main/res/menu/menu_filter_settings.xml6
-rw-r--r--app/src/main/res/menu/menu_unified_inbox.xml11
-rwxr-xr-xapp/src/main/res/values/strings.xml1
22 files changed, 9 insertions, 17 deletions
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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png
Binary files 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
index 655ee84..a914ad8 100644..100755
--- 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>