diff --git a/feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt b/feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt index b767d9d35..e9ac04400 100644 --- a/feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt +++ b/feature/src/main/java/com/terning/feature/calendar/month/CalendarMonthScreen.kt @@ -10,15 +10,14 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.terning.core.state.UiState -import com.terning.feature.calendar.calendar.model.CalendarUiState import com.terning.feature.calendar.calendar.CalendarViewModel import com.terning.feature.calendar.calendar.model.CalendarModel.Companion.getDateByPage +import com.terning.feature.calendar.calendar.model.CalendarUiState import com.terning.feature.calendar.month.component.HorizontalCalendar import kotlinx.coroutines.flow.distinctUntilChanged -import java.time.LocalDate @Composable -fun CalendarMonthScreen( +internal fun CalendarMonthScreen( pages: Int, listState: LazyListState, calendarUiState: CalendarUiState, diff --git a/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonth.kt b/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonth.kt index 20897907c..2abffd608 100644 --- a/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonth.kt +++ b/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonth.kt @@ -23,7 +23,7 @@ import java.time.LocalDate import java.time.YearMonth @Composable -fun CalendarMonth( +internal fun CalendarMonth( isWeekEnabled: Boolean, monthModel: MonthModel, onDateSelected: (LocalDate) -> Unit, @@ -82,7 +82,7 @@ fun CalendarMonth( @Preview(showBackground = true) @Composable -fun CalendarMonthPreview() { +private fun CalendarMonthPreview() { TerningPointTheme { CalendarMonth( monthModel = MonthModel(YearMonth.now()), diff --git a/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonthScrap.kt b/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonthScrap.kt index 5f635f021..ba27ba799 100644 --- a/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonthScrap.kt +++ b/feature/src/main/java/com/terning/feature/calendar/month/component/CalendarMonthScrap.kt @@ -10,15 +10,19 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.designsystem.theme.White import com.terning.domain.entity.CalendarScrap +import com.terning.feature.R + +private const val MAX_SCRAP_COUNT = 3 @Composable -fun CalendarMonthScrap( +internal fun CalendarMonthScrap( modifier: Modifier = Modifier, scrapLists: List ) { @@ -47,7 +51,7 @@ fun CalendarMonthScrap( item { if (scrapLists.size > MAX_SCRAP_COUNT) { Text( - text = "+${(scrapLists.size - MAX_SCRAP_COUNT)}", + text = stringResource(id = R.string.calendar_scrap_overflow, (scrapLists.size - MAX_SCRAP_COUNT)), style = TerningTheme.typography.detail4, textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth() @@ -57,5 +61,3 @@ fun CalendarMonthScrap( } } -private const val MAX_SCRAP_COUNT = 3 - diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index b99d06656..7d1c5157d 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -56,6 +56,7 @@ list Calendar Transition 선택하신 날짜에 지원 마감인 스크랩 공고가 없어요 + +%s 오늘 마감되는 %s님의 관심 공고