Merge pull request #297 from wespot-bff/feature/jaino/#296

jeongjaino · web-flow · commit 155b0b46532a · 2025-10-20T21:47:35.000+09:00
#296 : 바텀 네비게이션 MY 탭 아이콘 변경 및 커뮤니티 알림 설정 구현 + 링크 수정
diff --git a/app/src/main/kotlin/com/bff/wespot/main/component/BottomNavigationTab.kt b/app/src/main/kotlin/com/bff/wespot/main/component/BottomNavigationTab.kt
@@ -8,7 +8,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.Text
@@ -39,7 +40,7 @@ internal fun BottomNavigationTab(
 ) {
     NavigationBar(
         containerColor = WeSpotThemeManager.colors.naviColor,
-        modifier = modifier,
+        modifier = modifier.height(69.dp),
     ) {
         Row(
             modifier = Modifier.fillMaxWidth(),
@@ -94,7 +95,6 @@ private fun RowScope.TabItem(
 
     Box(
         modifier = Modifier
-            .size(80.dp)
             .weight(1f)
             .clickableSingle {
                 hapticEngine?.let {
@@ -106,6 +106,7 @@ private fun RowScope.TabItem(
         contentAlignment = Alignment.Center,
     ) {
         Column(
+            modifier = Modifier.padding(top = 10.dp, bottom = 18.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             Icon(
@@ -119,7 +120,7 @@ private fun RowScope.TabItem(
 
             Text(
                 text = title,
-                style = StaticTypeScale.Default.body9,
+                style = StaticTypeScale.Default.body10,
                 color = if (selected) {
                     WeSpotThemeManager.colors.abledIconColor
                 } else {
diff --git a/core/model/src/main/kotlin/com/bff/wespot/model/message/response/MessageProfile.kt b/core/model/src/main/kotlin/com/bff/wespot/model/message/response/MessageProfile.kt
@@ -7,10 +7,4 @@ data class MessageProfile(
     val schoolName: String = "",
     val grade: Int = -1,
     val classNumber: Int = -1,
-) {
-    fun toDescription(): String = if (isAnonymous) {
-        name
-    } else {
-        "$schoolName ${grade}학년 ${classNumber}반 $name"
-    }
-}
+)
diff --git a/core/model/src/main/kotlin/com/bff/wespot/model/user/response/NotificationSetting.kt b/core/model/src/main/kotlin/com/bff/wespot/model/user/response/NotificationSetting.kt
@@ -1,9 +1,10 @@
 package com.bff.wespot.model.user.response
 
 data class NotificationSetting(
+    val isEnablePostNotification: Boolean,
     val isEnableVoteNotification: Boolean,
     val isEnableMessageNotification: Boolean,
     val isEnableMarketingNotification: Boolean,
 ) {
-    constructor() : this(false, false, false)
+    constructor() : this(false, false, false, false)
 }
diff --git a/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/message/response/MessageRoomDto.kt b/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/message/response/MessageRoomDto.kt
@@ -17,6 +17,7 @@ data class MessageRoomDto(
         name = name,
         thumbnail = thumbnail,
         isBookmarked = isBookmarked,
+        isReceiverAnonymous = isReceiverAnonymous,
         messageDetails = messageDetails.map { it.toDomain() },
     )
 }
diff --git a/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/user/response/NotificationSettingDto.kt b/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/user/response/NotificationSettingDto.kt
@@ -5,11 +5,13 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class NotificationSettingDto (
+    val isEnablePostNotification: Boolean,
     val isEnableVoteNotification: Boolean,
     val isEnableMessageNotification: Boolean,
     val isEnableMarketingNotification: Boolean,
 ) {
     fun toNotificationSetting(): NotificationSetting = NotificationSetting(
+        isEnablePostNotification = isEnablePostNotification,
         isEnableVoteNotification = isEnableVoteNotification,
         isEnableMessageNotification = isEnableMessageNotification,
         isEnableMarketingNotification = isEnableMarketingNotification,
diff --git a/data/src/main/kotlin/com/bff/wespot/data/mapper/user/UserMapper.kt b/data/src/main/kotlin/com/bff/wespot/data/mapper/user/UserMapper.kt
@@ -6,6 +6,7 @@ import com.bff.wespot.data.remote.model.user.response.ProfileCharacterDto
 import com.bff.wespot.model.user.response.ProfileCharacter
 
 internal fun NotificationSetting.toNotificationSettingDto() = NotificationSettingDto(
+    isEnablePostNotification = isEnablePostNotification,
     isEnableVoteNotification = isEnableVoteNotification,
     isEnableMessageNotification = isEnableMessageNotification,
     isEnableMarketingNotification = isEnableMarketingNotification,
diff --git a/designsystem/src/main/res/values/strings.xml b/designsystem/src/main/res/values/strings.xml
@@ -27,7 +27,7 @@
     <string name="letter_sender">From.</string>
     <string name="letter_opened">읽음</string>
     <string name="letter_image">Letter Image</string>
-    <string name="entire">전체</string>
+    <string name="entire">MY</string>
     <string name="invalid_message">invalid_message</string>
     <string name="has_profanity">비속어가 포함되어 있어요</string>
     <string name="close">닫기</string>
diff --git a/domain/src/main/kotlin/com/bff/wespot/domain/util/RemoteConfigKey.kt b/domain/src/main/kotlin/com/bff/wespot/domain/util/RemoteConfigKey.kt
@@ -13,6 +13,7 @@ object RemoteConfigKey {
     const val RESEARCH_PARTICIPATION_GOOGLE_FORM_URL = "RESEARCH_PARTICIPATION_GOOGLE_FORM_URL"
     const val WESPOT_MAKERS_URL = "WESPOT_MAKERS_URL"
     const val PROFILE_CHANGE_GOOGLE_FORM_URL = "PROFILE_CHANGE_GOOGLE_FORM_URL"
+    const val COMMUNITY_POLICY_URL = "COMMUNITY_GUIDELINES_URL"
     const val PRIVACY_POLICY_URL = "PRIVACY_POLICY_URL"
     const val PLAY_STORE_URL = "PLAY_STORE_URL"
     const val TERMS_OF_SERVICE_URL = "TERMS_OF_SERVICE_URL"
diff --git a/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/CompleteScreen.kt b/feature/auth/src/main/kotlin/com/bff/wespot/auth/screen/CompleteScreen.kt
@@ -1,7 +1,7 @@
 package com.bff.wespot.auth.screen
 
-import android.app.Activity
 import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalActivity
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -50,7 +50,7 @@ fun CompleteScreen(
 
     val state by viewModel.collectAsState()
 
-    val activity = (LocalContext.current as? Activity)
+    val activity = LocalActivity.current
     val context = LocalContext.current
     var inviteClicked by remember {
         mutableStateOf(false)
diff --git a/feature/community/presentation/src/main/java/com/bff/wespot/community/component/FilterChip.kt b/feature/community/presentation/src/main/java/com/bff/wespot/community/component/FilterChip.kt
@@ -81,8 +81,7 @@ internal fun FilterChip(
                                         Gray700
                                     },
                                     shape = RoundedCornerShape(80.dp),
-                                )
-                                .clickableSingle {
+                                ).clickableSingle {
                                     if (selected) {
                                         onSameChipClicked.invoke()
                                     } else {
@@ -125,8 +124,7 @@ internal fun FilterChip(
                             startX = 0f,
                             endX = 100f,
                         ),
-                    )
-                    .width(70.dp),
+                    ).width(70.dp),
                 contentAlignment = Alignment.CenterEnd,
             ) {
                 Box(
@@ -135,8 +133,7 @@ internal fun FilterChip(
                         .background(
                             color = WeSpotThemeManager.colors.cardBackgroundColor,
                             shape = CircleShape,
-                        )
-                        .size(30.dp)
+                        ).size(30.dp)
                         .clickableSingle {
                             onMoreClicked.invoke()
                         },
@@ -156,7 +153,6 @@ internal fun FilterChip(
 
 private fun LazyListState.isScrolledToTheEnd() = layoutInfo.visibleItemsInfo.lastOrNull()?.index == layoutInfo.totalItemsCount - 1
 
-
 private object FilterChipPreviewData {
     val sampleFilterChips = listOf(
         FilterChipUiModel(
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/NotificationSettingScreen.kt
@@ -86,9 +86,18 @@ fun NotificationSettingScreen(
                 .padding(top = 16.dp, start = 24.dp, end = 24.dp),
             verticalArrangement = Arrangement.spacedBy(32.dp),
         ) {
+            SettingSwitchItem(
+                title = stringResource(R.string.post_notification_title),
+                subTitle = stringResource(R.string.post_notification_subtitle),
+                switchValue = state.isEnablePostNotification,
+                onSwitched = {
+                    action(NotificationSettingAction.OnPostNotificationSwitched)
+                },
+            )
+
             SettingSwitchItem(
                 title = stringResource(R.string.vote_notification_title),
-                subTitle = stringResource(R.string.vote_notification_subTitle),
+                subTitle = stringResource(R.string.vote_notification_subtitle),
                 switchValue = state.isEnableVoteNotification,
                 onSwitched = {
                     action(NotificationSettingAction.OnVoteNotificationSwitched)
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/SettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/setting/SettingScreen.kt
@@ -92,6 +92,16 @@ fun SettingScreen(
                 )
             }
 
+            SettingListItem(text = stringResource(R.string.community_policy)) {
+                activityNavigator.navigateToWebLink(
+                    context = context,
+                    webLink = state.webLinkMap.getOrDefault(
+                        RemoteConfigKey.COMMUNITY_POLICY_URL,
+                        context.getString(R.string.community_policy_url),
+                    ),
+                )
+            }
+
             SettingListItem(text = stringResource(R.string.latest_updates)) {
                 activityNavigator.navigateToWebLink(
                     context = context,
@@ -102,14 +112,6 @@ fun SettingScreen(
                 )
             }
 
-            HorizontalDivider(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(vertical = 12.dp),
-                thickness = 1.dp,
-                color = WeSpotThemeManager.colors.cardBackgroundColor,
-            )
-
             SettingListItem(text = stringResource(R.string.account_setting)) {
                 navigator.navigateToAccountSetting()
             }
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/state/notification/NotificationSettingAction.kt b/feature/entire/src/main/java/com/bff/wespot/entire/state/notification/NotificationSettingAction.kt
@@ -3,6 +3,7 @@ package com.bff.wespot.entire.state.notification
 sealed class NotificationSettingAction {
     data object OnNotificationSettingScreenEntered : NotificationSettingAction()
     data object OnNotificationSettingScreenExited : NotificationSettingAction()
+    data object OnPostNotificationSwitched : NotificationSettingAction()
     data object OnVoteNotificationSwitched : NotificationSettingAction()
     data object OnMessageNotificationSwitched : NotificationSettingAction()
     data object OnMarketingNotificationSwitched : NotificationSettingAction()
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/state/notification/NotificationSettingUiState.kt b/feature/entire/src/main/java/com/bff/wespot/entire/state/notification/NotificationSettingUiState.kt
@@ -6,6 +6,7 @@ data class NotificationSettingUiState(
     val isLoading: Boolean = false,
     val hasScreenBeenEntered: Boolean = false,
     val initialNotificationSetting: NotificationSetting = NotificationSetting(),
+    val isEnablePostNotification: Boolean = false,
     val isEnableVoteNotification: Boolean = false,
     val isEnableMessageNotification: Boolean = false,
     val isEnableMarketingNotification: Boolean = false,
diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/viewmodel/NotificationSettingViewModel.kt b/feature/entire/src/main/java/com/bff/wespot/entire/viewmodel/NotificationSettingViewModel.kt
@@ -33,6 +33,9 @@ class NotificationSettingViewModel @Inject constructor(
             NotificationSettingAction.OnNotificationSettingScreenEntered -> {
                 handleScreenEntered()
             }
+            NotificationSettingAction.OnPostNotificationSwitched -> {
+                handlePostNotificationSwitched()
+            }
             is NotificationSettingAction.OnVoteNotificationSwitched -> {
                 handleVoteNotificationSwitched()
             }
@@ -67,6 +70,7 @@ class NotificationSettingViewModel @Inject constructor(
                         state.copy(
                             isLoading = false,
                             initialNotificationSetting = setting,
+                            isEnablePostNotification = setting.isEnablePostNotification,
                             isEnableVoteNotification = setting.isEnableVoteNotification,
                             isEnableMessageNotification = setting.isEnableMessageNotification,
                             isEnableMarketingNotification = setting.isEnableMarketingNotification,
@@ -80,6 +84,10 @@ class NotificationSettingViewModel @Inject constructor(
         }
     }
 
+    private fun handlePostNotificationSwitched() = intent {
+        reduce { state.copy(isEnablePostNotification = state.isEnablePostNotification.not()) }
+    }
+
     private fun handleVoteNotificationSwitched() = intent {
         reduce { state.copy(isEnableVoteNotification = state.isEnableVoteNotification.not()) }
     }
@@ -110,6 +118,7 @@ class NotificationSettingViewModel @Inject constructor(
 
     private fun postNotificationSetting() = intent {
         val updatedNotificationSetting = NotificationSetting(
+            isEnablePostNotification = state.isEnablePostNotification,
             isEnableVoteNotification = state.isEnableVoteNotification,
             isEnableMessageNotification = state.isEnableMessageNotification,
             isEnableMarketingNotification = state.isEnableMarketingNotification,
diff --git a/feature/entire/src/main/res/values/strings.xml b/feature/entire/src/main/res/values/strings.xml
@@ -11,16 +11,17 @@
     <string name="profile_edit">프로필 수정</string>
     <string name="notification_setting">알림 설정</string>
     <string name="privacy_policy">개인정보처리 방침</string>
+    <string name="community_policy">커뮤니티 이용규칙</string>
     <string name="terms_of_service">서비스 이용약관</string>
     <string name="latest_updates">최신 정보 업데이트</string>
     <string name="block_list">차단 목록</string>
     <string name="account_setting">계정 관리</string>
     <string name="vote">투표</string>
     <string name="vote_notification_title">비밀 투표</string>
-    <string name="vote_notification_subTitle">우리 반 투표 관련 알림</string>
-    <string name="message">쪽지</string>
-    <string name="message_notification_title">익명 쪽지 관련 알림</string>
-    <string name="event_benefit">이벤트 혜택</string>
+    <string name="vote_notification_subtitle">투표 결과 등 우리 반 비밀 투표 관련 알림</string>
+    <string name="message">쪽지 알림</string>
+    <string name="message_notification_title">쪽지, 쪽지 답장 등 쪽지 관련 알림</string>
+    <string name="event_benefit">이벤트 알림</string>
     <string name="event_benefit_notification_title">광고성 정보 수신 동의에 의한 이벤트 혜택 알림</string>
     <string name="sign_out">로그아웃</string>
     <string name="user_revoke">회원 탈퇴</string>
@@ -63,4 +64,6 @@
     <string name="request">신청</string>
     <string name="change_image">앨범에서 사진 선택</string>
     <string name="remove_image">기본 이미지 적용</string>
+    <string name="post_notification_title">커뮤니티 알림</string>
+    <string name="post_notification_subtitle">인기 게시글, 댓글 등 게시판 관련 알림</string>
 </resources>
diff --git a/feature/entire/src/main/res/values/urls.xml b/feature/entire/src/main/res/values/urls.xml
@@ -7,8 +7,8 @@
     <string name="research_participation_google_form_url">https://docs.google.com/forms/d/e/1FAIpQLSfkN2b752gRKtFRk9IUreFRacNXnj5jh4tlHWKp0n51IaObyw/viewform?usp=sf_link</string>
     <string name="wespot_makers_url">https://www.notion.so/WeSpot-Makers-87e988ab3c9e47f28c141ad1aa663b80?pvs=4</string>
     <string name="profile_change_google_form_url">https://docs.google.com/forms/d/e/1FAIpQLSdFlTCYbGL4QDYJlzt8jeeeA-E3ITWIBeYS2B5cAZs2j8wosQ/viewform?usp=sf_link</string>
+    <string name="community_policy_url">https://gregarious-salesman-74d.notion.site/WeSpot-2814250111d280528ecde3f5bb2ce7e0</string>
     <string name="privacy_policy_url">https://gregarious-salesman-74d.notion.site/2814250111d280a1ae1ff838befc7052</string>
     <string name="play_store_url">https://play.google.com/store/apps</string>
-    <string name="terms_of_service_url">https://gregarious-salesman-74d.notion.site/2814250111d280588025c88cd75886b8</string>
-    <string name="community_policy_url">https://gregarious-salesman-74d.notion.site/WeSpot-87e988ab3c9e47f28c141ad1aa663b80</string>
+    <string name="terms_of_service_url">https://www.notion.so/yapp-workspace/0826c1435e0b4eba95ce62beb0aea425</string>
 </resources>
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/component/MessageItem.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/component/MessageItem.kt
@@ -67,7 +67,7 @@ internal fun MessageItem(
             MessageUserItem(
                 imageUrl = message.senderProfile.iconUrl,
                 type = stringResource(R.string.me),
-                name = message.senderProfile.toDescription(),
+                name = message.senderProfile.name,
                 isBookmarked = false,
             )
 
@@ -87,11 +87,7 @@ internal fun MessageItem(
                 } else {
                     stringResource(R.string.real_name)
                 },
-                name = if (itemType == MessageItemType.Ever) {
-                    message.receiverProfile.name
-                } else {
-                    message.receiverProfile.toDescription()
-                },
+                name = message.receiverProfile.name,
                 isBookmarked = message.isBookmarked,
             )
         }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ data class MessageRoomDto(`
`17`	`17`	`name = name,`
`18`	`18`	`thumbnail = thumbnail,`
`19`	`19`	`isBookmarked = isBookmarked,`
	`20`	`+ isReceiverAnonymous = isReceiverAnonymous,`
`20`	`21`	`messageDetails = messageDetails.map { it.toDomain() },`
`21`	`22`	`)`
`22`	`23`	`}`