[FEAT/#1464] 앱잼탬프 네비게이션 연결

app/src/main/java/org/sopt/official/feature/navigator/NavigatorProviderIntent.kt

@@ -27,6 +27,7 @@ package org.sopt.official.feature.navigator
 import android.content.Context
 import android.content.Intent
 import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import org.sopt.official.common.navigator.DeepLinkType
 import org.sopt.official.common.navigator.NavigatorProvider
 import org.sopt.official.feature.attendance.AttendanceActivity
@@ -41,7 +42,6 @@ import org.sopt.official.feature.notification.detail.NotificationDetailActivity
 import org.sopt.official.feature.schedule.ScheduleActivity
 import org.sopt.official.model.UserStatus
 import org.sopt.official.stamp.feature.navigation.SoptampMissionArgs
-import javax.inject.Inject
 
 class NavigatorProviderIntent @Inject constructor(
     @param:ApplicationContext private val context: Context,
@@ -114,15 +114,22 @@ class NavigatorProviderIntent @Inject constructor(
         }
     }
 
-    override fun getPokeNotificationActivityIntent(name: String) : Intent {
+    override fun getAppjamtampActivityIntent(): Intent {
+        return Intent(context, MainActivity::class.java).apply {
+            putExtra("isAppjamtampDeepLink", true)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
+        }
+    }
+
+    override fun getPokeNotificationActivityIntent(name: String): Intent {
         return Intent(context, MainActivity::class.java).apply {
             putExtra("userStatus", name)
             putExtra("isPokeNotification", true)
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
         }
     }
 
-    override fun getPokeFriendListSummaryActivityIntent(name: String, friendType: String?) : Intent {
+    override fun getPokeFriendListSummaryActivityIntent(name: String, friendType: String?): Intent {
         return Intent(context, MainActivity::class.java).apply {
             putExtra("userStatus", name)
             putExtra("friendType", friendType)

core/common/src/main/java/org/sopt/official/common/navigator/DeepLinkType.kt

@@ -103,6 +103,11 @@ enum class DeepLinkType(
         override fun getIntent(context: Context, userStatus: UserStatus, deepLink: String) =
             userStatus.setIntent(navigator.getSoptampActivityIntent())
     },
+    APPJAMTAMP("appjamtamp") {
+        override fun getIntent(context: Context, userStatus: UserStatus, deepLink: String) =
+            userStatus.setIntent(navigator.getAppjamtampActivityIntent())
+    },
+
     // TODO - 콕찌르기 이슈 해결되면 딥링크에서 home 제거해야 함 (서버 변경으로 home 제거)
     POKE_NOTIFICATION_LIST("home/poke/notification-list") {
         override fun getIntent(context: Context, userStatus: UserStatus, deepLink: String) =

core/common/src/main/java/org/sopt/official/common/navigator/NavigatorProvider.kt

@@ -38,6 +38,7 @@ interface NavigatorProvider {
     fun getAdjustSentenceActivityIntent(): Intent
     fun getAttendanceActivityIntent(): Intent
     fun getSoptampActivityIntent(): Intent
+    fun getAppjamtampActivityIntent(): Intent
     fun getPokeNotificationActivityIntent(name: String): Intent
     fun getPokeFriendListSummaryActivityIntent(name: String, friendType: String?): Intent
     fun getPokeActivityIntent(userStatus: UserStatus): Intent

data/appjamtamp/src/main/java/org/sopt/official/data/appjamtamp/dto/response/AppjamtampMissionsResponseDto.kt

@@ -8,16 +8,16 @@ import org.sopt.official.domain.appjamtamp.entity.AppjamtampMissionListEntity
 @Serializable
 data class AppjamtampMissionsResponseDto(
     @SerialName("teamNumber")
-    val teamNumber: String,
+    val teamNumber: String?,
     @SerialName("teamName")
-    val teamName: String,
+    val teamName: String?,
     @SerialName("missions")
     val missions: List<AppjamtampMissionItemDto>
 ) {
     fun toEntity(): AppjamtampMissionListEntity {
         return AppjamtampMissionListEntity(
-            teamNumber = teamNumber,
-            teamName = teamName,
+            teamNumber = teamNumber.orEmpty(),
+            teamName = teamName.orEmpty(),
             missions = missions.map { it.toEntity() }
         )
     }

data/appjamtamp/src/main/java/org/sopt/official/data/appjamtamp/dto/response/AppjamtampMyAppjamInfoResponseDto.kt

@@ -7,18 +7,18 @@ import org.sopt.official.domain.appjamtamp.entity.AppjamtampMyAppjamInfoEntity
 @Serializable
 data class AppjamtampMyAppjamInfoResponseDto(
     @SerialName("teamNumber")
-    val teamNumber: String,
+    val teamNumber: String?,
 
     @SerialName("teamName")
-    val teamName: String,
+    val teamName: String?,
 
     @SerialName("isAppjamJoined")
     val isAppjamJoined: Boolean
 ) {
     fun toEntity(): AppjamtampMyAppjamInfoEntity {
         return AppjamtampMyAppjamInfoEntity(
-            teamNumber = teamNumber,
-            teamName = teamName,
+            teamNumber = teamNumber.orEmpty(),
+            teamName = teamName.orEmpty(),
             isAppjamJoined = isAppjamJoined
         )
     }

data/appjamtamp/src/main/java/org/sopt/official/data/appjamtamp/dto/response/AppjamtampTop10MissionScoreResponse.kt

@@ -13,13 +13,12 @@ data class AppjamtampTop10MissionScoreResponse(
 data class AppjamtampMissionScoreResponse(
     @SerialName("rank")
     val rank: Int,
-
     @SerialName("teamName")
     val teamName: String,
-
+    @SerialName("teamNumber")
+    val teamNumber: String,
     @SerialName("todayPoints")
     val todayPoints: Int,
-
     @SerialName("totalPoints")
     val totalPoints: Int
 )

data/appjamtamp/src/main/java/org/sopt/official/data/appjamtamp/mapper/AppjamptampMapper.kt

@@ -2,8 +2,8 @@ package org.sopt.official.data.appjamtamp.mapper
 
 import org.sopt.official.data.appjamtamp.dto.response.AppjamtampMissionScoreResponse
 import org.sopt.official.data.appjamtamp.dto.response.AppjamtampRecentMissionResponse
-import org.sopt.official.data.appjamtamp.dto.response.AppjamtampTop3RecentMissionResponse
 import org.sopt.official.data.appjamtamp.dto.response.AppjamtampTop10MissionScoreResponse
+import org.sopt.official.data.appjamtamp.dto.response.AppjamtampTop3RecentMissionResponse
 import org.sopt.official.domain.appjamtamp.entity.AppjamtampMissionScore
 import org.sopt.official.domain.appjamtamp.entity.AppjamtampRecentMission
 
@@ -34,6 +34,7 @@ internal fun AppjamtampMissionScoreResponse.toDomain(): AppjamtampMissionScore {
     return AppjamtampMissionScore(
         rank = this.rank,
         teamName = this.teamName,
+        teamNumber = this.teamNumber,
         todayPoints = this.todayPoints,
         totalPoints = this.todayPoints
     )

domain/appjamtamp/src/main/java/org/sopt/official/domain/appjamtamp/entity/AppjamtampMissionScore.kt

@@ -3,6 +3,7 @@ package org.sopt.official.domain.appjamtamp.entity
 data class AppjamtampMissionScore(
     val rank: Int,
     val teamName: String,
+    val teamNumber: String,
     val todayPoints: Int,
     val totalPoints: Int
 )

feature/appjamtamp/src/main/java/org/sopt/official/feature/appjamtamp/component/MissionsGridComponent.kt

@@ -2,8 +2,6 @@ package org.sopt.official.feature.appjamtamp.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
@@ -17,27 +15,24 @@ import org.sopt.official.feature.appjamtamp.missionlist.model.AppjamtampMissionU
 
 @Composable
 internal fun MissionsGridComponent(
-    missionList : ImmutableList<AppjamtampMissionUiModel>,
+    missionList: ImmutableList<AppjamtampMissionUiModel>,
     modifier: Modifier = Modifier,
-    onMissionItemClick: (item: AppjamtampMissionUiModel) -> Unit = {},
+    onMissionItemClick: (item: AppjamtampMissionUiModel) -> Unit = {}
 ) {
     LazyVerticalGrid(
         modifier = modifier,
         columns = GridCells.Fixed(2),
         verticalArrangement = Arrangement.spacedBy(40.dp, Alignment.Top),
         horizontalArrangement = Arrangement.spacedBy(8.dp),
-        contentPadding = PaddingValues(bottom = 80.dp),
+        contentPadding = PaddingValues(bottom = 80.dp)
     ) {
         items(items = missionList) { mission ->
             MissionComponent(
                 mission = mission,
                 onClick = {
                     onMissionItemClick(mission)
-                },
+                }
             )
         }
-        item {
-            Spacer(modifier = Modifier.padding(vertical = 20.dp))
-        }
     }
-}
+}

feature/appjamtamp/src/main/java/org/sopt/official/feature/appjamtamp/missiondetail/MissionDetailRoute.kt

@@ -1,6 +1,7 @@
 package org.sopt.official.feature.appjamtamp.missiondetail
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -194,7 +195,9 @@ private fun MyEmptyMissionDetailScreen(
     ) {
         BackButtonHeader(
             title = "미션",
-            onBackButtonClick = onBackButtonClick
+            onBackButtonClick = onBackButtonClick,
+            modifier = Modifier
+                .padding(vertical = 12.dp)
         )
 
         Spacer(modifier = Modifier.height(10.dp))
@@ -257,80 +260,89 @@ private fun MissionDetailScreen(
     val scrollState = rememberScrollState()
     var isEditable by remember(uiState.viewType) { mutableStateOf(uiState.viewType == DetailViewType.EDIT) }
 
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
-            .systemBarsPadding()
             .padding(horizontal = 16.dp)
-            .verticalScroll(scrollState)
+            .systemBarsPadding(),
+        contentAlignment = Alignment.BottomCenter
     ) {
-        BackButtonHeader(
-            title = if (uiState.viewType == DetailViewType.COMPLETE) "내 미션" else uiState.teamName,
-            onBackButtonClick = onBackButtonClick,
-            trailingIcon = {
-                uiState.viewType.toolbarIcon?.let {
-                    Icon(
-                        imageVector = ImageVector.vectorResource(uiState.viewType.toolbarIcon),
-                        contentDescription = null,
-                        tint = SoptTheme.colors.onSurface10,
-                        modifier = Modifier
-                            .clickable(onClick = onToolbarIconClick)
-                    )
-                }
-            }
-        )
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState)
+                .align(Alignment.TopCenter)
+        ) {
+            BackButtonHeader(
+                title = if (uiState.viewType == DetailViewType.COMPLETE) "내 미션" else uiState.teamName,
+                onBackButtonClick = onBackButtonClick,
+                trailingIcon = {
+                    uiState.viewType.toolbarIcon?.let {
+                        Icon(
+                            imageVector = ImageVector.vectorResource(uiState.viewType.toolbarIcon),
+                            contentDescription = null,
+                            tint = SoptTheme.colors.onSurface10,
+                            modifier = Modifier
+                                .clickable(onClick = onToolbarIconClick)
+                        )
+                    }
+                },
+                modifier = Modifier
+                    .padding(vertical = 12.dp)
+            )
 
-        Spacer(modifier = Modifier.height(10.dp))
+            Spacer(modifier = Modifier.height(10.dp))
 
-        MissionHeader(
-            title = uiState.mission.title,
-            stamp = Stamp.findStampByLevel(uiState.mission.level)
-        )
+            MissionHeader(
+                title = uiState.mission.title,
+                stamp = Stamp.findStampByLevel(uiState.mission.level)
+            )
 
-        Spacer(modifier = Modifier.height(5.dp))
+            Spacer(modifier = Modifier.height(5.dp))
 
-        ImageContent(
-            imageModel = uiState.imageModel,
-            onChangeImage = onChangeImage,
-            onClickZoomIn = onClickZoomIn,
-            isEditable = isEditable
-        )
+            ImageContent(
+                imageModel = uiState.imageModel,
+                onChangeImage = onChangeImage,
+                onClickZoomIn = onClickZoomIn,
+                isEditable = isEditable
+            )
 
-        Spacer(modifier = Modifier.height(12.dp))
+            Spacer(modifier = Modifier.height(12.dp))
 
-        ProfileTag(
-            name = uiState.writer.name,
-            profileImage = uiState.writer.profileImage
-        )
+            ProfileTag(
+                name = uiState.writer.name,
+                profileImage = uiState.writer.profileImage
+            )
 
-        Spacer(modifier = Modifier.height(16.dp))
+            Spacer(modifier = Modifier.height(16.dp))
 
-        if (isEditable) {
-            DatePicker(
-                value = uiState.date,
-                placeHolder = "날짜를 입력해주세요.",
-                isEditable = true,
-                onClicked = onDatePickerClick
-            )
+            if (isEditable) {
+                DatePicker(
+                    value = uiState.date,
+                    placeHolder = "날짜를 입력해주세요.",
+                    isEditable = true,
+                    onClicked = onDatePickerClick
+                )
 
-            Spacer(modifier = Modifier.height(8.dp))
-        }
+                Spacer(modifier = Modifier.height(8.dp))
+            }
 
-        Memo(
-            value = uiState.content,
-            placeHolder = "함께한 사람과 어떤 추억을 남겼는지 작성해 주세요.",
-            onValueChange = onMemoChange,
-            isEditable = isEditable
-        )
-        Spacer(modifier = Modifier.height(8.dp))
+            Memo(
+                value = uiState.content,
+                placeHolder = "함께한 사람과 어떤 추억을 남겼는지 작성해 주세요.",
+                onValueChange = onMemoChange,
+                isEditable = isEditable
+            )
+            Spacer(modifier = Modifier.height(8.dp))
 
-        DetailInfo(
-            date = uiState.date,
-            clapCount = uiState.clapCount,
-            viewCount = uiState.viewCount
-        )
+            DetailInfo(
+                date = uiState.date,
+                clapCount = uiState.clapCount,
+                viewCount = uiState.viewCount
+            )
 
-        Spacer(modifier = Modifier.weight(1f))
+            Spacer(modifier = Modifier.height(120.dp))
+        }
 
         when (uiState.viewType) {
             DetailViewType.READ_ONLY -> {
@@ -340,7 +352,6 @@ private fun MissionDetailScreen(
                     onPressClap = onActionButtonClick,
                     modifier = Modifier
                         .fillMaxWidth()
-                        .align(Alignment.CenterHorizontally)
                 )
             }
 

feature/appjamtamp/src/main/java/org/sopt/official/feature/appjamtamp/missiondetail/MissionDetailState.kt

@@ -12,7 +12,7 @@ internal data class MissionDetailState(
     val isLoading: Boolean = true,
     val isFailed: Boolean = false,
 
-    val viewType: DetailViewType = DetailViewType.WRITE,
+    val viewType: DetailViewType = DetailViewType.READ_ONLY,
     val mission: Mission = Mission.DEFAULT,
     val imageModel: ImageModel = ImageModel.Empty,
     val date: String = "",

feature/appjamtamp/src/main/java/org/sopt/official/feature/appjamtamp/missiondetail/MissionDetailViewModel.kt

@@ -166,6 +166,12 @@ internal class MissionDetailViewModel @Inject constructor(
     }
 
     fun handleSubmit() {
+        with(_missionDetailState.value) {
+            if (content.isBlank()) return
+            if (imageModel is ImageModel.Empty) return
+            if (date.isBlank()) return
+        }
+
         _missionDetailState.update {
             it.copy(isLoading = true)
         }

feature/appjamtamp/src/main/java/org/sopt/official/feature/appjamtamp/missiondetail/navigation/AppjamtampMissionDetailNavigation.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.Serializable
 import org.sopt.official.core.navigation.Route
 
 @Serializable
-data class AppjamtampMissionDetail(
+internal data class AppjamtampMissionDetail(
     val missionId: Int = -1,
     val missionLevel: Int = 1,
     val title: String = "",