fix: fix non-user dialog not showing issue

snuhcs-course · Dec 9, 2023 · 518e6d1 · 518e6d1
1 parent 1b0c8dc
commit 518e6d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/android/app/src/main/java/com/goliath/emojihub/usecases/UserUseCase.kt b/android/app/src/main/java/com/goliath/emojihub/usecases/UserUseCase.kt
@@ -40,7 +40,16 @@ class UserUseCaseImpl @Inject constructor(
     override val accessTokenState: StateFlow<String?>
         get() = _accessTokenState
 
-    private val _userState: MutableStateFlow<User?> = MutableStateFlow(User(UserDto(EmojiHubApplication.preferences.currentUser ?: "")))
+    private val isCurrentUserEmpty = EmojiHubApplication.preferences.currentUser.isNullOrEmpty()
+
+    private val _userState: MutableStateFlow<User?> = MutableStateFlow(
+        if (isCurrentUserEmpty) {
+            null
+        } else {
+            User(UserDto(EmojiHubApplication.preferences.currentUser!!))
+        }
+    )
+
     override val userState: StateFlow<User?>
         get() = _userState
 

diff --git a/android/app/src/main/java/com/goliath/emojihub/views/FeedPage.kt b/android/app/src/main/java/com/goliath/emojihub/views/FeedPage.kt
@@ -25,7 +25,6 @@ import androidx.paging.compose.collectAsLazyPagingItems
 import com.goliath.emojihub.LocalBottomSheetController
 import com.goliath.emojihub.LocalNavController
 import com.goliath.emojihub.NavigationDestination
-import com.goliath.emojihub.models.createDummyEmoji
 import com.goliath.emojihub.navigateAsOrigin
 import com.goliath.emojihub.ui.theme.Color
 import com.goliath.emojihub.ui.theme.Color.EmojiHubDividerColor
@@ -48,7 +47,6 @@ fun FeedPage() {
 
     val currentUser = userViewModel.userState.collectAsState().value
 
-    val emojiList = (1..10).map { createDummyEmoji() }
     val postList = postViewModel.postList.collectAsLazyPagingItems()
 
     var showNonUserDialog by remember { mutableStateOf(false) }