[TNT-000] QA 반영

app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FF2B0F</color>
+    <color name="ic_launcher_background">#FF472F</color>
 </resources>

core/designsystem/src/main/java/co/kr/tnt/designsystem/component/card/Card.kt

@@ -283,6 +283,7 @@ fun TnTSessionRecordCard(
 }
 
 @Composable
+@Suppress("UnusedParameter")
 fun TnTMemberProfileCard(
     name: String,
     profileImage: Painter,
@@ -293,12 +294,12 @@ fun TnTMemberProfileCard(
     modifier: Modifier = Modifier,
     onClick: () -> Unit,
 ) {
+    // TODO: clickable 추가
     Column(
         modifier = modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(12.dp))
             .background(TnTTheme.colors.commonColors.Common0)
-            .clickable(onClick = onClick)
             .padding(12.dp),
     ) {
         Row(

core/navigation/src/main/java/co/kr/tnt/navigation/RouteModel.kt

@@ -1,5 +1,6 @@
 package co.kr.tnt.navigation
 
+import co.kr.tnt.navigation.model.ScreenMode
 import kotlinx.serialization.Serializable
 
 // TODO Route 정리
@@ -35,7 +36,7 @@ sealed interface Route {
     ) : Route
 
     @Serializable
-    data class TrainerInvite(val isSkippable: Boolean) : Route
+    data class TrainerInvite(val screenMode: ScreenMode) : Route
 
     @Serializable
     data class TrainerConnect(
@@ -44,7 +45,7 @@ sealed interface Route {
     ) : Route
 
     @Serializable
-    data class TraineeConnect(val isSkippable: Boolean) : Route
+    data class TraineeConnect(val screenMode: ScreenMode) : Route
 
     @Serializable
     data object TrainerMain : Route

core/navigation/src/main/java/co/kr/tnt/navigation/model/ScreenMode.kt

@@ -0,0 +1,7 @@
+package co.kr.tnt.navigation.model
+
+enum class ScreenMode {
+    BACK,
+    SKIP,
+    CLOSE,
+}

data/repository/src/main/java/co/kr/data/repository/TraineeRepositoryImpl.kt

@@ -20,7 +20,6 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import java.io.File
 import java.time.LocalDate
-import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -54,7 +53,7 @@ internal class TraineeRepositoryImpl @Inject constructor(
 
     override suspend fun postMealRecord(
         mealImage: File?,
-        date: LocalDateTime,
+        date: String,
         mealType: String,
         memo: String,
     ) {
@@ -64,7 +63,7 @@ internal class TraineeRepositoryImpl @Inject constructor(
         }
 
         val mealRecordRequest = MealRecordRequest(
-            date = date.toString(),
+            date = date,
             dietType = mealType,
             memo = memo,
         )

domain/src/main/java/co/kr/tnt/domain/model/User.kt

@@ -32,7 +32,7 @@ sealed class User {
         val birthday: LocalDate?,
         val weight: Double?,
         val height: Int?,
-        val ptPurpose: List<String>,
+        val ptPurpose: List<String>?,
         val caution: String?,
         val isConnected: Boolean,
     ) : User() {

domain/src/main/java/co/kr/tnt/domain/repository/TraineeRepository.kt

@@ -6,13 +6,12 @@ import co.kr.tnt.domain.model.trainee.TraineeDailyRecordStatus
 import co.kr.tnt.domain.model.trainee.TraineeMealRecordDetail
 import java.io.File
 import java.time.LocalDate
-import java.time.LocalDateTime
 
 interface TraineeRepository {
     suspend fun getMyInfo(): User.Trainee
     suspend fun postMealRecord(
         mealImage: File?,
-        date: LocalDateTime,
+        date: String,
         mealType: String,
         memo: String,
     )

feature/main/src/main/java/co/kr/tnt/main/ui/TnTNavHost.kt

@@ -8,6 +8,7 @@ import androidx.navigation.compose.NavHost
 import co.kr.tnt.domain.model.UserType
 import co.kr.tnt.login.navigation.loginScreen
 import co.kr.tnt.login.navigation.navigateToLogin
+import co.kr.tnt.navigation.model.ScreenMode
 import co.kr.tnt.roleselect.navigateToRoleSelection
 import co.kr.tnt.roleselect.roleSelectionScreen
 import co.kr.tnt.trainee.connect.navigation.navigateToTraineeConnect
@@ -72,7 +73,7 @@ fun TnTNavHost(
             traineeSignUpScreen(
                 navigateToPrevious = navController::safePopBackStack,
                 navigateToConnect = {
-                    navController.navigateToTraineeConnect(isSkippable = true)
+                    navController.navigateToTraineeConnect(screenMode = ScreenMode.SKIP)
                 },
             )
             trainerInviteScreen(

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/CodeEntryPage.kt

@@ -7,11 +7,14 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -23,16 +26,18 @@ import co.kr.tnt.designsystem.component.button.TnTTextButton
 import co.kr.tnt.designsystem.component.button.model.ButtonSize
 import co.kr.tnt.designsystem.theme.TnTTheme
 import co.kr.tnt.feature.trainee.connect.R
+import co.kr.tnt.navigation.model.ScreenMode
 import co.kr.tnt.trainee.connect.component.CodeTextField
 import co.kr.tnt.trainee.connect.model.InputState
-import co.kr.tnt.core.ui.R as uiResource
+import co.kr.tnt.core.designsystem.R as uiResource
+import co.kr.tnt.core.ui.R as coreR
 
 @Composable
 internal fun CodeEntryPage(
     showDialog: Boolean,
     inviteCode: String,
     inputState: InputState,
-    isSkippable: Boolean,
+    screenMode: ScreenMode,
     onSkipClick: () -> Unit,
     onBackClick: () -> Unit,
     onNextClick: () -> Unit,
@@ -42,34 +47,52 @@ internal fun CodeEntryPage(
     onDismissPopup: () -> Unit,
 ) {
     BackHandler {
-        if (isSkippable) {
-            onSkipClick()
-        } else {
-            onBackClick()
+        when (screenMode) {
+            ScreenMode.BACK -> onBackClick()
+            ScreenMode.SKIP -> onSkipClick()
+            ScreenMode.CLOSE -> onBackClick()
         }
     }
 
     Scaffold(
         topBar = {
-            if (isSkippable) {
-                TnTTopBar(
-                    title = stringResource(uiResource.string.connect),
-                    trailingComponent = {
-                        Text(
-                            text = stringResource(uiResource.string.skip),
-                            color = TnTTheme.colors.neutralColors.Neutral400,
-                            style = TnTTheme.typography.body2Medium,
-                            modifier = Modifier.clickable {
-                                onSkipClick()
-                            },
-                        )
-                    },
-                )
-            } else {
-                TnTTopBarWithBackButton(
-                    title = stringResource(uiResource.string.connect),
-                    onBackClick = onBackClick,
-                )
+            when (screenMode) {
+                ScreenMode.BACK -> {
+                    TnTTopBarWithBackButton(
+                        title = stringResource(coreR.string.connect),
+                        onBackClick = onBackClick,
+                    )
+                }
+                ScreenMode.SKIP -> {
+                    TnTTopBar(
+                        title = stringResource(coreR.string.connect),
+                        trailingComponent = {
+                            Text(
+                                text = stringResource(coreR.string.skip),
+                                color = TnTTheme.colors.neutralColors.Neutral400,
+                                style = TnTTheme.typography.body2Medium,
+                                modifier = Modifier.clickable {
+                                    onSkipClick()
+                                },
+                            )
+                        },
+                    )
+                }
+                ScreenMode.CLOSE -> {
+                    TnTTopBar(
+                        title = stringResource(coreR.string.connect),
+                        trailingComponent = {
+                            IconButton(
+                                onClick = onBackClick,
+                            ) {
+                                Icon(
+                                    painter = painterResource(uiResource.drawable.ic_delete),
+                                    contentDescription = null,
+                                )
+                            }
+                        },
+                    )
+                }
             }
         },
         containerColor = TnTTheme.colors.commonColors.Common0,
@@ -100,7 +123,7 @@ internal fun CodeEntryPage(
                 )
             }
             TnTBottomButton(
-                text = stringResource(uiResource.string.next),
+                text = stringResource(coreR.string.next),
                 enabled = inputState.isValid,
                 onClick = onNextClick,
                 modifier = Modifier.align(Alignment.BottomCenter),
@@ -126,10 +149,10 @@ internal fun CodeEntryPage(
 private fun CodeEntryPagePreview() {
     TnTTheme {
         CodeEntryPage(
-            showDialog = true,
+            showDialog = false,
             inputState = InputState.FOCUS,
             inviteCode = "23A4SDA31",
-            isSkippable = false,
+            screenMode = ScreenMode.CLOSE,
             onSkipClick = {},
             onNextClick = {},
             onValidateClick = {},

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/TraineeConnectScreen.kt

@@ -6,6 +6,7 @@ import androidx.compose.runtime.getValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import co.kr.tnt.designsystem.snackbar.LocalSnackbar
+import co.kr.tnt.navigation.model.ScreenMode
 import co.kr.tnt.trainee.connect.TraineeConnectContract.TraineeConnectPage
 import co.kr.tnt.trainee.connect.TraineeConnectContract.TraineeConnectSideEffect
 import co.kr.tnt.trainee.connect.TraineeConnectContract.TraineeConnectUiEvent
@@ -14,7 +15,7 @@ import java.time.LocalDate
 
 @Composable
 internal fun TraineeConnectRoute(
-    isSkippable: Boolean,
+    screenMode: ScreenMode,
     navigateToPrevious: () -> Unit,
     navigateToHome: (Boolean) -> Unit,
     viewModel: TraineeConnectViewModel = hiltViewModel(),
@@ -24,7 +25,7 @@ internal fun TraineeConnectRoute(
 
     TraineeConnectScreen(
         state = state,
-        isSkippable = isSkippable,
+        screenMode = screenMode,
         onBackClick = { viewModel.setEvent(TraineeConnectUiEvent.OnChangeDialogState) },
         onNextClick = { viewModel.setEvent(TraineeConnectUiEvent.OnNextClick) },
         onSkipClick = { viewModel.setEvent(TraineeConnectUiEvent.OnSkipClick) },
@@ -61,7 +62,7 @@ internal fun TraineeConnectRoute(
 @Composable
 private fun TraineeConnectScreen(
     state: TraineeConnectUiState,
-    isSkippable: Boolean,
+    screenMode: ScreenMode,
     onChangeInviteCode: (code: String) -> Unit,
     onCodeValidationClick: (code: String) -> Unit,
     onCancelConnectClick: () -> Unit,
@@ -78,7 +79,7 @@ private fun TraineeConnectScreen(
             showDialog = state.showDialog,
             inputState = state.inviteCodeInputState,
             inviteCode = state.inviteCode,
-            isSkippable = isSkippable,
+            screenMode = screenMode,
             onNextClick = onNextClick,
             onBackClick = onBackClick,
             onSkipClick = onSkipClick,

feature/trainee/connect/src/main/java/co/kr/tnt/trainee/connect/navigation/TraineeConnectNavigation.kt

@@ -6,13 +6,14 @@ import androidx.navigation.NavOptionsBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.toRoute
 import co.kr.tnt.navigation.Route
+import co.kr.tnt.navigation.model.ScreenMode
 import co.kr.tnt.trainee.connect.TraineeConnectRoute
 
 fun NavController.navigateToTraineeConnect(
-    isSkippable: Boolean,
+    screenMode: ScreenMode,
     navOptions: NavOptionsBuilder.() -> Unit = {},
 ) = navigate(
-    route = Route.TraineeConnect(isSkippable),
+    route = Route.TraineeConnect(screenMode),
     builder = navOptions,
 )
 
@@ -23,7 +24,7 @@ fun NavGraphBuilder.traineeConnectScreen(
     composable<Route.TraineeConnect> { backstackEntry ->
         backstackEntry.toRoute<Route.TraineeConnect>().apply {
             TraineeConnectRoute(
-                isSkippable = isSkippable,
+                screenMode = screenMode,
                 navigateToPrevious = navigateToPrevious,
                 navigateToHome = { navigateToHome(false) },
             )

feature/trainee/home/src/main/java/co/kr/tnt/trainee/home/TraineeHomeScreen.kt

@@ -121,7 +121,6 @@ internal fun TraineeHomeRoute(
             },
             content = {
                 RecordBottomSheetContent(
-                    onClickExercise = { viewModel.setEvent(TraineeHomeUiEvent.OnClickExerciseRecord) },
                     onClickDiet = { viewModel.setEvent(TraineeHomeUiEvent.OnClickMealRecord) },
                 )
             },
@@ -331,6 +330,7 @@ private fun Calendar(
 }
 
 @Composable
+@Suppress("UnusedParameter")
 private fun DailyPtSession(
     session: TraineePtSession,
     context: Context,
@@ -357,7 +357,7 @@ private fun DailyPtSession(
         profileImage = session.trainerImage?.let { painter },
         showSessionRecordCreation = false,
         showSessionRecordDetails = session.hasRecord,
-        onClick = { onClickPtSessionCard(session.ptSessionId) },
+        onClick = { },
         modifier = Modifier.padding(
             start = 20.dp,
             end = 20.dp,
@@ -442,7 +442,6 @@ private fun EmptyDailyRecords() {
 
 @Composable
 private fun RecordBottomSheetContent(
-    onClickExercise: () -> Unit,
     onClickDiet: () -> Unit,
 ) {
     Column(
@@ -454,12 +453,6 @@ private fun RecordBottomSheetContent(
             style = TnTTheme.typography.h3,
             modifier = Modifier.padding(vertical = 20.dp),
         )
-        RecordItem(
-            icon = "\uD83C\uDFCB\uD83C\uDFFB\u200D♀\uFE0F",
-            text = "개인 운동",
-            modifier = Modifier.clickable(onClick = onClickExercise),
-        )
-        Spacer(Modifier.height(12.dp))
         RecordItem(
             icon = "\uD83E\uDD57",
             text = "식단",
@@ -550,7 +543,6 @@ private fun TraineeHomeScreenPreview() {
 private fun RecordBottomSheetContentPreview() {
     TnTTheme {
         RecordBottomSheetContent(
-            onClickExercise = { },
             onClickDiet = { },
         )
     }