From dbc2ea6cc842ade3fd48cc8457916e39443de77e Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sat, 11 Apr 2015 23:30:39 +0200
Subject: General continuation of development

---
 app/src/main/res/layout/activity_main.xml     | 11 ++++++++---
 app/src/main/res/layout/pager_content.xml     |  3 ++-
 app/src/main/res/menu/global.xml              |  5 +++++
 app/src/main/res/values-nl/strings.xml        |  3 ++-
 app/src/main/res/values/preference_values.xml |  8 ++++----
 app/src/main/res/values/strings.xml           |  5 +++--
 6 files changed, 24 insertions(+), 11 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7d924ef..d11f106 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,12 @@
-<android.support.v4.view.ViewPager
+<android.support.v4.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/swiperefresh"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <android.support.v4.view.ViewPager
     android:id="@+id/pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="0dp"/>
\ No newline at end of file
+    android:layout_margin="0dp"/>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_content.xml b/app/src/main/res/layout/pager_content.xml
index 0f53c69..9a3a6cc 100644
--- a/app/src/main/res/layout/pager_content.xml
+++ b/app/src/main/res/layout/pager_content.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index cd094ff..a2c2ee2 100644
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -10,4 +10,9 @@
         android:title="@string/action_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/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2de50b8..cb56a78 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Taizé</string>
 
     <string name="action_settings">Instellingen</string>
+    <string name="action_share">Delen</string>
+    <string name="action_today">Vandaag</string>
 </resources>
diff --git a/app/src/main/res/values/preference_values.xml b/app/src/main/res/values/preference_values.xml
index 71138ba..fbf01fd 100644
--- a/app/src/main/res/values/preference_values.xml
+++ b/app/src/main/res/values/preference_values.xml
@@ -2,8 +2,8 @@
 <resources>
     <!-- Strings related to Settings -->
     <string name="pref_title_language_dailyreading">Language of the readings</string>
-    <string name="pref_language_dailyreading_default">en</string>
-    <string name="pref_language_dailyreading_default_entry">English</string>
+    <string name="pref_language_dailyreading_default" translatable="false">en</string>
+    <string name="pref_language_dailyreading_default_entry" translatable="false">English</string>
     <string-array name="pref_languages_dailyreading_entries">
         <item>čeština</item>
         <item>dansk</item>
@@ -58,8 +58,8 @@
     </string-array>
 
     <string name="pref_title_version_bible">Bible</string>
-    <string name="pref_version_bible_default">kjv</string>
-    <string name="pref_version_bible_default_entry">King James Version</string>
+    <string name="pref_version_bible_default" translatable="false">kjv</string>
+    <string name="pref_version_bible_default_entry" translatable="false">King James Version</string>
     <string-array name="pref_bibles_entries">
         <item>Afrikaans: Ou Vertaling</item>
         <item>Albanian: Albanian</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9e415e0..8d7d9c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,9 @@
 <resources>
-    <string name="app_name">Taizé</string>
+    <string name="app_name" translatable="false">Taizé</string>
 
     <string name="action_settings">Settings</string>
     <string name="action_share">Share</string>
+    <string name="action_today">Today</string>
 
-    <string name="title_activity_settings">@string/action_settings</string>
+    <string name="title_activity_settings" translatable="false">@string/action_settings</string>
 </resources>
-- 
cgit v1.2.3