[FIX/#121] 1차 QA 수정 사항 반영

app/src/main/AndroidManifest.xml

@@ -67,6 +67,9 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/img_logo_white_bg" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id" />
         <meta-data
             android:name="firebase_messaging_auto_init_enabled"
             android:value="false" />

app/src/main/java/com/moive/app/MoiveApplication.kt

@@ -3,6 +3,7 @@ package com.moive.app
 import android.app.Application
 import com.kakao.sdk.common.KakaoSdk
 import com.kakao.vectormap.KakaoMapSdk
+import com.moive.app.core.fcm.NotificationChannels
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
@@ -12,6 +13,7 @@ class MoiveApplication : Application() {
         super.onCreate()
 
         initTimber()
+        NotificationChannels.createDefaultChannel(this)
         initKakaoSdk()
         initKakaoMapSdk()
     }

app/src/main/java/com/moive/app/core/designsystem/component/toast/MoiveSnackbarHost.kt

@@ -1,6 +1,7 @@
 package com.moive.app.core.designsystem.component.toast
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
@@ -22,7 +23,7 @@ fun MoiveSnackbarHost(
             text = visuals.message,
             type = visuals.type,
             modifier = Modifier
-                .padding(horizontal = 16.dp)
+                .padding(horizontal = 20.dp)
                 .padding(bottom = 80.dp),
         )
     }

app/src/main/java/com/moive/app/core/fcm/MoiveFirebaseMessagingService.kt

@@ -1,12 +1,9 @@
 package com.moive.app.core.fcm
 
 import android.Manifest
-import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -21,7 +18,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -61,33 +57,24 @@ class MoiveFirebaseMessagingService: FirebaseMessagingService() {
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        val title = remoteMessage.data[MESSAGE_TITLE] ?: return
-        val body = remoteMessage.data[MESSAGE_BODY]
+        val title = remoteMessage.notification?.title ?: remoteMessage.data[MESSAGE_TITLE] ?: return
+        val body = remoteMessage.notification?.body ?: remoteMessage.data[MESSAGE_BODY]
         val meetingId = remoteMessage.data[MESSAGE_MEETING_ID]?.toLongOrNull()
         val notificationId = remoteMessage.data[MESSAGE_NOTIFICATION_ID]?.toLongOrNull()
 
         showNotification(title, body, meetingId, notificationId)
     }
 
     private fun showNotification(title: String, body: String?, meetingId: Long?, notificationId: Long?) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                CHANNEL_ID,
-                CHANNEL_NAME,
-                NotificationManager.IMPORTANCE_HIGH,
-            ).apply {
-                enableVibration(true)
-            }
-            getSystemService(NotificationManager::class.java).createNotificationChannel(channel)
-        }
+        NotificationChannels.createDefaultChannel(this)
 
         val granted = ContextCompat.checkSelfPermission(
             this,
             Manifest.permission.POST_NOTIFICATIONS,
         ) == PackageManager.PERMISSION_GRANTED
         if (!granted) return
 
-        val androidNotificationId = notificationIdGenerator.incrementAndGet()
+        val androidNotificationId = (notificationId ?: System.currentTimeMillis()).toInt()
 
         val contentIntent = packageManager.getLaunchIntentForPackage(packageName)?.apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
@@ -101,7 +88,7 @@ class MoiveFirebaseMessagingService: FirebaseMessagingService() {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
         )
 
-        val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+        val notification = NotificationCompat.Builder(this, NotificationChannels.defaultChannelId(this))
             .setSmallIcon(R.drawable.img_logo_white_bg)
             .setContentTitle(title)
             .setContentText(body)
