Merge pull request #67 from Nexters/dev

1.0.4 dev 브랜치를 main에 머지합니다.

Author: eshc123

build-logic/convention/src/main/kotlin/com/plottwist/tuk/Extension.kt

@@ -11,8 +11,8 @@ fun ApplicationExtension.configureDefaultConfig() {
     defaultConfig {
         applicationId = "com.plottwist.tuk"
         targetSdk = 36
-        versionCode = 8
-        versionName = "1.0.3"
+        versionCode = 10
+        versionName = "1.0.4"
 
         vectorDrawables {
             useSupportLibrary = true

core/data/src/main/java/com/plottwist/core/data/mapper/Gathering.kt

@@ -38,14 +38,17 @@ fun GatheringDetailData.toDomainModel() : GatheringDetail {
         gatheringIntervalDays = this.gatheringIntervalDays,
         sentProposalCount = this.sentProposalCount,
         receivedProposalCount = this.receivedProposalCount,
-        members = this.members.map { it.toDomainModel() }
+        members = this.members.map { it.toDomainModel() },
+        isHost = this.isHost
     )
 }
 
 fun GatheringMemberData.toDomainModel() : GatheringMember {
     return GatheringMember(
         memberId = this.memberId,
-        memberName = this.memberName
+        memberName = this.memberName,
+        isHost = this.isHost,
+        isMe = this.isMe
     )
 }
 

core/designsystem/src/main/res/drawable/image_double_quotation_marks_white.png

@@ -6,7 +6,7 @@
     <string name="home_bottom_sheet_stop_text">멈추기</string>
     <string name="home_bottom_create_gathering_description">모임을 생성하고\n넌지시 만남을 제안해 보세요</string>
     <string name="home_bottom_create_gathering_button_text">모임 생성하기</string>
-    <string name="home_last_alarm">마지막 알람</string>
+    <string name="home_last_alarm">마지막 연락</string>
     <string name="home_random_proposal_description_prefix">말이 안되는거 알지만\n\n\n우리,</string>
     <string name="home_random_proposal_description_suffix">어때</string>
     <string name="home_proposals">받은 초대장</string>

core/designsystem/src/main/res/drawable/img_app_name.png

@@ -18,12 +18,15 @@ data class GatheringDetail(
     val gatheringIntervalDays: Long = 0,
     val sentProposalCount: Int = 0,
     val receivedProposalCount: Int = 0,
-    val members: List<GatheringMember> = emptyList()
+    val members: List<GatheringMember> = emptyList(),
+    val isHost: Boolean = false
 )
 
 data class GatheringMember(
     val memberId: Long = 0,
-    val memberName: String = ""
+    val memberName: String = "",
+    val isHost: Boolean = false,
+    val isMe: Boolean = false
 )
 
 data class Purposes(

core/designsystem/src/main/res/drawable/img_login_cover.png

@@ -19,11 +19,14 @@ data class GatheringDetailData(
     val gatheringIntervalDays: Long,
     val sentProposalCount: Int,
     val receivedProposalCount: Int,
-    val members: List<GatheringMemberData>
+    val members: List<GatheringMemberData>,
+    val isHost: Boolean
 )
 
 @Serializable
 data class GatheringMemberData(
     val memberId: Long,
-    val memberName: String
+    val memberName: String,
+    val isHost: Boolean,
+    val isMe: Boolean
 )

core/designsystem/src/main/res/values/strings.xml

@@ -2,6 +2,7 @@ package com.plottwist.core.push
 
 import android.app.PendingIntent
 import android.content.Intent
+import com.google.firebase.messaging.Constants
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.plottwist.core.notification.TukNotificationManager
@@ -15,20 +16,16 @@ class TukFirebaseMessagingService : FirebaseMessagingService() {
     @Inject
     lateinit var tukNotificationManager: TukNotificationManager
 
-
     override fun onNewToken(token: String) {
         super.onNewToken(token)
     }
 
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
-
-        message.notification?.let { notificationMessage ->
-            val title = notificationMessage.title ?: TukNotificationManager.DEFAULT_TITLE
-            val description = notificationMessage.body ?: TukNotificationManager.DEFAULT_DESCRIPTION
-            val deeplink = message.data.get("deepLink") ?: ""
-            sendNotification(title, description, deeplink)
-        }
+        val title = message.data.get("title") ?: ""
+        val description = message.data.get("body") ?: ""
+        val deeplink = message.data.get("deepLink") ?: ""
+        sendNotification(title, description, deeplink)
     }
 
     private fun sendNotification(title: String, description: String, deeplink: String) {
@@ -52,4 +49,17 @@ class TukFirebaseMessagingService : FirebaseMessagingService() {
             )
         )
     }
+
+
+    override fun handleIntent(intent: Intent?) {
+        val newIntent = intent?.apply {
+            val newExtras = extras?.apply {
+                remove(Constants.MessageNotificationKeys.ENABLE_NOTIFICATION)
+                remove("gcm.notification.e")
+            }
+            replaceExtras(newExtras)
+        }
+        super.handleIntent(newIntent)
+
+    }
 }

core/domain/src/main/java/com/plottwist/core/domain/model/Gathering.kt

@@ -6,8 +6,10 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
@@ -82,6 +84,7 @@ fun GatheringDetailScreen(
         lastAlarm = state.gatheringDetail.lastPushRelativeTime,
         sentProposalCount = state.gatheringDetail.sentProposalCount,
         receivedProposalCount = state.gatheringDetail.receivedProposalCount,
+        isHost = state.gatheringDetail.isHost,
         onAlarmSettingClick = {
             viewModel.handleAction(GatheringDetailAction.ClickAlarmSetting)
         },
@@ -110,6 +113,7 @@ private fun GatheringDetailScreen(
     lastAlarm: String,
     sentProposalCount: Int,
     receivedProposalCount: Int,
+    isHost: Boolean,
     onAlarmSettingClick: () -> Unit,
     onProposalClick: () -> Unit,
     onSentProposalClick: () -> Unit,
@@ -138,10 +142,14 @@ private fun GatheringDetailScreen(
             }
 
             item(key = Items.ALARM_SETTING) {
-                GatheringAlarmSetting(
-                    modifier = Modifier.padding(top = 24.dp),
-                    onClick = onAlarmSettingClick
-                )
+                if(isHost) {
+                    GatheringAlarmSetting(
+                        modifier = Modifier.padding(top = 24.dp),
+                        onClick = onAlarmSettingClick
+                    )
+                } else {
+                    Spacer(modifier = Modifier.fillMaxWidth().height(44.dp))
+                }
             }
 
             item(key = Items.GATHERING_INFO) {
@@ -243,6 +251,7 @@ private fun GatheringDetailScreenPreview() {
         lastAlarm = "3달 전",
         sentProposalCount = 99,
         receivedProposalCount = 99,
+        isHost = true,
         onAlarmSettingClick = {},
         onProposalClick = {},
         onSentProposalClick = {},