Merge remote-tracking branch 'origin/develop' into fix/#239-announcement

teamterning · Sep 14, 2024 · 6f1ddc2 · 6f1ddc2
2 parents 6e17227 + 20dfc25
commit 6f1ddc2
Show file tree

Hide file tree

Showing 41 changed files with 288 additions and 248 deletions.
diff --git a/core/src/main/java/com/terning/core/designsystem/component/item/InternItem.kt b/core/src/main/java/com/terning/core/designsystem/component/item/InternItem.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.terning.core.R
+import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningPointTheme
@@ -86,7 +87,7 @@ fun InternItem(
             Text(
                 text = dateDeadline,
                 style = TerningTheme.typography.detail0,
-                color = TerningMain,
+                color = if (dateDeadline == stringResource(id = R.string.intern_apply_closed)) Grey300 else TerningMain,
             )
             TwoLineHeightText(
                 text = title,

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
@@ -16,18 +16,19 @@
     <string name="intern_item_working_period_month">%s개월</string>
     <string name="intern_item_d_day">D-%s</string>
     <string name="intern_item_scrap">스크랩</string>
+    <string name="intern_apply_closed">지원마감</string>
 
     <!--Calendar-->
     <string name="calendar_button_description_previous">previous</string>
     <string name="calendar_button_description_next">next</string>
     <string name="calendar_button_description_list">list</string>
 
     <!--SortByBottom-->
-    <string name="sort_by_earliest">채용 마감 이른순</string>
-    <string name="sort_by_shortest">짧은 근무 기간순</string>
-    <string name="sort_by_longest">긴 근무 기간순</string>
-    <string name="sort_by_scrap">스크랩 많은순</string>
-    <string name="sort_by_view_count">조회수 많은순</string>
+    <string name="sort_by_earliest">채용 마감 이른 순</string>
+    <string name="sort_by_shortest">짧은 근무 기간 순</string>
+    <string name="sort_by_longest">긴 근무 기간 순</string>
+    <string name="sort_by_scrap">스크랩 많은 순</string>
+    <string name="sort_by_view_count">조회수 많은 순</string>
     <string name="sort_button_description">정렬 기준</string>
     <string name="sort_bottom_sheet_title">공고 정렬 순서</string>
 
@@ -76,8 +77,8 @@
     <string name="change_filter_grade_3">3학년</string>
     <string name="change_filter_grade_4">4학년</string>
     <string name="change_filter_period_title">희망 근무 기간</string>
-    <string name="change_filter_period_1">1개월 ~ 3개월</string>
-    <string name="change_filter_period_2">4개월 ~ 6개월</string>
+    <string name="change_filter_period_1">1 ~ 3개월</string>
+    <string name="change_filter_period_2">4 ~ 6개월</string>
     <string name="change_filter_period_3">7개월 이상</string>
     <string name="change_filter_start_work_title">근무 시작 시기</string>
 

diff --git a/data/src/main/java/com/terning/data/dto/request/ChangeFilterRequestDto.kt b/data/src/main/java/com/terning/data/dto/request/ChangeFilterRequestDto.kt
@@ -7,9 +7,9 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ChangeFilterRequestDto(
     @SerialName("grade")
-    val grade: Int,
+    val grade: String,
     @SerialName("workingPeriod")
-    val workingPeriod: Int,
+    val workingPeriod: String,
     @SerialName("startYear")
     val startYear: Int,
     @SerialName("startMonth")

diff --git a/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt b/data/src/main/java/com/terning/data/dto/request/FilteringRequestDto.kt
@@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class FilteringRequestDto(
     @SerialName("grade")
-    val grade: Int,
+    val grade: String,
     @SerialName("workingPeriod")
-    val workingPeriod: Int,
+    val workingPeriod: String,
     @SerialName("startYear")
     val startYear: Int,
     @SerialName("startMonth")

diff --git a/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeFilteringInfoResponseDto.kt
@@ -6,9 +6,9 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class HomeFilteringInfoResponseDto(
     @SerialName("grade")
-    val grade: Int?,
+    val grade: String?,
     @SerialName("workingPeriod")
-    val workingPeriod: Int?,
+    val workingPeriod: String?,
     @SerialName("startYear")
     val startYear: Int?,
     @SerialName("startMonth")

diff --git a/data/src/main/java/com/terning/data/dto/response/HomeUpcomingInternResponseDto.kt b/data/src/main/java/com/terning/data/dto/response/HomeUpcomingInternResponseDto.kt
@@ -23,4 +23,6 @@ data class HomeUpcomingInternResponseDto(
     val color: String,
     @SerialName("startYearMonth")
     val startYearMonth: String,
-)
+    @SerialName("companyInfo")
+    val companyInfo: String,
+)
diff --git a/data/src/main/java/com/terning/data/mapper/home/HomeUpcomingInternMapper.kt b/data/src/main/java/com/terning/data/mapper/home/HomeUpcomingInternMapper.kt
@@ -14,4 +14,5 @@ fun HomeUpcomingInternResponseDto.toHomeUpcomingInternList(): HomeUpcomingIntern
         isScrapped = this.isScrapped,
         startYearMonth = this.startYearMonth,
         color = this.color,
-    )
+        companyInfo = this.companyInfo,
+    )
diff --git a/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt b/domain/src/main/java/com/terning/domain/entity/filtering/Filtering.kt
@@ -1,8 +1,8 @@
 package com.terning.domain.entity.filtering
 
 data class Filtering(
-    val grade: Int,
-    val workingPeriod: Int,
+    val grade: String,
+    val workingPeriod: String,
     val startYear: Int,
     val startMonth: Int
 )
diff --git a/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeFilteringInfo.kt
@@ -1,8 +1,8 @@
 package com.terning.domain.entity.home
 
 data class HomeFilteringInfo(
-    val grade: Int?,
-    val workingPeriod: Int?,
+    val grade: String?,
+    val workingPeriod: String?,
     val startYear: Int?,
     val startMonth: Int?,
 )
diff --git a/domain/src/main/java/com/terning/domain/entity/home/HomeUpcomingIntern.kt b/domain/src/main/java/com/terning/domain/entity/home/HomeUpcomingIntern.kt
@@ -10,4 +10,5 @@ data class HomeUpcomingIntern(
     val isScrapped: Boolean,
     val color: String,
     val startYearMonth: String,
+    val companyInfo: String,
 )
diff --git a/domain/src/main/java/com/terning/domain/entity/request/ChangeFilteringRequestModel.kt b/domain/src/main/java/com/terning/domain/entity/request/ChangeFilteringRequestModel.kt
@@ -1,8 +1,8 @@
 package com.terning.domain.entity.request
 
 data class ChangeFilteringRequestModel(
-    val grade: Int,
-    val workingPeriod: Int,
+    val grade: String,
+    val workingPeriod: String,
     val startYear: Int,
     val startMonth: Int,
 )
diff --git a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialog.kt
@@ -51,7 +51,7 @@ import com.terning.core.type.ColorType
 import com.terning.feature.R
 import com.terning.feature.dialog.detail.component.ColorPalette
 import com.terning.feature.dialog.detail.component.ScrapColorChangeButton
-import com.terning.feature.intern.component.InternInfoRow
+import com.terning.feature.dialog.detail.component.ScrapInfoRow
 
 
 @Composable
@@ -86,7 +86,11 @@ fun ScrapDialog(
                         onDismissRequest()
                     }
 
-                    is ScrapDialogSideEffect.PatchedScrap -> onClickChangeColor()
+                    is ScrapDialogSideEffect.PatchedScrap -> {
+                        onClickChangeColor()
+                        onDismissRequest()
+                    }
+
                     is ScrapDialogSideEffect.NavigateToDetail -> onClickNavigateButton(
                         internshipAnnouncementId
                     )
@@ -116,7 +120,6 @@ fun ScrapDialog(
             companyImage = companyImage,
             selectedColorType = uiState.selectedColorType,
             isColorChanged = uiState.isColorChanged,
-            isColorChangedOnce = uiState.isColorChangedOnce,
             onClickColorButton = viewModel::changeSelectedColor,
             onClickColorChangeButton = {
                 if (uiState.isColorChanged)
@@ -144,7 +147,6 @@ private fun ScrapDialogScreen(
     companyImage: String,
     selectedColorType: ColorType,
     isColorChanged: Boolean,
-    isColorChangedOnce: Boolean,
     onClickColorButton: (ColorType) -> Unit,
     onClickNavigateButton: () -> Unit,
     onClickColorChangeButton: () -> Unit,
@@ -158,7 +160,7 @@ private fun ScrapDialogScreen(
     ) {
         Column(
             modifier = Modifier
-                .padding(horizontal = 11.dp),
+                .padding(horizontal = 16.dp),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             AsyncImage(
@@ -221,54 +223,49 @@ private fun ScrapDialogScreen(
 
                 Spacer(modifier = Modifier.height(8.dp))
 
-                Box(
-                    modifier = Modifier.fillMaxWidth(),
-                    contentAlignment = Alignment.Center
-                ) {
-                    ColorPalette(
-                        selectedColor = selectedColorType,
-                        onColorSelected = onClickColorButton
-                    )
-                }
-                HorizontalDivider(
-                    thickness = 1.dp,
-                    color = Grey200,
-                    modifier = Modifier.padding(vertical = 8.dp)
+                ColorPalette(
+                    selectedColor = selectedColorType,
+                    onColorSelected = onClickColorButton
                 )
+            }
 
+            HorizontalDivider(
+                thickness = 1.dp,
+                color = Grey200,
+                modifier = Modifier.padding(vertical = 8.dp)
+            )
 
-                Column(
-                    modifier = Modifier.padding(vertical = 4.dp),
-                    verticalArrangement = Arrangement.spacedBy(
-                        5.dp,
-                        Alignment.CenterVertically
-                    ),
-                    horizontalAlignment = Alignment.Start,
-                ) {
-                    InternInfoRow(
-                        title = stringResource(id = R.string.intern_info_d_day),
-                        value = deadline
-                    )
-                    InternInfoRow(
-                        title = stringResource(id = R.string.intern_info_working),
-                        value = workingPeriod
-                    )
-                    InternInfoRow(
-                        title = stringResource(id = R.string.intern_info_start_date),
-                        value = startYearMonth
-                    )
-                }
+            Column(
+                modifier = Modifier
+                    .padding(vertical = 4.dp, horizontal = 13.dp)
+                    .fillMaxWidth(),
+                verticalArrangement = Arrangement.spacedBy(
+                    5.dp,
+                    Alignment.CenterVertically
+                ),
+                horizontalAlignment = Alignment.Start,
+            ) {
+                ScrapInfoRow(
+                    title = stringResource(id = R.string.intern_info_d_day),
+                    value = deadline
+                )
+                ScrapInfoRow(
+                    title = stringResource(id = R.string.intern_info_working),
+                    value = workingPeriod
+                )
+                ScrapInfoRow(
+                    title = stringResource(id = R.string.intern_info_start_date),
+                    value = startYearMonth
+                )
             }
 
             Spacer(modifier = Modifier.height(8.dp))
 
             if (isScrapped) {
                 DetailScrapButton(
                     isColorChanged = isColorChanged,
-                    isColorChangedOnce = isColorChangedOnce,
                     onClickNavigateButton = onClickNavigateButton,
                     onClickColorChangeButton = onClickColorChangeButton
-
                 )
             } else {
                 NewScrapButton(onClickScrapButton = onClickScrapButton)
@@ -295,7 +292,6 @@ private fun NewScrapButton(
 @Composable
 private fun DetailScrapButton(
     isColorChanged: Boolean,
-    isColorChangedOnce: Boolean,
     onClickNavigateButton: () -> Unit,
     onClickColorChangeButton: () -> Unit,
     modifier: Modifier = Modifier
@@ -305,7 +301,6 @@ private fun DetailScrapButton(
     ) {
         ScrapColorChangeButton(
             isColorChanged = isColorChanged,
-            isColorChangedOnce = isColorChangedOnce,
             paddingVertical = 12.dp,
             cornerRadius = 8.dp,
             onButtonClick = onClickColorChangeButton,
@@ -339,7 +334,6 @@ private fun ScrapDialogPreview() {
             onClickScrapButton = {},
             onClickColorButton = {},
             isColorChanged = false,
-            isColorChangedOnce = true,
             selectedColorType = ColorType.RED
         )
     }
@@ -363,7 +357,6 @@ private fun DetailScrapButtonPreview() {
             onClickNavigateButton = {},
             onClickColorChangeButton = {},
             isColorChanged = false,
-            isColorChangedOnce = false
         )
     }
 }
diff --git a/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt b/feature/src/main/java/com/terning/feature/dialog/detail/ScrapDialogViewModel.kt
@@ -30,7 +30,6 @@ class ScrapDialogViewModel @Inject constructor(
         _uiState.update { currentState ->
             currentState.copy(
                 isColorChanged = false,
-                isColorChangedOnce = false
             )
         }
     }
@@ -48,7 +47,7 @@ class ScrapDialogViewModel @Inject constructor(
         _uiState.update { currentState ->
             currentState.copy(
                 selectedColorType = colorType,
-                isColorChanged = colorType != _uiState.value.initialColorType
+                isColorChanged = true
             )
         }
     }
@@ -86,7 +85,6 @@ class ScrapDialogViewModel @Inject constructor(
                     currentState.copy(
                         initialColorType = color,
                         isColorChanged = false,
-                        isColorChangedOnce = true,
                     )
                 }
             }.onFailure {

diff --git a/feature/src/main/java/com/terning/feature/dialog/detail/component/ColorPalette.kt b/feature/src/main/java/com/terning/feature/dialog/detail/component/ColorPalette.kt
@@ -37,7 +37,7 @@ fun ColorPalette(
                 onColorSelected = onOptionSelected
             )
         },
-        verticalArrangementSpace = 6.dp,
+        verticalArrangementSpace = 0.dp,
         horizontalArrangementSpace = 0.dp,
         modifier = modifier.wrapContentSize()
     )