diff options
author | Yorke Lee <yorkelee@google.com> | 2015-10-13 10:31:14 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2015-10-22 17:48:03 -0700 |
commit | 3cc291b6de8c1ee37939a2b740d5149e9364c5ff (patch) | |
tree | cac6f952803f5fbf37126ec172f304f70f7adbbd /res/layout/onboarding_screen_fragment.xml | |
parent | 0e8eb158e755339bda626145ec7d10b8b21573fd (diff) |
Refresh onboarding flow UI
- Update button styles and positioning
- Update background images
Bug: 24270592
Change-Id: Idaca76d25d8fc1362fb6c004ec053ac5ed618170
Diffstat (limited to 'res/layout/onboarding_screen_fragment.xml')
-rw-r--r-- | res/layout/onboarding_screen_fragment.xml | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/res/layout/onboarding_screen_fragment.xml b/res/layout/onboarding_screen_fragment.xml index f4136aed7..f60225d90 100644 --- a/res/layout/onboarding_screen_fragment.xml +++ b/res/layout/onboarding_screen_fragment.xml @@ -17,7 +17,14 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="20dp" > + android:paddingBottom="20dp" > + + <ImageView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/onboarding_screen_background_image" + android:scaleType="centerCrop" + android:importantForAccessibility="no" /> <TextView android:id="@+id/onboarding_screen_title" @@ -25,42 +32,40 @@ android:layout_height="wrap_content" android:layout_above="@+id/onboarding_screen_content" android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="@color/onboarding_primary_text_color" /> + android:textColor="@color/onboarding_primary_text_color" + android:layout_marginStart="@dimen/onboard_screen_side_padding" + android:layout_marginEnd="@dimen/onboard_screen_side_padding" /> <TextView android:id="@id/onboarding_screen_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_above="@+id/onboarding_buttons_container" + android:layout_above="@+id/onboard_next_button" android:layout_marginTop="20dp" - android:textColor="@color/onboarding_primary_text_color" /> + android:textColor="@color/onboarding_primary_text_color" + android:layout_marginStart="@dimen/onboard_screen_side_padding" + android:layout_marginEnd="@dimen/onboard_screen_side_padding" /> - <LinearLayout - android:id="@id/onboarding_buttons_container" - android:layout_width="match_parent" + <Button + android:id="@+id/onboard_skip_button" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginTop="20dp" > + android:layout_alignTop="@id/onboard_next_button" + android:layout_toStartOf="@id/onboard_next_button" + android:text="@string/onboarding_skip_button" + android:textColor="@color/onboarding_primary_text_color" + style="?android:attr/borderlessButtonStyle" /> - <Button - android:id="@+id/onboard_skip_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:text="@string/onboarding_skip_button" - android:textColor="@color/onboarding_primary_text_color" - style="?android:attr/borderlessButtonStyle" /> - - <Button - android:id="@+id/onboard_next_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:text="@string/onboarding_next_button" - android:textColor="@color/onboarding_primary_text_color" - style="?android:attr/borderlessButtonStyle" /> + <Button + android:id="@id/onboard_next_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="5dp" + android:layout_marginEnd="@dimen/onboard_screen_side_padding" + android:text="@string/onboarding_next_button" + android:textColor="@color/onboarding_primary_text_color" + style="@android:style/Widget.Material.Button" /> - </LinearLayout> </RelativeLayout> |