Migrate Setting Blocked Users View from XML to Compose

presentation/src/main/java/daily/dayo/presentation/fragment/mypage/profile/ProfileOptionFragment.kt

@@ -122,17 +122,6 @@ class ProfileOptionFragment : DialogFragment() {
     }
 
     private fun blockUser() {
-        profileViewModel.requestBlockMember(args.memberId)
-        profileViewModel.blockSuccess.observe(viewLifecycleOwner) {
-            if (it.getContentIfNotHandled() == true) {
-                Toast.makeText(
-                    requireContext(),
-                    R.string.other_profile_block_success_message,
-                    Toast.LENGTH_SHORT
-                ).show()
-                findNavController().navigateUp()
-            }
-        }
     }
 
     private fun setOptionReportUserClickListener() {

presentation/src/main/java/daily/dayo/presentation/fragment/setting/SettingFragment.kt

@@ -73,10 +73,7 @@ class SettingFragment : Fragment() {
 
     private fun setBlockButtonClickListener() {
         binding.layoutSettingBlock.setOnDebounceClickListener {
-            findNavController().navigateSafe(
-                currentDestinationId = R.id.SettingFragment,
-                action = R.id.action_settingFragment_to_settingBlockFragment
-            )
+
         }
     }
 

presentation/src/main/java/daily/dayo/presentation/screen/main/MainNavigator.kt

@@ -9,6 +9,7 @@ import androidx.navigation.compose.rememberNavController
 import daily.dayo.presentation.screen.home.HomeRoute
 import daily.dayo.presentation.screen.home.navigateHome
 import daily.dayo.presentation.screen.mypage.navigateBackToFolder
+import daily.dayo.presentation.screen.mypage.navigateBlockedUsers
 import daily.dayo.presentation.screen.mypage.navigateBookmark
 import daily.dayo.presentation.screen.mypage.navigateFolder
 import daily.dayo.presentation.screen.mypage.navigateFolderCreate
@@ -84,6 +85,10 @@ class MainNavigator(
         navController.navigateProfileEdit()
     }
 
+    fun navigateBlockedUsers() {
+        navController.navigateBlockedUsers()
+    }
+
     fun navigateBookmark() {
         navController.navigateBookmark()
     }

presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt

@@ -143,6 +143,7 @@ internal fun MainScreen(
                                 navigateBackToFolder = { folderId -> navigator.navigateBackToFolder(folderId) }
                             )
                             profileNavGraph(
+                                snackBarHostState = snackBarHostState,
                                 onFollowMenuClick = { memberId, tabNum -> navigator.navigateFollowMenu(memberId, tabNum) },
                                 onFolderClick = { folderId -> navigator.navigateFolder(folderId) },
                                 onPostClick = { postId -> navigator.navigatePost(postId) },
@@ -157,6 +158,7 @@ internal fun MainScreen(
                                 coroutineScope = coroutineScope,
                                 snackBarHostState = snackBarHostState,
                                 onProfileEditClick = { navigator.navigateProfileEdit() },
+                                onBlockUsersClick = { navigator.navigateBlockedUsers() },
                                 onPasswordChangeClick = { navigator.navigateChangePassword() },
                                 onSettingNotificationClick = { navigator.navigateSettingsNotification() },
                                 onBackClick = { navigator.popBackStack() }

presentation/src/main/java/daily/dayo/presentation/screen/mypage/MypageNavigation.kt

@@ -12,6 +12,8 @@ import daily.dayo.presentation.screen.folder.FolderCreateScreen
 import daily.dayo.presentation.screen.folder.FolderEditScreen
 import daily.dayo.presentation.screen.folder.FolderPostMoveScreen
 import daily.dayo.presentation.screen.folder.FolderScreen
+import daily.dayo.presentation.screen.settings.BlockedUsersScreen
+import kotlinx.coroutines.CoroutineScope
 
 fun NavController.navigateMyPage() {
     navigate(MyPageRoute.route) {
@@ -23,6 +25,10 @@ fun NavController.navigateProfileEdit() {
     navigate(MyPageRoute.profileEdit())
 }
 
+fun NavController.navigateBlockedUsers() {
+    navigate(MyPageRoute.blockedUsers())
+}
+
 fun NavController.navigateBookmark() {
     navigate(MyPageRoute.bookmark())
 }
@@ -109,6 +115,12 @@ fun NavGraphBuilder.myPageNavGraph(
         )
     }
 
+    composable(MyPageRoute.blockedUsers()) {
+        BlockedUsersScreen(
+            onBackClick = onBackClick,
+        )
+    }
+
     composable(MyPageRoute.bookmark()) {
         BookmarkScreen(
             onBackClick = onBackClick
@@ -190,6 +202,9 @@ object MyPageRoute {
     // profile edit
     fun profileEdit() = "$route/edit"
 
+    // blocked users
+    fun blockedUsers() = "$route/blockedUsers"
+
     // follow
     fun follow(memberId: String, tabNum: String) = "$route/follow/$memberId/$tabNum"
 

presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileNavigation.kt

@@ -1,5 +1,6 @@
 package daily.dayo.presentation.screen.profile
 
+import androidx.compose.material3.SnackbarHostState
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavType
@@ -11,6 +12,7 @@ fun NavController.navigateProfile(memberId: String) {
 }
 
 fun NavGraphBuilder.profileNavGraph(
+    snackBarHostState: SnackbarHostState,
     onFollowMenuClick: (String, Int) -> Unit,
     onFolderClick: (Long) -> Unit,
     onPostClick: (Long) -> Unit,
@@ -26,6 +28,7 @@ fun NavGraphBuilder.profileNavGraph(
     ) { navBackStackEntry ->
         val memberId = navBackStackEntry.arguments?.getString("memberId") ?: ""
         ProfileScreen(
+            externalSnackBarHostState = snackBarHostState,
             memberId = memberId,
             onFollowMenuClick = onFollowMenuClick,
             onFolderClick = onFolderClick,