jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376324 )
Change subject: Onboarding: improve layout in landscape mode ...................................................................... Onboarding: improve layout in landscape mode This centers the description text in landscape mode and tries to avoid the image from overlapping the bottom control. Bug: T174561 Change-Id: If4024285f180d2c07c8b0be91676653beade1410 --- M app/src/main/res/layout-land/view_onboarding_page.xml 1 file changed, 98 insertions(+), 90 deletions(-) Approvals: jenkins-bot: Verified Mholloway: Looks good to me, approved diff --git a/app/src/main/res/layout-land/view_onboarding_page.xml b/app/src/main/res/layout-land/view_onboarding_page.xml index b5f4011..b7abdf1 100644 --- a/app/src/main/res/layout-land/view_onboarding_page.xml +++ b/app/src/main/res/layout-land/view_onboarding_page.xml @@ -1,118 +1,126 @@ <?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android"; +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:app="http://schemas.android.com/apk/res-auto"; xmlns:tools="http://schemas.android.com/tools"; - tools:parentTag="LinearLayout" - tools:orientation="horizontal" tools:background="@drawable/onboarding_gradient_background_135" - tools:layout_width="match_parent" - tools:layout_height="match_parent"> + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <FrameLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:orientation="horizontal" + android:baselineAligned="false"> - <ImageView - android:id="@+id/view_onboarding_page_image_centered" - android:layout_width="160dp" - android:layout_height="160dp" - android:scaleType="fitCenter" - android:layout_gravity="center" - android:contentDescription="@null" - tools:src="@drawable/illustration_onboarding_explore"/> + <FrameLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"> - </FrameLayout> + <ImageView + android:id="@+id/view_onboarding_page_image_centered" + android:layout_width="160dp" + android:layout_height="160dp" + android:scaleType="fitCenter" + android:layout_gravity="center" + android:contentDescription="@null" + tools:src="@drawable/illustration_onboarding_explore"/> - <ScrollView - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1"> + </FrameLayout> <LinearLayout - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" - android:gravity="center_horizontal"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="vertical" - android:gravity="center_horizontal" - android:paddingTop="24dp" - android:paddingLeft="16dp" - android:paddingRight="16dp"> - - <org.wikipedia.views.AppTextView - android:id="@+id/view_onboarding_page_primary_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="6dp" - android:textColor="@android:color/white" - android:textSize="24sp" - android:fontFamily="sans-serif-medium" - tools:text="Lorem ipsum" /> - - <org.wikipedia.views.AppTextView - android:id="@+id/view_onboarding_page_secondary_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="12dp" - android:gravity="center" - android:lineSpacingMultiplier="1.22" - android:textAlignment="center" - android:textColor="@android:color/white" - android:textColorLink="@android:color/white" - android:textSize="16sp" - tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." /> + android:layout_weight="1" + android:layout_gravity="center"> <LinearLayout - android:id="@+id/view_onboarding_page_switch_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:orientation="vertical"> - <View - android:layout_width="wrap_content" - android:layout_height="0.5dp" - android:background="@color/white_translucent_40"/> + android:orientation="vertical" + android:gravity="center_horizontal" + android:paddingTop="24dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> - <android.support.v7.widget.SwitchCompat - android:id="@+id/view_onboarding_page_switch" + <org.wikipedia.views.AppTextView + android:id="@+id/view_onboarding_page_primary_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="6dp" + android:textColor="@android:color/white" + android:textSize="24sp" + android:fontFamily="sans-serif-medium" + tools:text="Lorem ipsum" /> + + <org.wikipedia.views.AppTextView + android:id="@+id/view_onboarding_page_secondary_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="12dp" + android:gravity="center" + android:lineSpacingMultiplier="1.22" + android:textAlignment="center" + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" + android:textSize="16sp" + tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit." /> + + <LinearLayout + android:id="@+id/view_onboarding_page_switch_container" android:layout_width="match_parent" android:layout_height="wrap_content" - app:theme="@style/OnboardingSwitch" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:textColor="@android:color/white" - tools:text="Lorem ipsum"/> + android:orientation="vertical"> + <View + android:layout_width="wrap_content" + android:layout_height="0.5dp" + android:background="@color/white_translucent_40"/> - <View - android:layout_width="wrap_content" - android:layout_height="0.5dp" - android:background="@color/white_translucent_40"/> + <android.support.v7.widget.SwitchCompat + android:id="@+id/view_onboarding_page_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:theme="@style/OnboardingSwitch" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:textColor="@android:color/white" + tools:text="Lorem ipsum"/> + + <View + android:layout_width="wrap_content" + android:layout_height="0.5dp" + android:background="@color/white_translucent_40"/> + + </LinearLayout> + </LinearLayout> - </LinearLayout> - - <org.wikipedia.views.GoneIfEmptyTextView - android:id="@+id/view_onboarding_page_tertiary_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/description_edit_tutorial_promise" - android:gravity="center" - android:textAlignment="center" - android:textSize="12sp" - android:textColor="@android:color/white" /> + <org.wikipedia.views.GoneIfEmptyTextView + android:id="@+id/view_onboarding_page_tertiary_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_gravity="center_horizontal" + android:text="@string/description_edit_tutorial_promise" + android:textAlignment="center" + android:textSize="12sp" + android:textColor="@android:color/white" /> </LinearLayout> - </ScrollView> + </LinearLayout> -</merge> \ No newline at end of file + + <!-- Bottom control offset --> + <View + android:layout_width="match_parent" + android:layout_height="48dp"/> + +</LinearLayout> -- To view, visit https://gerrit.wikimedia.org/r/376324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If4024285f180d2c07c8b0be91676653beade1410 Gerrit-PatchSet: 4 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Kaartic <kaarticsivaraam91...@gmail.com> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Cooltey <cf...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: Kaartic <kaarticsivaraam91...@gmail.com> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