@@ -118,9 +105,6 @@ class MoiveFirebaseMessagingService: FirebaseMessagingService() {
         const val MESSAGE_NOTIFICATION_ID = "notificationId"
         private const val MESSAGE_TITLE = "title"
         private const val MESSAGE_BODY = "body"
-        private const val CHANNEL_ID = "moive_default_channel"
-        private const val CHANNEL_NAME = "일반 알림"
         private const val DEVICE_TOKEN_PUT_SUCCESS_MESSAGE = "디바이스 토큰 등록 성공"
-        private val notificationIdGenerator = AtomicInteger(0)
     }
 }

app/src/main/java/com/moive/app/core/fcm/NotificationChannels.kt

@@ -0,0 +1,27 @@
+package com.moive.app.core.fcm
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import com.moive.app.R
+
+object NotificationChannels {
+    private const val DEFAULT_CHANNEL_NAME = "일반 알림"
+
+    fun defaultChannelId(context: Context): String =
+        context.getString(R.string.default_notification_channel_id)
+
+    fun createDefaultChannel(context: Context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+
+        val channel = NotificationChannel(
+            defaultChannelId(context),
+            DEFAULT_CHANNEL_NAME,
+            NotificationManager.IMPORTANCE_HIGH,
+        ).apply {
+            enableVibration(true)
+        }
+        context.getSystemService(NotificationManager::class.java).createNotificationChannel(channel)
+    }
+}

app/src/main/java/com/moive/app/data/meeting/mapper/MeetingDetailMapper.kt

@@ -32,4 +32,7 @@ fun ParticipantResponse.toModel(): ParticipantItemModel =
         statusLabel = participantStateLabel,
         isMe = isMe,
         isDone = participantState.endsWith("_DONE"),
+        isVoteDone = participantState == VOTE_DONE_STATE,
     )
+
+private const val VOTE_DONE_STATE = "VOTE_DONE"

app/src/main/java/com/moive/app/data/meeting/model/MeetingDetailModel.kt

@@ -31,4 +31,5 @@ data class ParticipantItemModel(
     val statusLabel: String,
     val isMe: Boolean,
     val isDone: Boolean,
+    val isVoteDone: Boolean,
 )

app/src/main/java/com/moive/app/presentation/common/component/ShadowButton.kt

@@ -4,15 +4,14 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
 import com.moive.app.core.designsystem.component.button.MoiveButton
 import com.moive.app.core.designsystem.component.button.MoiveButtonSize
 import com.moive.app.core.designsystem.component.button.MoiveButtonType
 import com.moive.app.core.designsystem.theme.MoiveTheme.colors
-import com.moive.app.core.designsystem.theme.MoiveTheme.radius
 import com.moive.app.core.extensions.customShadow
 
 @Composable
