From 347593fb65a70e0bd1d47878a3f1b4504c0f3e6a Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Fri, 21 Mar 2025 13:49:19 +1100
Subject: [PATCH] Fix empty state showing up on home screen (#1038)

---
 .../securesms/home/HomeActivity.kt            |  3 +-
 app/src/main/res/layout/activity_home.xml     | 66 ++++++++++---------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index b06a051b4b..d8d32cf5c8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -383,10 +383,9 @@ class HomeActivity : ScreenLockActionBarActivity(),
         binding.searchToolbar.isVisible = isShown
         binding.sessionToolbar.isVisible = !isShown
         binding.recyclerView.isVisible = !isShown
-        binding.emptyStateContainer.isVisible = (binding.recyclerView.adapter as HomeAdapter).itemCount == 0 && binding.recyclerView.isVisible
         binding.seedReminderView.isVisible = !TextSecurePreferences.getHasViewedSeed(this) && !isShown
         binding.globalSearchRecycler.isInvisible = !isShown
-        binding.newConversationButton.isVisible = !isShown
+        binding.conversationListContainer.isInvisible = isShown
     }
 
     private fun updateLegacyConfigView() {
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index d6a6e5f6fe..08ea32bc2f 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -147,21 +147,45 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <RelativeLayout
+    <FrameLayout
+        android:animateLayoutChanges="true"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipChildren="false"
-        android:focusable="false">
+        android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:paddingBottom="172dp"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="6"
-            tools:listitem="@layout/view_conversation" />
+            android:id="@+id/conversationListContainer">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:paddingBottom="172dp"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:itemCount="6"
+                tools:listitem="@layout/view_conversation" />
+
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/emptyStateContainer"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"/>
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/newConversationButton"
+                android:contentDescription="@string/AccessibilityId_conversationsNew"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginBottom="@dimen/new_conversation_button_bottom_offset"
+                app:rippleColor="@color/button_primary_ripple"
+                android:src="@drawable/ic_plus"
+                app:maxImageSize="32dp"
+                android:tint="?message_sent_text_color"/>
+
+        </FrameLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/globalSearchRecycler"
@@ -173,25 +197,7 @@
             tools:itemCount="6"
             tools:listitem="@layout/view_global_search_result" />
 
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/emptyStateContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"/>
+    </FrameLayout>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/newConversationButton"
-            android:contentDescription="@string/AccessibilityId_conversationsNew"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="@dimen/new_conversation_button_bottom_offset"
-            app:rippleColor="@color/button_primary_ripple"
-            android:src="@drawable/ic_plus"
-            app:maxImageSize="32dp"
-            android:tint="?message_sent_text_color"/>
-
-    </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file