Fix Dax dialog in welcome screen for small screens

duckduckgo · Jan 31, 2025 · abafa75 · abafa75
1 parent 5deffb0
commit abafa75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/app/src/main/res/layout-land/content_onboarding_welcome_page.xml b/app/src/main/res/layout-land/content_onboarding_welcome_page.xml
@@ -28,21 +28,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:srcCompat="@drawable/onboarding_background_small_light" />
 
     <LinearLayout
         android:id="@+id/welcomeContent"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/foregroundImageView"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/daxLogo"
@@ -58,17 +55,17 @@
             android:layout_marginStart="54dp"
             android:layout_marginTop="@dimen/keyline_4"
             android:layout_marginEnd="54dp"
-            android:text="@string/onboardingWelcomeTitle"
             android:gravity="center"
+            android:text="@string/onboardingWelcomeTitle"
             app:typography="title" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/foregroundImageView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/keyline_6"
         android:adjustViewBounds="true"
+        android:paddingTop="@dimen/keyline_6"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

diff --git a/app/src/main/res/layout/content_onboarding_welcome_page.xml b/app/src/main/res/layout/content_onboarding_welcome_page.xml
@@ -66,21 +66,22 @@
             android:layout_marginStart="54dp"
             android:layout_marginTop="@dimen/keyline_4"
             android:layout_marginEnd="54dp"
-            android:text="@string/onboardingWelcomeTitle"
             android:gravity="center"
+            android:text="@string/onboardingWelcomeTitle"
             app:typography="title" />
     </LinearLayout>
 
     <include
         android:id="@+id/daxDialogCta"
         layout="@layout/pre_onboarding_dax_dialog_cta"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="56dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="32dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_percent="0.85"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_max="600dp"
-        app:layout_constraintHeight_max="672dp"/>
+        app:layout_constraintWidth_max="600dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>