From 0d5b66f92b92a7bd7b92d2a7f5917c3f0bb00e1c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 13:53:03 +0200
Subject: [PATCH] Flatten View hierarchy

---
 .../res/layout/item_space_beta_header.xml     | 76 ++++++++-----------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 9df9e26386..47891814a4 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -1,55 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingStart="16dp"
+    android:paddingTop="8dp"
     android:paddingEnd="16dp">
 
-    <FrameLayout
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/spaces_header"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:drawableEndCompat="@drawable/ic_beta_pill" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
+        android:text="@string/spaces_beta_welcome_to_spaces_desc"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/spaces_header"
-                android:textColor="?riotx_text_primary"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                app:drawableEndCompat="@drawable/ic_beta_pill" />
+    <TextView
+        android:id="@+id/spaceBetaFeedbackAction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:drawablePadding="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:text="@string/give_feedback"
+        android:textColor="@color/vector_info_color"
+        android:textSize="15sp"
+        app:drawableStartCompat="@drawable/ic_feedback" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/spaces_beta_welcome_to_spaces_desc"
-                android:textColor="?riotx_text_secondary"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/spaceBetaFeedbackAction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:drawablePadding="8dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="4dp"
-                android:text="@string/give_feedback"
-                android:textColor="@color/vector_info_color"
-                android:textSize="15sp"
-                app:drawableStartCompat="@drawable/ic_feedback" />
-        </LinearLayout>
-
-    </FrameLayout>
-
-
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>