diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 118 | ||||
| -rw-r--r-- | app/src/main/res/layout/pager.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/pager_content.xml | 54 |
3 files changed, 106 insertions, 76 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c4e3253..193db2d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,78 +1,44 @@ -<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawer_layout" - android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> - - <!-- As the main content view, the view below consumes the entire - space available using match_parent in both dimensions. --> - <FrameLayout android:id="@+id/container" android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ScrollView - android:layout_width="fill_parent" +<!-- As the main content view, the view below consumes the entire + space available using match_parent in both dimensions. --> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".MainActivity" + android:orientation="vertical" + android:padding="0dp"> + + <LinearLayout + android:id="@+id/tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_alignParentBottom="true"> + + <Button + android:layout_width="0dip" android:layout_height="wrap_content" - 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"/> + android:layout_weight=".5" + android:text="Button 1"/> - <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> - </FrameLayout> - - <!-- android:layout_gravity="start" tells DrawerLayout to treat - this as a sliding drawer on the left side for left-to-right - languages and on the right side for right-to-left languages. - If you're not building against API 17 or higher, use - android:layout_gravity="left" instead. --> - <!-- The drawer is given a fixed width in dp and extends the full height of - the container. --> - <fragment android:id="@+id/navigation_drawer" - android:layout_width="@dimen/navigation_drawer_width" android:layout_height="match_parent" - android:layout_gravity="start" android:name="com.camilstaps.taize.NavigationDrawerFragment" - tools:layout="@layout/fragment_navigation_drawer" /> - -</android.support.v4.widget.DrawerLayout> + <Button + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight=".5" + android:text="Button 2"/> + + </LinearLayout> + + <android.support.v4.view.ViewPager + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@id/tabs" + android:layout_margin="0dp"> + + </android.support.v4.view.ViewPager> +</RelativeLayout> diff --git a/app/src/main/res/layout/pager.xml b/app/src/main/res/layout/pager.xml new file mode 100644 index 0000000..35b8e01 --- /dev/null +++ b/app/src/main/res/layout/pager.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.view.ViewPager + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".CollectionDemoActivity"> + +</android.support.v4.view.ViewPager>
\ 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 new file mode 100644 index 0000000..0f53c69 --- /dev/null +++ b/app/src/main/res/layout/pager_content.xml @@ -0,0 +1,54 @@ +<?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 |