From 653eff403c7e8dce71ad8c8192e97d974e8ea2c7 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Mon, 17 Jul 2023 11:39:42 -0400
Subject: [PATCH] Prevent overlap of backup icon on small screens.

Fixes #13064.
---
 .../fragment_registration_choose_backup.xml   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/fragment_registration_choose_backup.xml b/app/src/main/res/layout/fragment_registration_choose_backup.xml
index fecf468a3d..40bc0670b9 100644
--- a/app/src/main/res/layout/fragment_registration_choose_backup.xml
+++ b/app/src/main/res/layout/fragment_registration_choose_backup.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:viewBindingIgnore="true"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <TextView
         android:id="@+id/choose_backup_fragment_title"
@@ -45,18 +45,22 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/choose_backup_fragment_icon"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:background="@drawable/circle_tintable"
         android:contentDescription="@string/ChooseBackupFragment__icon_content_description"
         android:padding="30dp"
         app:backgroundTint="@color/signal_colorSurfaceVariant"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/choose_backup_fragment_button"
+        app:layout_constraintDimensionRatio="H,1:1"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_max="120dp"
+        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/choose_backup_fragment_learn_more"
+        app:layout_constraintWidth_max="120dp"
         app:srcCompat="@drawable/ic_backup_outline_60"
-        app:tint="@color/signal_colorPrimary"/>
+        app:tint="@color/signal_colorPrimary" />
 
     <org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton
         android:id="@+id/choose_backup_fragment_button"
@@ -65,10 +69,10 @@
         android:layout_marginStart="32dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="32dp"
-        app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary"
         app:circularProgressMaterialButton__label="@string/ChooseBackupFragment__choose_backup"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:materialThemeOverlay="@style/ThemeOverlay.Signal.CircularProgressIndicator.Primary" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file