🔀 :: (#960) 새벽 자습 신청 기능 구현

app/src/main/kotlin/team/aliens/dms/android/app/navigation/DmsNavKeys.kt

@@ -26,6 +26,9 @@ data object VoteScreenNav : NavKey
 @Serializable
 data object RemainScreenNav : NavKey
 
+@Serializable
+data object LateStudyNav : NavKey
+
 @Serializable
 data object MyPageScreenNav : NavKey
 
@@ -84,4 +87,4 @@ data class SignUpSetPasswordNav(val signUpData: SignUpData) : NavKey
 data class SignUpTermsNav(val signUpData: SignUpData) : NavKey
 
 @Serializable
-data object SignUpCompleteNav : NavKey
+data object SignUpCompleteNav : NavKey

app/src/main/kotlin/team/aliens/dms/android/app/ui/DmsApp.kt

@@ -40,6 +40,7 @@ import team.aliens.dms.android.app.navigation.SettingScreenNav
 import team.aliens.dms.android.app.navigation.SignInScreenNav
 import team.aliens.dms.android.app.navigation.VoteScreenNav
 import team.aliens.dms.android.app.MainActivityViewModel
+import team.aliens.dms.android.app.navigation.LateStudyNav
 import team.aliens.dms.android.core.designsystem.snackbar.DmsSnackBar
 import team.aliens.dms.android.core.designsystem.snackbar.DmsSnackBarVisuals
 import team.aliens.dms.android.core.ui.navigation.LocalResultStore
@@ -81,8 +82,10 @@ import team.aliens.dms.android.app.navigation.SignUpEnterStudentNumberNav
 import team.aliens.dms.android.app.navigation.SignUpSetIdNav
 import team.aliens.dms.android.app.navigation.SignUpSetPasswordNav
 import team.aliens.dms.android.app.navigation.SignUpTermsNav
+import team.aliens.dms.android.feature.latestudy.navigation.LateStudyRoute
 import java.util.UUID
 
+
 @Composable
 fun DmsApp(
     appState: DmsAppState = rememberDmsAppState(),
@@ -205,6 +208,9 @@ fun DmsApp(
                                 onShowSnackBar = { snackBarType, message ->
                                     appState.showSnackBar(snackBarType, message)
                                 },
+                                onNavigateLateStudyApplication = {
+                                    backStack.add(LateStudyNav)
+                                }
                             )
                         }
                         entry<VoteScreenNav> {
@@ -226,6 +232,16 @@ fun DmsApp(
                                 }
                             )
                         }
