✨ Feature - 차단 기능 추가, 삭제 다이얼로그 추가

app/src/main/java/com/sseotdabwa/buyornot/navigation/BuyOrNotNavHost.kt

@@ -27,6 +27,7 @@ import com.sseotdabwa.buyornot.feature.mypage.navigation.navigateToMyPage
 import com.sseotdabwa.buyornot.feature.notification.navigation.navigateToNotification
 import com.sseotdabwa.buyornot.feature.notification.navigation.navigateToNotificationDetail
 import com.sseotdabwa.buyornot.feature.notification.navigation.notificationGraph
+import com.sseotdabwa.buyornot.feature.upload.navigation.UPLOAD_ROUTE
 import com.sseotdabwa.buyornot.feature.upload.navigation.navigateToUpload
 import com.sseotdabwa.buyornot.feature.upload.navigation.uploadScreen
 
@@ -106,11 +107,10 @@ fun BuyOrNotNavHost(
                     tab = HomeTab.MY_FEED,
                     navOptions =
                         androidx.navigation.navOptions {
-                            popUpTo(navController.graph.startDestinationId) {
-                                saveState = false
+                            popUpTo(UPLOAD_ROUTE) {
+                                inclusive = true
                             }
                             launchSingleTop = true
-                            restoreState = false
                         },
                 )
             },

core/data/src/main/java/com/sseotdabwa/buyornot/core/data/repository/UserRepositoryImpl.kt

@@ -4,9 +4,11 @@ import com.sseotdabwa.buyornot.core.network.api.UserApiService
 import com.sseotdabwa.buyornot.core.network.dto.request.FcmTokenRequest
 import com.sseotdabwa.buyornot.core.network.dto.response.User
 import com.sseotdabwa.buyornot.core.network.dto.response.getOrThrow
+import com.sseotdabwa.buyornot.domain.model.BlockedUser
 import com.sseotdabwa.buyornot.domain.model.UserProfile
 import com.sseotdabwa.buyornot.domain.repository.UserRepository
 import javax.inject.Inject
+import com.sseotdabwa.buyornot.core.network.dto.response.BlockedUser as BlockedUserResponse
 
 class UserRepositoryImpl @Inject constructor(
     private val userApiService: UserApiService,
@@ -21,6 +23,16 @@ class UserRepositoryImpl @Inject constructor(
         userApiService.updateFcmToken(FcmTokenRequest(fcmToken)).getOrThrow()
     }
 
+    override suspend fun getBlockedUsers(): List<BlockedUser> = userApiService.getBlockedUsers().getOrThrow().map { it.toDomain() }
+
+    override suspend fun blockUser(userId: Long) {
+        userApiService.blockUser(userId).getOrThrow()
+    }
+
+    override suspend fun unblockUser(userId: Long) {
+        userApiService.unblockUser(userId).getOrThrow()
+    }
+
     private fun User.toDomain(): UserProfile =
         UserProfile(
             id = id,
@@ -29,4 +41,11 @@ class UserRepositoryImpl @Inject constructor(
             socialAccount = socialAccount,
             email = email,
         )
+
+    private fun BlockedUserResponse.toDomain(): BlockedUser =
+        BlockedUser(
+            userId = userId,
+            nickname = nickname,
+            profileImage = profileImage,
+        )
 }

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/AlertDialog.kt

@@ -29,6 +29,7 @@ fun BuyOrNotAlertDialog(
     onConfirm: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
+    confirmButtonColors: BuyOrNotButtonColors = BuyOrNotButtonDefaults.primaryButtonColors(),
 ) {
     Dialog(
         onDismissRequest = onDismissRequest,
@@ -80,13 +81,38 @@ fun BuyOrNotAlertDialog(
                         text = confirmText,
                         onClick = onConfirm,
                         modifier = Modifier.weight(1f),
+                        colors = confirmButtonColors,
                     )
                 }
             }
         }
     }
 }
 
