From a494a5d5fd79587524e7273d2189a0f9f1d2a3d0 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Mon, 10 Jul 2023 14:13:38 -0400
Subject: [PATCH] Revert activity_death layout changes and add a scrollview

This allows all text to remain visible and the view itself to move (For smaller screens)
---
 Habitica/res/layout/activity_death.xml | 167 ++++++++++++-------------
 1 file changed, 79 insertions(+), 88 deletions(-)

diff --git a/Habitica/res/layout/activity_death.xml b/Habitica/res/layout/activity_death.xml
index d73e70d6f..c7d3fcfc7 100644
--- a/Habitica/res/layout/activity_death.xml
+++ b/Habitica/res/layout/activity_death.xml
@@ -9,111 +9,102 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:paddingHorizontal="23dp">
+        android:fillViewport="true">
 
-        <RelativeLayout
-            android:id="@+id/ghost_container"
-            android:layout_width="match_parent"
-            android:layout_height="157dp"
-            android:layout_above="@id/loss_health_title"
-            android:layout_marginTop="@dimen/spacing_xlarge"
-            android:layout_marginBottom="@dimen/spacing_xlarge">
-
-            <ImageView
-                android:id="@+id/ghost_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/death_ghost" />
-
-            <ImageView
-                android:id="@+id/heart_view"
-                android:layout_width="110dp"
-                android:layout_height="110dp"
-                android:layout_alignParentBottom="true"
-                android:layout_centerHorizontal="true"
-                android:src="@drawable/ic_broken_heart" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/loss_health_title"
-            style="@style/Title2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/loss_description"
-            android:layout_marginHorizontal="@dimen/spacing_xlarge"
-            android:gravity="center"
-            android:text="@string/you_ran_out_of_health"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/loss_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_marginHorizontal="@dimen/spacing_xlarge"
-            android:layout_marginVertical="@dimen/spacing_medium"
-            android:gravity="center"
-            android:lineSpacingExtra="4dp"
-            android:textColor="@color/text_primary"
-            android:textSize="20sp" />
-
-        <androidx.core.widget.NestedScrollView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@id/restart_button"
-            android:layout_below="@id/loss_description"
-            android:layout_marginTop="@dimen/spacing_medium">
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:paddingHorizontal="23dp">
+
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="157dp">
+
+                <ImageView
+                    android:id="@+id/ghost_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerHorizontal="true"
+                    android:src="@drawable/death_ghost" />
+
+                <ImageView
+                    android:id="@+id/heart_view"
+                    android:layout_width="110dp"
+                    android:layout_height="110dp"
+                    android:layout_alignParentBottom="true"
+                    android:layout_centerHorizontal="true"
+                    android:src="@drawable/ic_broken_heart" />
+            </RelativeLayout>
 
             <TextView
-                android:id="@+id/loss_sub_description"
+                style="@style/Title2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/spacing_large"
+                android:layout_marginHorizontal="@dimen/spacing_xlarge"
+                android:gravity="center"
+                android:text="@string/you_ran_out_of_health"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/loss_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/spacing_xlarge"
+                android:layout_marginVertical="@dimen/spacing_medium"
                 android:gravity="center"
                 android:lineSpacingExtra="4dp"
+                android:textColor="@color/text_primary"
+                android:textSize="20sp" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/spacing_xlarge"
+                android:gravity="center"
+                android:lineSpacingExtra="4dp"
                 android:text="@string/death_description"
                 android:textColor="@color/text_secondary"
                 android:textSize="20sp" />
 
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
-        </androidx.core.widget.NestedScrollView>
+            <Button
+                android:id="@+id/restart_button"
+                style="@style/HabiticaButton.Maroon"
+                android:layout_width="match_parent"
+                android:layout_height="69dp"
+                android:layout_marginBottom="6dp"
+                android:text="@string/faint_button"
+                android:textStyle="bold" />
 
+            <com.habitrpg.android.habitica.ui.views.ads.AdButton
+                android:id="@+id/ad_button"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                app:activeBackground="@drawable/ad_button_background_content"
+                app:text="@string/watch_ad_to_open"
+                app:textColor="@color/text_primary" />
 
-        <Button
-            android:id="@+id/restart_button"
-            style="@style/HabiticaButton.Maroon"
-            android:layout_width="match_parent"
-            android:layout_height="69dp"
-            android:layout_above="@id/ad_button"
-            android:layout_marginBottom="6dp"
-            android:text="@string/faint_button"
-            android:textStyle="bold" />
-
-        <com.habitrpg.android.habitica.ui.views.ads.AdButton
-            android:id="@+id/ad_button"
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_above="@id/broken_equipment_text"
-            app:activeBackground="@drawable/ad_button_background_content"
-            app:text="@string/watch_ad_to_open"
-            app:textColor="@color/text_primary" />
-
-        <TextView
-            android:id="@+id/broken_equipment_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_margin="@dimen/spacing_large"
-            android:gravity="center"
-            android:text="@string/faint_broken_equipment"
-            android:textColor="@color/text_quad" />
-    </RelativeLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/spacing_large"
+                android:gravity="center"
+                android:text="@string/faint_broken_equipment"
+                android:textColor="@color/text_quad" />
+        </LinearLayout>
+    </ScrollView>
 </FrameLayout>