diff options
Diffstat (limited to 'src/main/res/layout/welcome.xml')
-rw-r--r-- | src/main/res/layout/welcome.xml | 168 |
1 files changed, 88 insertions, 80 deletions
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml index e81e1f95d..bbe98e90b 100644 --- a/src/main/res/layout/welcome.xml +++ b/src/main/res/layout/welcome.xml @@ -1,99 +1,107 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:fillViewport="true"> + android:orientation="vertical"> - <RelativeLayout + <include layout="@layout/toolbar" /> + + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey50"> + android:fillViewport="true"> - <LinearLayout - android:id="@+id/linearLayout" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:minHeight="256dp" - android:orientation="vertical" - android:paddingBottom="8dp" - android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:layout_height="match_parent" + android:background="@color/grey50"> - <Space + <LinearLayout + android:id="@+id/linearLayout" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" /> - - <TextView - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/welcome_header" - android:textAppearance="@style/TextAppearance.AppCompat.Title" /> + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:minHeight="256dp" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/welcome_text" - android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> - <TextView - android:id="@id/import_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/import_text" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/welcome_header" + android:textAppearance="@style/TextAppearance.AppCompat.Title" /> - <Button - android:id="@+id/import_database" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="@string/import_database" - android:textColor="@color/accent" - android:visibility="gone" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/welcome_text" + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> - <Button - android:id="@+id/create_account" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="@string/create_account" - android:textColor="@color/accent" /> + <TextView + android:id="@id/import_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/import_text" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:visibility="gone" /> - <Button - android:id="@+id/use_existing_account" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:text="@string/use_existing_accout" - android:textColor="@color/black54" /> - </LinearLayout> + <Button + android:id="@+id/import_database" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/import_database" + android:textColor="@color/accent" + android:visibility="gone" /> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/linearLayout" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true"> + <Button + android:id="@+id/create_account" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/create_account" + android:textColor="@color/accent" /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:padding="8dp" - android:src="@drawable/main_logo" /> + <Button + android:id="@+id/use_existing_account" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/use_existing_accout" + android:textColor="@color/black54" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/linearLayout" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:padding="8dp" + android:src="@drawable/main_logo" /> + </RelativeLayout> </RelativeLayout> - </RelativeLayout> -</ScrollView>
\ No newline at end of file + </ScrollView> +</LinearLayout>
\ No newline at end of file |