From 88041c0a7fd2c69094f1bb0ab1d15518cd1fd75d Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 15 Apr 2015 12:59:32 +0200
Subject: Working tabs & meditations

---
 app/src/main/res/layout/activity_main.xml          | 15 +++---
 app/src/main/res/layout/fragment_main.xml          |  8 ++++
 app/src/main/res/layout/pager_content.xml          | 55 ----------------------
 .../res/layout/pager_content_dailymeditation.xml   | 38 +++++++++++++++
 .../main/res/layout/pager_content_dailyreading.xml | 55 ++++++++++++++++++++++
 5 files changed, 108 insertions(+), 63 deletions(-)
 create mode 100644 app/src/main/res/layout/fragment_main.xml
 delete mode 100644 app/src/main/res/layout/pager_content.xml
 create mode 100644 app/src/main/res/layout/pager_content_dailymeditation.xml
 create mode 100644 app/src/main/res/layout/pager_content_dailyreading.xml

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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bb0f448..8052335 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,13 +1,12 @@
-<android.support.v4.widget.SwipeRefreshLayout
+<!--<android.support.v4.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/swiperefresh"
     android:layout_height="match_parent"
-    android:layout_width="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"/>
-
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="0dp"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
new file mode 100644
index 0000000..f698907
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="0dp"
+    android:visibility="gone"/>
\ 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
deleted file mode 100644
index 9a3a6cc..0000000
--- a/app/src/main/res/layout/pager_content.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="10dp"
-    android:paddingBottom="10dp"
-    android:paddingTop="10dp"
-    android:paddingRight="0dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:layout_weight="1.0"
-        android:paddingRight="10dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Date"
-            android:id="@+id/dateDailyReading"
-            android:layout_gravity="center"
-            android:layout_marginBottom="6dp"
-            android:textStyle="bold"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Daily Reading"
-            android:id="@+id/textDailyReading"
-            android:layout_gravity="left|top"
-            android:layout_marginBottom="10dp"
-            android:textIsSelectable="true"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Bible Text"
-            android:id="@+id/refDailyReadingBibleText"
-            android:layout_gravity="center"
-            android:layout_marginBottom="6dp"
-            android:textStyle="bold"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Daily Reading Bible text"
-            android:id="@+id/textDailyReadingBibleText"
-            android:layout_gravity="left|top"
-            android:textIsSelectable="true"/>
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_content_dailymeditation.xml b/app/src/main/res/layout/pager_content_dailymeditation.xml
new file mode 100644
index 0000000..2d096f0
--- /dev/null
+++ b/app/src/main/res/layout/pager_content_dailymeditation.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="10dp"
+    android:paddingBottom="10dp"
+    android:paddingTop="10dp"
+    android:paddingRight="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1.0"
+        android:paddingRight="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date"
+            android:id="@+id/dateDailyMeditation"
+            android:layout_gravity="center"
+            android:layout_marginBottom="6dp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Daily Meditation"
+            android:id="@+id/textDailyMeditation"
+            android:layout_gravity="left|top"
+            android:layout_marginBottom="10dp"
+            android:textIsSelectable="true"/>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_content_dailyreading.xml b/app/src/main/res/layout/pager_content_dailyreading.xml
new file mode 100644
index 0000000..2297baa
--- /dev/null
+++ b/app/src/main/res/layout/pager_content_dailyreading.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="10dp"
+    android:paddingBottom="10dp"
+    android:paddingTop="10dp"
+    android:paddingRight="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_weight="1.0"
+        android:paddingRight="10dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Date"
+            android:id="@+id/dateDailyReading"
+            android:layout_gravity="center"
+            android:layout_marginBottom="6dp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Daily Reading"
+            android:id="@+id/textDailyReading"
+            android:layout_gravity="left|top"
+            android:layout_marginBottom="10dp"
+            android:textIsSelectable="true"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Bible Text"
+            android:id="@+id/refDailyReadingBibleText"
+            android:layout_gravity="center"
+            android:layout_marginBottom="6dp"
+            android:textStyle="bold"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Daily Reading Bible text"
+            android:id="@+id/textDailyReadingBibleText"
+            android:layout_gravity="left|top"
+            android:textIsSelectable="true"/>
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3