From 55002a8d23d517c8fbba75ea57a1d2d4de58a925 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 12 Apr 2015 12:16:01 +0200
Subject: Added share options; removed scroll-to-today because it was still
 buggy

---
 .../main/res/drawable-hdpi/ic_action_social_share.png    | Bin 0 -> 676 bytes
 .../main/res/drawable-mdpi/ic_action_social_share.png    | Bin 0 -> 402 bytes
 .../main/res/drawable-xhdpi/ic_action_social_share.png   | Bin 0 -> 904 bytes
 .../main/res/drawable-xxhdpi/ic_action_social_share.png  | Bin 0 -> 1308 bytes
 app/src/main/res/layout/activity_main.xml                |   1 +
 app/src/main/res/menu/global.xml                         |   6 +-----
 app/src/main/res/menu/share_popup.xml                    |  12 ++++++++++++
 app/src/main/res/values/strings.xml                      |   2 ++
 8 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_social_share.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_social_share.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_social_share.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_social_share.png
 create mode 100644 app/src/main/res/menu/share_popup.xml

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

diff --git a/app/src/main/res/drawable-hdpi/ic_action_social_share.png b/app/src/main/res/drawable-hdpi/ic_action_social_share.png
new file mode 100644
index 0000000..8feefd9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_social_share.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_social_share.png b/app/src/main/res/drawable-mdpi/ic_action_social_share.png
new file mode 100644
index 0000000..840adad
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_social_share.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_social_share.png b/app/src/main/res/drawable-xhdpi/ic_action_social_share.png
new file mode 100644
index 0000000..98387ec
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_social_share.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png
new file mode 100644
index 0000000..37e8534
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d11f106..bb0f448 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,4 +9,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="0dp"/>
+
 </android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index a2c2ee2..0b80db5 100644
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -8,11 +8,7 @@
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"
+        android:icon="@drawable/ic_action_social_share"
         android:orderInCategory="50"
         app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_today"
-        android:title="@string/action_today"
-        android:orderInCategory="30"
-        app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/menu/share_popup.xml b/app/src/main/res/menu/share_popup.xml
new file mode 100644
index 0000000..6751a65
--- /dev/null
+++ b/app/src/main/res/menu/share_popup.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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d7d9c9..856aa2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,8 @@
 
     <string name="action_settings">Settings</string>
     <string name="action_share">Share</string>
+    <string name="action_share_reading">Share reading</string>
+    <string name="action_share_bibletext">Share bible text</string>
     <string name="action_today">Today</string>
 
     <string name="title_activity_settings" translatable="false">@string/action_settings</string>
-- 
cgit v1.2.3