PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Don't overlap logo and text

Browse Source 
* Instead of using a fixed padding, use weights to align the logo

Change-Id: Ibb3f271dea7c19db3876b82aa1f013b1566e4173
This commit is contained in:
Michael W
2022-04-25 22:57:39 +02:00
parent 7ffdf8d12c
commit cf12c85d82
1 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
res/layout/welcome_activity.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright (C) 2016 The CyanogenMod Project Copyright (C) 2016 The CyanogenMod Project
Copyright (C) 2017-2021 The LineageOS Project Copyright (C) 2017-2022 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@@ -23,66 +23,83 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="@dimen/welcome_content_container_padding_top">
<ImageView
android:id="@+id/brand_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:gravity="center"
android:scaleType="centerCrop"
android:src="@drawable/logo" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
style="@style/SudContentFrame" android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center_vertical">
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"/>
<ImageView
android:id="@+id/brand_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/logo" />
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.5"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="vertical" android:orientation="vertical">
android:paddingStart="@dimen/welcome_content_container_padding_start"
android:paddingEnd="@dimen/welcome_content_container_padding_end"
android:paddingBottom="@dimen/welcome_content_container_padding_bottom">
<TextView
style="@style/WelcomeTitle"
android:id="@+id/welcome_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hyphenationFrequency="none"
android:paddingBottom="@dimen/welcome_content_container_padding_bottom" />
<LinearLayout <LinearLayout
style="@style/SudContentFrame"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:layout_gravity="bottom"
android:focusableInTouchMode="true" android:orientation="vertical"
android:importantForAccessibility="no" android:paddingStart="@dimen/welcome_content_container_padding_start"
android:orientation="vertical"> android:paddingEnd="@dimen/welcome_content_container_padding_end"
android:paddingBottom="@dimen/welcome_content_container_padding_bottom">
<Button <TextView
android:id="@+id/launch_accessibility" style="@style/WelcomeTitle"
style="@style/SudGlifButton.Secondary" android:id="@+id/welcome_title"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:hyphenationFrequency="none"
android:drawableStart="@drawable/ic_eye" android:paddingBottom="@dimen/welcome_content_container_padding_bottom"/>
android:gravity="start|center"
android:drawablePadding="@dimen/welcome_content_container_padding_end" <LinearLayout
android:textSize="@dimen/welcome_accessibility_text_size" android:layout_width="fill_parent"
android:textColor="?android:textColorPrimary" android:layout_height="wrap_content"
android:text="@string/accessibility_settings" /> android:animateLayoutChanges="true"
android:focusableInTouchMode="true"
android:importantForAccessibility="no"
android:orientation="vertical">
<Button
android:id="@+id/launch_accessibility"
style="@style/SudGlifButton.Secondary"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:drawableStart="@drawable/ic_eye"
android:gravity="start|center"
android:drawablePadding="@dimen/welcome_content_container_padding_end"
android:textSize="@dimen/welcome_accessibility_text_size"
android:textColor="?android:textColorPrimary"
android:text="@string/accessibility_settings" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout