[HOTFIX/#96] 차단 바텀시트 닉네임 추가

app/src/main/java/com/sopt/withsuhyeon/core/component/bottomsheet/BlockBottomSheet.kt

@@ -1,5 +1,6 @@
 package com.sopt.withsuhyeon.core.component.bottomsheet
 
+import android.provider.ContactsContract.CommonDataKinds.Nickname
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -36,6 +37,7 @@ import com.sopt.withsuhyeon.ui.theme.WithSuhyeonTheme.typography
 fun BlockBottomSheet(
     closeSheet: () -> Unit,
     navigateToBlockScreen: () -> Unit,
+    nickname: String,
     modifier: Modifier = Modifier,
 ) {
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
@@ -82,7 +84,7 @@ fun BlockBottomSheet(
                     )
                     Text(
                         modifier = Modifier.fillMaxWidth(),
-                        text = stringResource(R.string.block_bottomsheet_sub_title),
+                        text = "차단한 사용자는 ${nickname}님의 게시글을 볼 수 없어요",
                         style = typography.body03_SB,
                         color = colors.Grey500
                     )

app/src/main/java/com/sopt/withsuhyeon/data/dto/response/ResponseHomeDto.kt

@@ -1,11 +1,13 @@
 package com.sopt.withsuhyeon.data.dto.response
 
+import android.provider.ContactsContract.CommonDataKinds.Nickname
 import com.sopt.withsuhyeon.domain.entity.HomePostItemModel
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class ResponseHomeDto(
     val count: Int,
     val region: String,
-    val homePosts: List<HomePostItemModel>
+    val homePosts: List<HomePostItemModel>,
+    val nickname: String
 )

app/src/main/java/com/sopt/withsuhyeon/data/mapper/HomeMapper.kt

@@ -8,5 +8,6 @@ fun ResponseHomeDto.toHomeModel(): HomeModel {
         count = this.count,
         region = this.region,
         homePosts = this.homePosts,
+        nickname = this.nickname
     )
 }

app/src/main/java/com/sopt/withsuhyeon/domain/entity/HomeModel.kt

@@ -3,5 +3,6 @@ package com.sopt.withsuhyeon.domain.entity
 data class HomeModel(
     val count: Int,
     val region: String,
-    val homePosts: List<HomePostItemModel>
+    val homePosts: List<HomePostItemModel>,
+    val nickname: String
 )

app/src/main/java/com/sopt/withsuhyeon/feature/home/HomeScreen.kt

@@ -90,14 +90,16 @@ fun HomeScreen(
     navigateToBlockUser: () -> Unit
 ) {
     var isBlockBottomSheetVisible by rememberSaveable { mutableStateOf(true) }
+    val homeState by viewModel.state.collectAsStateWithLifecycle()
+
     if (isBlockBottomSheetVisible) {
         BlockBottomSheet(
             closeSheet = { isBlockBottomSheetVisible = false },
-            navigateToBlockScreen = navigateToBlockUser
+            navigateToBlockScreen = navigateToBlockUser,
+            nickname = homeState.homeData.nickname
         )
     }
 
-    val homeState by viewModel.state.collectAsStateWithLifecycle()
 
     val composition by rememberLottieComposition(
         LottieCompositionSpec.RawRes(

app/src/main/java/com/sopt/withsuhyeon/feature/home/state/HomeState.kt

@@ -1,15 +1,18 @@
 package com.sopt.withsuhyeon.feature.home.state
 
 import com.sopt.withsuhyeon.R
+import com.sopt.withsuhyeon.core.util.KeyStorage.EMPTY_STRING
 import com.sopt.withsuhyeon.domain.entity.HomeModel
 
 data class HomeState(
     val homeData: HomeModel = HomeModel(
         count = 0,
         region = "",
-        homePosts = emptyList()
+        homePosts = emptyList(),
+        nickname = EMPTY_STRING
     ),
     val count: Int = 0,
     val isRefreshing: Boolean = false,
     val lottieResId: Int = R.raw.home,
+    val nickname: String = EMPTY_STRING
 )

app/src/main/res/values/strings.xml

@@ -94,7 +94,6 @@
 
     <!-- 차단 바텀시트 -->
     <string name="block_bottomsheet_title">차단하고 싶은 번호가 있나요?</string>
-    <string name="block_bottomsheet_sub_title">차단한 사용자는 [닉네임]님의 게시글을 볼 수 없어요</string>
     <string name="block_bottomsheet_button_text">차단하러 가기</string>
     <string name="block_bottomsheet_skip_text">괜찮아요</string>