@@ -30,10 +29,7 @@ fun ShadowButton(
             .then(
                 if (showShadow) {
                     Modifier.customShadow(
-                        shape = RoundedCornerShape(
-                            topStart = radius.md,
-                            topEnd = radius.md,
-                        ),
+                        shape = RectangleShape,
                         color = colors.shadowBlack8,
                         blur = 12.dp,
                     )
@@ -43,10 +39,6 @@ fun ShadowButton(
             )
             .background(
                 color = colors.background.default00,
-                shape = RoundedCornerShape(
-                    topStart = radius.md,
-                    topEnd = radius.md,
-                ),
             )
     ) {
         MoiveButton(

app/src/main/java/com/moive/app/presentation/condition/ConditionViewModel.kt

@@ -133,7 +133,7 @@ class ConditionViewModel @Inject constructor(
         }
     }
 
-    fun onDateNextClick() {
+    fun onDateSaveClick() {
         val state = _uiState.value
         val pending = state.pendingDateTime
         val isNewDate = pending != null && state.confirmedDateTimes.none {
@@ -156,7 +156,7 @@ class ConditionViewModel @Inject constructor(
         }
     }
 
-    fun onDateSaveClick() {
+    fun onDateNextClick() {
         _uiState.update {
             it.copy(
                 isDateBottomSheetVisible = false,

app/src/main/java/com/moive/app/presentation/condition/component/DateBottomSheet.kt

@@ -90,14 +90,14 @@ fun DateBottomSheet(
                     text = "저장",
                     type = MoiveButtonType.TERTIARY,
                     size = MoiveButtonSize.LARGE,
+                    enabled = state.pendingDateTime != null,
                     onClick = onSaveDateClick,
                     modifier = Modifier.weight(1f),
                 )
                 MoiveButton(
                     text = "다음",
                     type = MoiveButtonType.PRIMARY,
                     size = MoiveButtonSize.LARGE,
-                    enabled = state.pendingDateTime != null,
                     onClick = onNextDateClick,
                     modifier = Modifier.weight(1f),
                 )

app/src/main/java/com/moive/app/presentation/home/HomeContract.kt

@@ -2,6 +2,7 @@ package com.moive.app.presentation.home
 
 import androidx.compose.runtime.Immutable
 import com.moive.app.data.home.mapper.MeetingTab
+import com.moive.app.data.home.mapper.toMeetingTab
 import com.moive.app.data.home.model.MyMeetingCardItemModel
 import com.moive.app.data.home.model.ConfirmedMeetingItemModel
 import kotlinx.collections.immutable.ImmutableList
@@ -27,6 +28,13 @@ interface HomeContract {
         val displayedMyMeetingList: ImmutableList<MyMeetingCardItemModel>
             get() = myMeetingList.take(MY_MEETING_LIST_MAX_SIZE).toImmutableList()
 
+        val emptyMyMeetingMessage: String
+            get() = when (selectedTab.toMeetingTab()) {
+                MeetingTab.ALL -> "아직 참여 중인 모임이 없어요."
+                MeetingTab.UPCOMING -> "예정된 모임이 없어요."
+                MeetingTab.PAST -> "지난 모임이 없어요."
+            }
+
         companion object {
             private const val MY_MEETING_LIST_MAX_SIZE = 5
         }

app/src/main/java/com/moive/app/presentation/home/HomeScreen.kt

@@ -223,7 +223,7 @@ private fun HomeScreen(
                             )
 
                             Text(
-                                text = "아직 참여 중인 모임이 없어요.",
+                                text = uiState.emptyMyMeetingMessage,
                                 color = colors.text.subtle,
                                 style = typography.body.smNormalR,
                             )

app/src/main/java/com/moive/app/presentation/home/component/ConfirmedMeetingCardItem.kt

@@ -18,6 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.moive.app.R
@@ -101,6 +102,8 @@ fun ConfirmedMeetingCardItem(
                 text = location,
                 color = colors.text.onBg,
                 style = typography.body.smNormalR,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
             )
         }
 

app/src/main/java/com/moive/app/presentation/login/component/AgreementBottomSheet.kt

@@ -17,8 +17,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,6 +38,7 @@ import com.moive.app.core.designsystem.component.bottomsheet.MoiveBottomSheet
 import com.moive.app.core.designsystem.component.button.MoiveButton
 import com.moive.app.core.designsystem.component.button.MoiveButtonSize
 import com.moive.app.core.designsystem.component.button.MoiveButtonType
+import com.moive.app.core.designsystem.component.toast.LocalSnackbarHostState
 import com.moive.app.core.designsystem.theme.MoiveTheme
 import com.moive.app.core.designsystem.theme.MoiveTheme.colors
 import com.moive.app.core.designsystem.theme.MoiveTheme.radius
@@ -137,7 +140,7 @@ private fun AllAgreementButton(
                 shape = RoundedCornerShape(radius.md),
             )
             .background(
-                color = if (isPressed) colors.fill.default06 else colors.fill.default07,
+                color = if (isPressed || isChecked) colors.fill.default06 else colors.fill.default07,
                 shape = RoundedCornerShape(radius.md),
             )
             .noRippleClickable(onClick = { onAllAgreementClick(!isChecked) })
@@ -216,31 +219,34 @@ private fun AgreementBottomSheetPreview() {
         var isServiceAgreed by remember { mutableStateOf(false) }
         var isPrivacyAgreed by remember { mutableStateOf(false) }
         var isMarketingAgreed by remember { mutableStateOf(false) }
+        val snackbarHostState = remember { SnackbarHostState() }
+
+        CompositionLocalProvider(LocalSnackbarHostState provides snackbarHostState) {
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                MoiveButton(
+                    text = "약관동의 바텀시트 열기",
+                    type = MoiveButtonType.PRIMARY,
+                    size = MoiveButtonSize.LARGE,
+                    onClick = { showBottomSheet = true },
+                )
+            }
 
-        Box(
-            modifier = Modifier.fillMaxSize(),
-            contentAlignment = Alignment.Center,
-        ) {
-            MoiveButton(
-                text = "약관동의 바텀시트 열기",
-                type = MoiveButtonType.PRIMARY,
-                size = MoiveButtonSize.LARGE,
-                onClick = { showBottomSheet = true },
-            )
-        }
-
-        if (showBottomSheet) {
-            AgreementBottomSheet(
-                isServiceAgreed = isServiceAgreed,
-                isPrivacyAgreed = isPrivacyAgreed,
-                isMarketingAgreed = isMarketingAgreed,
-                isConfirmEnabled = isServiceAgreed && isPrivacyAgreed,
-                onServiceClick = { isServiceAgreed = it },
-                onPrivacyClick = { isPrivacyAgreed = it },
-                onMarketingClick = { isMarketingAgreed = it },
-                onConfirmClick = {},
-                onDismissRequest = { showBottomSheet = false },
-            )
+            if (showBottomSheet) {
+                AgreementBottomSheet(
+                    isServiceAgreed = isServiceAgreed,
+                    isPrivacyAgreed = isPrivacyAgreed,
+                    isMarketingAgreed = isMarketingAgreed,
+                    isConfirmEnabled = isServiceAgreed && isPrivacyAgreed,
+                    onServiceClick = { isServiceAgreed = it },
+                    onPrivacyClick = { isPrivacyAgreed = it },
+                    onMarketingClick = { isMarketingAgreed = it },
+                    onConfirmClick = {},
+                    onDismissRequest = { showBottomSheet = false },
+                )
+            }
         }
     }
 }

app/src/main/java/com/moive/app/presentation/main/MainActivity.kt

@@ -155,14 +155,15 @@ class MainActivity : ComponentActivity() {
 private fun Intent.extractInviteCode(): String? =
     takeIf { it.action == Intent.ACTION_VIEW }?.data?.lastPathSegment
 
-private fun Intent.extractMeetingId(): Long? {
-    val meetingId = getLongExtra(MoiveFirebaseMessagingService.MESSAGE_MEETING_ID, -1L)
-    if (meetingId != -1L) removeExtra(MoiveFirebaseMessagingService.MESSAGE_MEETING_ID)
-    return meetingId.takeIf { it != -1L }
-}
+private fun Intent.extractMeetingId(): Long? =
+    extractLongExtra(MoiveFirebaseMessagingService.MESSAGE_MEETING_ID)
+
+private fun Intent.extractNotificationId(): Long? =
+    extractLongExtra(MoiveFirebaseMessagingService.MESSAGE_NOTIFICATION_ID)
 
-private fun Intent.extractNotificationId(): Long? {
-    val notificationId = getLongExtra(MoiveFirebaseMessagingService.MESSAGE_NOTIFICATION_ID, -1L)
-    if (notificationId != -1L) removeExtra(MoiveFirebaseMessagingService.MESSAGE_NOTIFICATION_ID)
-    return notificationId.takeIf { it != -1L }
+private fun Intent.extractLongExtra(key: String): Long? {
+    val value = getLongExtra(key, -1L).takeIf { it != -1L }
+        ?: getStringExtra(key)?.toLongOrNull()
+    removeExtra(key)
+    return value
 }