diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_main.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/pager_content_dailymeditation.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/pager_content_dailyreading.xml (renamed from app/src/main/res/layout/pager_content.xml) | 2 |
4 files changed, 54 insertions, 9 deletions
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_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.xml b/app/src/main/res/layout/pager_content_dailyreading.xml index 9a3a6cc..2297baa 100644 --- a/app/src/main/res/layout/pager_content.xml +++ b/app/src/main/res/layout/pager_content_dailyreading.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content" + android:id="@+id/pager_content" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingLeft="10dp" |