From e662c1d5ce054d4393f9ec08b29c6f3dee9d642c Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 15 Apr 2015 22:37:07 +0200
Subject: Finishing first raw version

---
 app/src/main/res/drawable-hdpi/ic_action_settings.png   | Bin 0 -> 721 bytes
 app/src/main/res/drawable-mdpi/ic_action_settings.png   | Bin 0 -> 479 bytes
 app/src/main/res/drawable-xhdpi/ic_action_settings.png  | Bin 0 -> 1056 bytes
 app/src/main/res/drawable-xxhdpi/ic_action_settings.png | Bin 0 -> 1505 bytes
 app/src/main/res/menu/global.xml                        |   8 ++++++--
 app/src/main/res/menu/share_popup.xml                   |  12 ------------
 app/src/main/res/menu/share_popup_reading.xml           |  12 ++++++++++++
 7 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_settings.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_settings.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_settings.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_settings.png
 delete mode 100644 app/src/main/res/menu/share_popup.xml
 create mode 100644 app/src/main/res/menu/share_popup_reading.xml

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

diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000..6ead218
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000..c5efcc9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000..c7e4ed5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 0000000..85c179f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index 0b80db5..e41ee8d 100644
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -1,10 +1,14 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
+<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:icon="@drawable/ic_action_settings"
         android:orderInCategory="100"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
diff --git a/app/src/main/res/menu/share_popup.xml b/app/src/main/res/menu/share_popup.xml
deleted file mode 100644
index 6751a65..0000000
--- a/app/src/main/res/menu/share_popup.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_share_reading"
-        android:title="@string/action_share_reading"/>
-    <item
-        android:id="@+id/action_share_bibletext"
-        android:title="@string/action_share_bibletext"/>
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/share_popup_reading.xml b/app/src/main/res/menu/share_popup_reading.xml
new file mode 100644
index 0000000..6751a65
--- /dev/null
+++ b/app/src/main/res/menu/share_popup_reading.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_share_reading"
+        android:title="@string/action_share_reading"/>
+    <item
+        android:id="@+id/action_share_bibletext"
+        android:title="@string/action_share_bibletext"/>
+
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3