🔀 :: (#218) - 디자인 변동사항을 따릅니다.

core/design-system/src/main/java/com/school_of_company/design_system/icon/ExpoIcon.kt

@@ -115,11 +115,15 @@ fun ImageIcon(
 }
 
 @Composable
-fun CheckIcon(modifier: Modifier = Modifier) {
+fun CheckIcon(
+    modifier: Modifier = Modifier,
+    tint: Color = Color.Unspecified
+) {
     Icon(
         painter = painterResource(id = R.drawable.ic_check),
         contentDescription = stringResource(id = R.string.check_description),
-        modifier = modifier
+        modifier = modifier,
+        tint = tint
     )
 }
 

core/model/src/main/java/com/school_of_company/model/model/training/TrainingDtoModel.kt

@@ -3,6 +3,6 @@ package com.school_of_company.model.model.training
 data class TrainingDtoModel(
     val title: String,
     val startedAt: String,
-    val finishedAt: String,
+    val endedAt: String,
     val category: String,
 )

core/network/src/main/java/com/school_of_company/network/dto/training/all/TrainingDto.kt

@@ -7,6 +7,6 @@ import com.squareup.moshi.JsonClass
 data class TrainingDto(
     @Json(name = "title") val title: String,
     @Json(name = "startedAt") val startedAt: String,
-    @Json(name = "finishedAt") val finishedAt: String,
+    @Json(name = "endedAt") val endedAt: String,
     @Json(name = "category") val category: String,
 )

core/network/src/main/java/com/school_of_company/network/mapper/training/request/TrainingDtoRequestMapper.kt

@@ -7,6 +7,6 @@ fun TrainingDtoModel.toDto(): TrainingDto =
     TrainingDto(
         title = this.title,
         startedAt = this.startedAt,
-        finishedAt = this.finishedAt,
+        endedAt = this.endedAt,
         category = this.category,
     )

core/network/src/main/java/com/school_of_company/network/mapper/training/response/TrainingDtoResponseMapper.kt

@@ -7,6 +7,6 @@ fun TrainingDto.toModel(): TrainingDtoModel =
     TrainingDtoModel(
         title = this.title,
         startedAt = this.startedAt,
-        finishedAt = this.finishedAt,
+        endedAt = this.endedAt,
         category = this.category
     )

feature/expo/src/main/java/com/school_of_company/expo/enum/TrainingCategory.kt

@@ -0,0 +1,6 @@
+package com.school_of_company.expo.enum
+
+enum class TrainingCategory {
+    ESSENTIAL,
+    CHOICE
+}

feature/expo/src/main/java/com/school_of_company/expo/view/ExpoCreateScreen.kt

@@ -47,6 +47,7 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import coil.compose.rememberAsyncImagePainter
@@ -55,13 +56,14 @@ import com.school_of_company.design_system.component.button.ExpoStateButton
 import com.school_of_company.design_system.component.button.state.ButtonState
 import com.school_of_company.design_system.component.modifier.clickable.expoClickable
 import com.school_of_company.design_system.component.modifier.padding.paddingHorizontal
-import com.school_of_company.design_system.component.textfield.ExpoAddTextField
 import com.school_of_company.design_system.component.textfield.ExpoLocationIconTextField
 import com.school_of_company.design_system.component.textfield.LimitedLengthTextField
 import com.school_of_company.design_system.component.textfield.NoneLimitedLengthTextField
 import com.school_of_company.design_system.icon.ImageIcon
 import com.school_of_company.design_system.icon.WarnIcon
 import com.school_of_company.design_system.theme.ExpoAndroidTheme
+import com.school_of_company.expo.view.component.ExpoAddTextField
+import com.school_of_company.expo.view.component.ExpoTrainingSettingBottomSheet
 import com.school_of_company.expo.viewmodel.ExpoViewModel
 import com.school_of_company.expo.viewmodel.uistate.ImageUpLoadUiState
 import com.school_of_company.expo.viewmodel.uistate.RegisterExpoInformationUiState
@@ -83,6 +85,8 @@ internal fun ExpoCreateRoute(
     val addressState by viewModel.address.collectAsStateWithLifecycle()
     val locationState by viewModel.location.collectAsStateWithLifecycle()
     val coverImageState by viewModel.cover_image.collectAsStateWithLifecycle()
+    val trainingProgramTextState by viewModel.trainingProgramTextState.collectAsStateWithLifecycle()
+    val standardProgramTextState by viewModel.standardProgramTextState.collectAsStateWithLifecycle()
 
     var selectedImageUri by remember { mutableStateOf<Uri?>(null) }
 
@@ -168,6 +172,14 @@ internal fun ExpoCreateRoute(
                 onErrorToast(null, R.string.expo_image_fail)
             }
         },
+        trainingProgramTextState = trainingProgramTextState,
+        onTrainingProgramChange = viewModel::updateTrainingProgramText,
+        onAddTrainingProgram = viewModel::addTrainingProgramText,
+        onRemoveTrainingProgram = viewModel::removeTrainingProgramText,
+        standardProgramTextState = standardProgramTextState,
+        onStandardProgramChange = viewModel::updateStandardProgramText,
+        onAddStandardProgram = viewModel::addStandardProgramText,
+        onRemoveStandardProgram = viewModel::removeStandardProgramText
     )
 }
 
