From 54c0239969793586511d3c4c8b7b82b8510ade30 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 24 Apr 2020 16:23:24 +0200
Subject: [PATCH] fix layout issue when text is displayed on 2 lines

---
 .../src/main/res/layout/bottom_sheet_bootstrap.xml   | 12 +++---------
 .../main/res/layout/bottom_sheet_verification.xml    |  2 --
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 5f2ce368ff..fda590517c 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <androidx.core.widget.NestedScrollView 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"
@@ -12,10 +11,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-
+        android:layout_height="wrap_content"
         android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:layout_height="wrap_content">
+        android:paddingBottom="16dp">
 
         <ImageView
             android:id="@+id/bootstrapIcon"
@@ -28,23 +26,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <TextView
             android:id="@+id/bootstrapTitleText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="16dp"
-            android:layout_weight="1"
             android:ellipsize="end"
-            android:maxLines="2"
             android:textColor="?riotx_text_primary"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@+id/bootstrapIcon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/bootstrapIcon"
-            app:layout_constraintTop_toTopOf="@+id/bootstrapIcon"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/recovery_passphrase" />
 
         <androidx.fragment.app.FragmentContainerView
diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml
index 5f1461594d..8de64de060 100644
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@@ -44,13 +44,11 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="16dp"
-            android:layout_weight="1"
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="?riotx_text_primary"
             android:textSize="20sp"
             android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="@+id/verificationRequestAvatar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/verificationRequestAvatar"
             app:layout_constraintTop_toTopOf="@+id/verificationRequestAvatar"