+                        entry<LateStudyNav> {
+                            LateStudyRoute(
+                                onBack = {
+                                    backStack.remove(LateStudyNav)
+                                },
+                                onShowSnackBar = { snackBarType, message ->
+                                    appState.showSnackBar(snackBarType, message)
+                                },
+                            )
+                        }
                         entry<MyPageScreenNav> {
                             MyPageRoute(
                                 onNavigatePointHistory = {

core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/card/ApplicationChipStyle.kt

@@ -0,0 +1,8 @@
+package team.aliens.dms.android.core.designsystem.card
+
+enum class ApplicationChipStyle {
+    DEFAULT,
+    APPROVED,
+    REJECTED,
+    PENDING,
+}

core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/card/DmsApplicationCard.kt

@@ -39,6 +39,7 @@ fun DmsApplicationCard(
     description: String? = null,
     period: String? = null,
     appliedTitle: String? = null,
+    chipStyle: ApplicationChipStyle = ApplicationChipStyle.DEFAULT,
     isSelected: Boolean = false,
 ) {
     val borderColor by animateColorAsState(
@@ -47,7 +48,11 @@ fun DmsApplicationCard(
         } else {
             DmsTheme.colorScheme.surfaceTint
         },
+        label = "",
     )
+
+    val displayTitle = appliedTitle ?: chipStyle.toDisplayText()
+
     Column(
         modifier = modifier
             .fillMaxWidth()
@@ -70,32 +75,39 @@ fun DmsApplicationCard(
                 painter = painterResource(iconRes),
                 contentDescription = null,
             )
+
             Text(
                 modifier = Modifier.padding(start = 8.dp),
                 text = title,
                 style = DmsTheme.typography.bodyB,
                 color = DmsTheme.colorScheme.inverseOnSurface,
             )
+
             Spacer(modifier = Modifier.weight(1f))
-            if (description == null && appliedTitle != null) {
+
+            if (description == null && displayTitle != null) {
                 AppliedTitleText(
+                    appliedTitle = displayTitle,
                     modifier = Modifier.endPadding(16.dp),
-                    appliedTitle = appliedTitle,
+                    chipStyle = chipStyle,
                 )
             }
+
             Icon(
                 painter = painterResource(DmsIcon.Forward),
                 tint = DmsTheme.colorScheme.scrim,
                 contentDescription = null,
             )
         }
+
         period?.let {
             Text(
                 text = period,
                 style = DmsTheme.typography.labelM,
                 color = DmsTheme.colorScheme.onPrimaryContainer,
             )
         }
+
         description?.let {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
@@ -106,9 +118,14 @@ fun DmsApplicationCard(
                     style = DmsTheme.typography.labelM,
                     color = DmsTheme.colorScheme.inverseSurface,
                 )
+
                 Spacer(modifier = Modifier.weight(1f))
-                appliedTitle?.let {
-                    AppliedTitleText(appliedTitle = appliedTitle)
+
+                if (displayTitle != null) {
+                    AppliedTitleText(
+                        appliedTitle = displayTitle,
+                        chipStyle = chipStyle,
+                    )
                 }
             }
         }
@@ -119,16 +136,40 @@ fun DmsApplicationCard(
 private fun AppliedTitleText(
     appliedTitle: String,
     modifier: Modifier = Modifier,
+    chipStyle: ApplicationChipStyle = ApplicationChipStyle.DEFAULT,
 ) {
+    val backgroundColor = when (chipStyle) {
+        ApplicationChipStyle.DEFAULT -> DmsTheme.colorScheme.primary
+        ApplicationChipStyle.APPROVED -> DmsTheme.colorScheme.primary
+        ApplicationChipStyle.REJECTED -> DmsTheme.colorScheme.errorContainer
+        ApplicationChipStyle.PENDING -> DmsTheme.colorScheme.surfaceVariant
+    }
+
+    val textColor = when (chipStyle) {
+        ApplicationChipStyle.DEFAULT -> DmsTheme.colorScheme.onPrimaryContainer
+        ApplicationChipStyle.APPROVED -> DmsTheme.colorScheme.onPrimaryContainer
+        ApplicationChipStyle.REJECTED -> DmsTheme.colorScheme.onErrorContainer
+        ApplicationChipStyle.PENDING -> DmsTheme.colorScheme.inverseSurface
+    }
+
     Text(
         modifier = modifier
             .background(
-                color = DmsTheme.colorScheme.primary,
+                color = backgroundColor,
                 shape = RoundedCornerShape(6.dp),
             )
             .padding(horizontal = 22.dp, vertical = 8.dp),
         text = appliedTitle,
         style = DmsTheme.typography.labelB,
-        color = DmsTheme.colorScheme.onPrimaryContainer,
+        color = textColor,
     )
 }
+
+private fun ApplicationChipStyle.toDisplayText(): String? {
+    return when (this) {
+        ApplicationChipStyle.APPROVED -> "승인됨"
+        ApplicationChipStyle.REJECTED -> "거절됨"
+        ApplicationChipStyle.PENDING -> "신청 중"
+        ApplicationChipStyle.DEFAULT -> null
+    }
+}

data/src/main/kotlin/team/aliens/dms/android/data/latestudy/di/LateStudyRepositoryModule.kt

@@ -0,0 +1,18 @@
+package team.aliens.dms.android.data.latestudy.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import team.aliens.dms.android.data.latestudy.repository.LateStudyRepositoryImpl
+import team.aliens.dms.android.data.latestudy.repository.LateStudyRepository
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class LateStudyRepositoryModule {
+
+    @Binds
+    abstract fun bindLateStudyRepository(
+        lateStudyRepositoryImpl: LateStudyRepositoryImpl,
+    ): LateStudyRepository
+}

data/src/main/kotlin/team/aliens/dms/android/data/latestudy/mapper/StudyTypeMapper.kt

@@ -0,0 +1,12 @@
+package team.aliens.dms.android.data.latestudy.mapper
+
+import team.aliens.dms.android.data.latestudy.model.StudyType
+import team.aliens.dms.android.network.latestudy.model.FetchStudyTypesResponse
+
+fun FetchStudyTypesResponse.toModel(): List<StudyType> =
+    types.map {
+        StudyType(
+            id = it.id,
+            name = it.name,
+        )
+    }

data/src/main/kotlin/team/aliens/dms/android/data/latestudy/model/StudyType.kt

@@ -0,0 +1,6 @@
+package team.aliens.dms.android.data.latestudy.model
+
+data class StudyType(
+    val id: String,
+    val name: String,
+)

data/src/main/kotlin/team/aliens/dms/android/data/latestudy/repository/LateStudyRepository.kt

@@ -0,0 +1,17 @@
+package team.aliens.dms.android.data.latestudy.repository
+
+import team.aliens.dms.android.data.latestudy.model.StudyType
+import team.aliens.dms.android.network.latestudy.model.StudyApplicationStatusResponse
+import team.aliens.dms.android.network.latestudy.model.SubmitLateStudyRequest
+import team.aliens.dms.android.network.latestudy.model.TeacherResponse
+
+interface LateStudyRepository {
+
+    suspend fun fetchStudyTypes(): List<StudyType>
+
+    suspend fun fetchTeachers(): List<TeacherResponse>
+
+    suspend fun fetchMyStudyApplicationStatus(): StudyApplicationStatusResponse
+
+    suspend fun submitLateStudy(request: SubmitLateStudyRequest)
+}

data/src/main/kotlin/team/aliens/dms/android/data/latestudy/repository/LateStudyRepositoryImpl.kt

@@ -0,0 +1,27 @@
+package team.aliens.dms.android.data.latestudy.repository
+
+import team.aliens.dms.android.data.latestudy.mapper.toModel
+import team.aliens.dms.android.data.latestudy.model.StudyType
+import team.aliens.dms.android.network.latestudy.datasource.NetworkLateStudyDataSource
+import team.aliens.dms.android.network.latestudy.model.StudyApplicationStatusResponse
+import team.aliens.dms.android.network.latestudy.model.SubmitLateStudyRequest
+import team.aliens.dms.android.network.latestudy.model.TeacherResponse
+import javax.inject.Inject
+
+class LateStudyRepositoryImpl @Inject constructor(
+    private val networkLateStudyDataSource: NetworkLateStudyDataSource,
+) : LateStudyRepository {
+
+    override suspend fun fetchStudyTypes(): List<StudyType> =
+        networkLateStudyDataSource.fetchStudyTypes().toModel()
+
+    override suspend fun fetchTeachers(): List<TeacherResponse> =
+        networkLateStudyDataSource.fetchTeachers().teachers
+
+    override suspend fun fetchMyStudyApplicationStatus(): StudyApplicationStatusResponse =
+        networkLateStudyDataSource.fetchMyStudyApplicationStatus()
+
+    override suspend fun submitLateStudy(request: SubmitLateStudyRequest) {
+        networkLateStudyDataSource.submitLateStudy(request)
+    }
+}

feature/src/main/kotlin/team/aliens/dms/android/feature/latestudy/navigation/LateStudyRoute.kt

@@ -0,0 +1,16 @@
+package team.aliens.dms.android.feature.latestudy.navigation
+
+import androidx.compose.runtime.Composable
+import team.aliens.dms.android.core.designsystem.snackbar.DmsSnackBarType
+import team.aliens.dms.android.feature.latestudy.ui.LateStudyScreen
+
+@Composable
+fun LateStudyRoute(
+    onBack: () -> Unit,
+    onShowSnackBar: (DmsSnackBarType, String) -> Unit,
+) {
+    LateStudyScreen(
+        onBack = onBack,
+        onShowSnackBar = onShowSnackBar,
+    )
+}