@@ -191,8 +203,16 @@ internal fun ExpoCreateScreen(
     onAddressChange: (String) -> Unit,
     onLocationChange: (String) -> Unit,
     onExpoCreateCallBack: () -> Unit,
+    trainingProgramTextState: List<String>,
+    onTrainingProgramChange: (Int, String) -> Unit,
+    onAddTrainingProgram: () -> Unit,
+    onRemoveTrainingProgram: (Int) -> Unit,
+    standardProgramTextState: List<String>,
+    onStandardProgramChange: (Int, String) -> Unit,
+    onAddStandardProgram: () -> Unit,
+    onRemoveStandardProgram: (Int) -> Unit
 ) {
-    var trainingTextState by rememberSaveable { mutableStateOf(listOf("")) }
+    val (openTrainingSettingBottomSheet, isOpenTrainingSettingBottomSheet) = rememberSaveable { mutableStateOf(false) }
 
     ExpoAndroidTheme { colors, typography ->
         Column(
@@ -375,27 +395,45 @@ internal fun ExpoCreateScreen(
 
                 Column(verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.Top)) {
                     Text(
-                        text = "연수 종류",
+                        text = "참가자 연수 종류",
                         style = typography.bodyBold2,
                         color = colors.black,
                     )
 
                     ExpoAddTextField(
-                        trainingTextFieldList = trainingTextState,
+                        trainingTextFieldList = standardProgramTextState,
                         onValueChange = { index, newState ->
-                            trainingTextState = trainingTextState.toMutableList().apply {
-                                set(index, newState)
-                            }
+                            onStandardProgramChange(index, newState)
                         },
-                        onAddTextField = {
-                            trainingTextState = trainingTextState.toMutableList().apply {
-                                add("")
-                            }
+                        onAddTextField = { onAddStandardProgram() },
+                        onRemoveTextField = { index ->
+                            onRemoveStandardProgram(index)
                         },
-                        onRemoveTextField = {
-                            trainingTextState = trainingTextState.toMutableList().apply {
-                                removeAt(it)
-                            }
+                        onTrainingSetting = {
+                            isOpenTrainingSettingBottomSheet(true)
+                        },
+                        placeHolder = "연수 종류를 입력해주세요."
+                    )
+
+                    Spacer(modifier = Modifier.padding(top = 28.dp))
+
+                    Text(
+                        text = "연수자 연수 종류",
+                        style = typography.bodyBold2,
+                        color = colors.black,
+                    )
+
+                    ExpoAddTextField(
+                        trainingTextFieldList = trainingProgramTextState,
+                        onValueChange = { index, newState ->
+                            onTrainingProgramChange(index, newState)
+                        },
+                        onAddTextField = { onAddTrainingProgram() },
+                        onRemoveTextField = { index ->
+                            onRemoveTrainingProgram(index)
+                        },
+                        onTrainingSetting = {
+                            isOpenTrainingSettingBottomSheet(true)
                         },
                         placeHolder = "연수 종류를 입력해주세요."
                     )
@@ -432,7 +470,8 @@ internal fun ExpoCreateScreen(
                             introduceTitleState.isNotEmpty() &&
                             addressState.isNotEmpty() &&
                             locationState.isNotEmpty() &&
-                            trainingTextState.isNotEmpty()
+                            trainingProgramTextState.isNotEmpty() &&
+                            standardProgramTextState.isNotEmpty()
                         ) {
                             ButtonState.Enable
                         } else {
@@ -448,6 +487,20 @@ internal fun ExpoCreateScreen(
             }
         }
     }
+
+    if (openTrainingSettingBottomSheet) {
+        Dialog(onDismissRequest = { isOpenTrainingSettingBottomSheet(false) }) {
+            ExpoTrainingSettingBottomSheet(
+                onCancelClick = { isOpenTrainingSettingBottomSheet(false) },
+                startedTextState = "",
+                endedTextState = "",
+                onStartedTextChange = {},
+                onEndedTextChange = {},
+                onCategoryChange = {},
+                onButtonClick = { /*TODO*/ }
+            )
+        }
+    }
 }
 
 @Preview
@@ -469,5 +522,13 @@ private fun ExpoCreateScreenPreview() {
         onEndedDateChange = {},
         onIntroduceTitleChange = {},
         onExpoCreateCallBack = {},
+        trainingProgramTextState = emptyList(),
+        onTrainingProgramChange = { _, _ -> },
+        onAddTrainingProgram = {},
+        onRemoveTrainingProgram = {},
+        standardProgramTextState = emptyList(),
+        onStandardProgramChange = { _, _ -> },
+        onAddStandardProgram = {},
+        onRemoveStandardProgram = {}
     )
 }

feature/expo/src/main/java/com/school_of_company/expo/view/ExpoDetailScreen.kt

@@ -380,6 +380,7 @@ internal fun ExpoDetailScreen(
             }
         }
     }
+
     if (openDialog) {
         Dialog(onDismissRequest = { isOpenDialog(false) }) {
             com.school_of_company.expo.view.component.MessageDialog(