From 5216a1ce1d827f2a59efaea7bbe58e426fc4569b Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Tue, 27 Mar 2018 20:06:08 -0400
Subject: [PATCH] Fix MainActivity empty state visibility

---
 .../main/java/feature/main/MainActivity.kt    |  2 +-
 .../src/main/res/layout/main_activity.xml     | 72 ++++++++++---------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt
index 92ecbfe4..be51bc39 100644
--- a/presentation/src/main/java/feature/main/MainActivity.kt
+++ b/presentation/src/main/java/feature/main/MainActivity.kt
@@ -200,7 +200,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
         }
 
         syncing.setVisible(state.syncing)
-        recyclerView.setVisible(!state.syncing)
+        synced.setVisible(!state.syncing)
 
         when (state.page) {
             is Inbox -> {
diff --git a/presentation/src/main/res/layout/main_activity.xml b/presentation/src/main/res/layout/main_activity.xml
index 574a95cb..796af8d7 100644
--- a/presentation/src/main/res/layout/main_activity.xml
+++ b/presentation/src/main/res/layout/main_activity.xml
@@ -83,34 +83,49 @@
             app:layout_constraintTop_toBottomOf="@id/syncingProgress"
             app:textColor="tertiary" />
 
-        <common.widget.QkTextView
-            android:id="@+id/empty"
-            style="@style/TextSecondary"
+        <FrameLayout
+            android:id="@+id/synced"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:padding="56dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar"
-            tools:text="Your conversations will appear here"
-            tools:visibility="invisible" />
+            app:layout_constraintTop_toBottomOf="@id/toolbar">
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:paddingBottom="8dp"
-            android:paddingTop="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/toolbar"
-            tools:listitem="@layout/conversation_list_item" />
+            <common.widget.QkTextView
+                android:id="@+id/empty"
+                style="@style/TextSecondary"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:padding="56dp"
+                tools:text="Your conversations will appear here"
+                tools:visibility="invisible" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                tools:listitem="@layout/conversation_list_item" />
+
+            <android.support.design.widget.FloatingActionButton
+                android:id="@+id/compose"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:layout_margin="16dp"
+                android:src="@drawable/ic_add_black_24dp"
+                android:tint="@color/white"
+                app:layout_anchor="@+id/recyclerView"
+                app:layout_anchorGravity="bottom|right|end"
+                tools:backgroundTint="@color/tools_theme" />
+
+        </FrameLayout>
 
         <View
             android:layout_width="0dp"
@@ -120,19 +135,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/toolbar" />
 
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/compose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:src="@drawable/ic_add_black_24dp"
-            android:tint="@color/white"
-            app:layout_anchor="@+id/recyclerView"
-            app:layout_anchorGravity="bottom|right|end"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            tools:backgroundTint="@color/tools_theme" />
-
     </android.support.constraint.ConstraintLayout>
 
     <include