Improves creation of lists for users that had none

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/list/ListOfPeopleListFeedView.kt

@@ -23,7 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.list
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -46,9 +45,8 @@ import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding
 import com.vitorpamplona.amethyst.ui.theme.MaxWidthWithHorzPadding
-import com.vitorpamplona.amethyst.ui.theme.Size40dp
+import com.vitorpamplona.amethyst.ui.theme.Size20dp
 import com.vitorpamplona.amethyst.ui.theme.SpacedBy5dp
-import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.grayText
 
 @Composable
@@ -60,11 +58,6 @@ fun AllPeopleListFeedView(
     val peopleListFeedState by peopleListModel.listFlow().collectAsStateWithLifecycle()
     val followPackFeedState by followPackModel.listFlow().collectAsStateWithLifecycle()
 
-    if (peopleListFeedState.isEmpty() && followPackFeedState.isEmpty()) {
-        AllPeopleListFeedEmpty(
-            message = stringRes(R.string.follow_set_empty_feed_msg),
-        )
-    } else {
     LazyColumn(
         state = rememberLazyListState(),
         contentPadding = FeedPadding,
@@ -94,6 +87,17 @@ fun AllPeopleListFeedView(
                 )
             }
         }
+        if (peopleListFeedState.isEmpty()) {
+            item {
+                Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
+                    Text(
+                        text = stringRes(R.string.feed_is_empty),
+                        modifier = Modifier.padding(vertical = Size20dp),
+                    )
+                    HorizontalDivider(thickness = DividerThickness)
+                }
+            }
+        } else {
             itemsIndexed(peopleListFeedState, key = { _, item -> item.identifierTag }) { _, followSet ->
                 PeopleListItem(
                     modifier =
@@ -108,6 +112,7 @@ fun AllPeopleListFeedView(
                 )
                 HorizontalDivider(thickness = DividerThickness)
             }
+        }
         stickyHeader {
             Row(
                 modifier =
@@ -136,6 +141,17 @@ fun AllPeopleListFeedView(
                 )
             }
         }
+        if (followPackFeedState.isEmpty()) {
+            item {
+                Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
+                    Text(
+                        text = stringRes(R.string.feed_is_empty),
+                        modifier = Modifier.padding(vertical = Size20dp),
+                    )
+                    HorizontalDivider(thickness = DividerThickness)
+                }
+            }
+        } else {
             itemsIndexed(followPackFeedState, key = { _, item -> item.identifierTag }) { _, followSet ->
                 PeopleListItem(
                     modifier =
@@ -153,17 +169,3 @@ fun AllPeopleListFeedView(
         }
     }
 }
-
-@Composable
-fun AllPeopleListFeedEmpty(message: String = stringRes(R.string.feed_is_empty)) {
-    Column(
-        Modifier
-            .fillMaxSize()
-            .padding(horizontal = Size40dp),
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-    ) {
-        Text(message)
-        Spacer(modifier = StdVertSpacer)
-    }
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/lists/memberEdit/FollowListAndPackAndUserView.kt

@@ -23,8 +23,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.memberEdit
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -48,8 +46,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.lists.list.NewListButton
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.MaxWidthWithHorzPadding
+import com.vitorpamplona.amethyst.ui.theme.Size20dp
 import com.vitorpamplona.amethyst.ui.theme.SpacedBy5dp
-import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.grayText
 
 @Composable
@@ -63,18 +61,6 @@ fun FollowListAndPackAndUserView(
     val followPackFeedState by accountViewModel.account.followLists.uiListFlow
         .collectAsStateWithLifecycle()
 
-    if (followSetsState.isEmpty() && followPackFeedState.isEmpty()) {
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .fillMaxHeight(0.5f),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center,
-        ) {
-            Text(text = stringRes(R.string.follow_set_empty_dialog_msg))
-            Spacer(modifier = StdVertSpacer)
-        }
-    } else {
     val userName by observeUserName(userToAddOrRemove, accountViewModel)
 
     LazyColumn(modifier = Modifier.fillMaxWidth()) {
@@ -101,6 +87,17 @@ fun FollowListAndPackAndUserView(
                 )
             }
         }
+        if (followSetsState.isEmpty()) {
+            item {
+                Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
+                    Text(
+                        text = stringRes(R.string.feed_is_empty),
+                        modifier = Modifier.padding(vertical = Size20dp),
+                    )
+                    HorizontalDivider(thickness = DividerThickness)
+                }
+            }
+        } else {
             itemsIndexed(followSetsState, key = { _, item -> item.identifierTag }) { _, list ->
                 PeopleListAndUserItem(
                     modifier = Modifier.fillMaxWidth(),
@@ -136,6 +133,7 @@ fun FollowListAndPackAndUserView(
                 )
                 HorizontalDivider(thickness = DividerThickness)
             }
+        }
         stickyHeader {
             Row(
                 modifier =
@@ -162,6 +160,17 @@ fun FollowListAndPackAndUserView(
                 )
             }
         }
+        if (followPackFeedState.isEmpty()) {
+            item {
+                Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
+                    Text(
+                        text = stringRes(R.string.feed_is_empty),
+                        modifier = Modifier.padding(vertical = Size20dp),
+                    )
+                    HorizontalDivider(thickness = DividerThickness)
+                }
+            }
+        } else {
             itemsIndexed(followPackFeedState, key = { _, item -> item.identifierTag }) { _, list ->
                 FollowPackAndUserItem(
                     modifier = Modifier.fillMaxWidth(),