+@Preview(showBackground = true)
+@Composable
+private fun BuyOrNotDestructiveAlertDialogPreview() {
+    BuyOrNotTheme {
+        Box(
+            modifier =
+                Modifier
+                    .background(BuyOrNotTheme.colors.gray1000)
+                    .padding(10.dp),
+        ) {
+            BuyOrNotAlertDialog(
+                onDismissRequest = { /* Handle dismiss */ },
+                title = "피드를 삭제할까요?",
+                subText = "삭제된 피드는 복구할 수 없어요.",
+                confirmText = "삭제",
+                dismissText = "취소",
+                onConfirm = { /* Handle confirm */ },
+                onDismiss = { /* Handle dismiss */ },
+                confirmButtonColors = BuyOrNotButtonDefaults.destructiveButtonColors(),
+            )
+        }
+    }
+}
+
 @Preview(showBackground = true)
 @Composable
 private fun BuyOrNotAlertDialogPreview() {

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/Button.kt

@@ -77,6 +77,17 @@ object BuyOrNotButtonDefaults {
                 )
         }
 
+    @Composable
+    fun destructiveButtonColors() =
+        BuyOrNotButtonColors(
+            defaultContainer = BuyOrNotTheme.colors.red100,
+            hoverContainer = BuyOrNotTheme.colors.red100,
+            pressedContainer = BuyOrNotTheme.colors.red100,
+            disabledContainer = BuyOrNotTheme.colors.gray200,
+            content = BuyOrNotTheme.colors.gray0,
+            disabledContent = BuyOrNotTheme.colors.gray600,
+        )
+
     @Composable
     fun secondaryOutlinedButtonColors() =
         BuyOrNotButtonColors(
@@ -142,6 +153,7 @@ fun PrimaryButton(
     enabled: Boolean = true,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     size: ButtonSize = ButtonSize.Large,
+    colors: BuyOrNotButtonColors = BuyOrNotButtonDefaults.primaryButtonColors(),
     onClick: () -> Unit,
 ) {
     val height =
@@ -160,7 +172,7 @@ fun PrimaryButton(
         enabled = enabled,
         height = height,
         shape = RoundedCornerShape(cornerRadius),
-        buttonColors = BuyOrNotButtonDefaults.primaryButtonColors(),
+        buttonColors = colors,
         contentPadding = PaddingValues(horizontal = 24.dp), // 시안에 맞게 패딩 조절
         interactionSource = interactionSource,
     ) {

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/components/FeedCard.kt

@@ -75,6 +75,8 @@ fun FeedCard(
     voterProfileImageUrl: String = "", // 사용자가 투표한 경우의 프로필 이미지 URL
     onDeleteClick: () -> Unit = {}, // 삭제 클릭 콜백 추가
     onReportClick: () -> Unit = {}, // 신고 클릭 콜백 추가
+    onBlockClick: () -> Unit = {}, // 차단 클릭 콜백 추가
+    showMoreButton: Boolean = true,
 ) {
     val hasVoted = userVotedOptionIndex != null
     val buyPercentage = if (totalVoteCount > 0) (buyVoteCount * 100 / totalVoteCount) else 0
@@ -139,25 +141,41 @@ fun FeedCard(
                     )
                 }
             }
-            Box {
-                Icon(
-                    imageVector = BuyOrNotIcons.More.asImageVector(),
-                    contentDescription = "More",
-                    modifier =
-                        Modifier
-                            .size(20.dp)
-                            .clickable { showMenu = true },
-                    tint = BuyOrNotTheme.colors.gray500,
-                )
-                if (showMenu) {
-                    FeedActionPopup(
-                        label = if (isOwner) "삭제하기" else "신고하기",
-                        onDismiss = { showMenu = false },
-                        onClick = {
-                            showMenu = false
-                            if (isOwner) onDeleteClick() else onReportClick()
-                        },
+            if (showMoreButton) {
+                Box {
+                    Icon(
+                        imageVector = BuyOrNotIcons.More.asImageVector(),
+                        contentDescription = "More",
+                        modifier =
+                            Modifier
+                                .size(20.dp)
+                                .clickable { showMenu = true },
+                        tint = BuyOrNotTheme.colors.gray500,
                     )
+                    val ownerMenuItems =
+                        listOf(
+                            "삭제하기" to {
+                                showMenu = false
+                                onDeleteClick()
+                            },
+                        )
+                    val userMenuItems =
+                        listOf(
+                            "신고하기" to {
+                                showMenu = false
+                                onReportClick()
+                            },
+                            "차단하기" to {
+                                showMenu = false
+                                onBlockClick()
+                            },
+                        )
+                    if (showMenu) {
+                        FeedActionPopup(
+                            items = if (isOwner) ownerMenuItems else userMenuItems,
+                            onDismiss = { showMenu = false },
+                        )
+                    }
                 }
             }
         }
@@ -427,9 +445,8 @@ private fun VoteOption(
  */
 @Composable
 private fun FeedActionPopup(
-    label: String,
+    items: List<Pair<String, () -> Unit>>,
     onDismiss: () -> Unit,
-    onClick: () -> Unit,
 ) {
     val density = LocalDensity.current
     val navHeight = 20.dp // Anchor icon height
@@ -451,8 +468,7 @@ private fun FeedActionPopup(
         properties = PopupProperties(focusable = true),
     ) {
         FeedActionPopupContent(
-            label = label,
-            onClick = onClick,
+            items = items,
             tonalElevation = 8.dp,
             shadowElevation = 8.dp,
         )
@@ -464,8 +480,7 @@ private fun FeedActionPopup(
  */
 @Composable
 private fun FeedActionPopupContent(
-    label: String,
-    onClick: () -> Unit,
+    items: List<Pair<String, () -> Unit>>,
     modifier: Modifier = Modifier,
     tonalElevation: Dp = 0.dp,
     shadowElevation: Dp = 0.dp,
@@ -482,22 +497,21 @@ private fun FeedActionPopupContent(
         tonalElevation = tonalElevation,
         shadowElevation = shadowElevation,
     ) {
-        Box(
-            modifier = Modifier.padding(vertical = 14.dp),
-            contentAlignment = Alignment.Center,
-        ) {
-            Text(
-                text = label,
-                modifier =
-                    Modifier
-                        .clickable { onClick() }
-                        .padding(
-                            horizontal = 20.dp,
-                            vertical = 8.dp,
-                        ),
-                style = BuyOrNotTheme.typography.bodyB3Medium,
-                color = BuyOrNotTheme.colors.gray800,
-            )
+        Column(modifier = Modifier.padding(vertical = 14.dp)) {
+            items.forEach { (label, onClick) ->
+                Text(
+                    text = label,
+                    modifier =
+                        Modifier
+                            .clickable { onClick() }
+                            .padding(
+                                horizontal = 20.dp,
+                                vertical = 8.dp,
+                            ),
+                    style = BuyOrNotTheme.typography.bodyB3Medium,
+                    color = BuyOrNotTheme.colors.gray800,
+                )
+            }
         }
     }
 }
@@ -569,8 +583,7 @@ private fun FeedCardSquareInteractivePreview() {
 private fun FeedActionPopupContentOwnerPreview() {
     BuyOrNotTheme {
         FeedActionPopupContent(
-            label = "삭제하기",
-            onClick = { /* do nothing */ },
+            items = listOf("삭제하기" to {}),
         )
     }
 }
@@ -584,8 +597,7 @@ private fun FeedActionPopupContentOwnerPreview() {
 private fun FeedActionPopupContentUserPreview() {
     BuyOrNotTheme {
         FeedActionPopupContent(
-            label = "신고하기",
-            onClick = { /* do nothing */ },
+            items = listOf("신고하기" to {}, "차단하기" to {}),
         )
     }
 }

core/designsystem/src/main/java/com/sseotdabwa/buyornot/core/designsystem/icon/BuyOrNotImgs.kt

@@ -33,6 +33,8 @@ object BuyOrNotImgs {
     val Error = ImgsResource(R.drawable.img_error)
 
     val NoNotification = ImgsResource(R.drawable.img_no_bell)
+
+    val NoBlockedUser = ImgsResource(R.drawable.img_blocked_user_empty)
 }
 
 /**