diff --git a/conferences-app/src/commonMain/composeResources/values/strings.xml b/conferences-app/src/commonMain/composeResources/values/strings.xml index 6fb7ef47a..bd92b09cf 100644 --- a/conferences-app/src/commonMain/composeResources/values/strings.xml +++ b/conferences-app/src/commonMain/composeResources/values/strings.xml @@ -5,19 +5,6 @@ Profile Events - Jan - Feb - Mar - Apr - May - Jun - Jul - Aug - Sep - Oct - Nov - Dec - Call for Papers (Until %1$s) Online Only diff --git a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/MonthNames.kt b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/MonthNames.kt deleted file mode 100644 index 2e5ec1dbe..000000000 --- a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/MonthNames.kt +++ /dev/null @@ -1,23 +0,0 @@ -package io.ashdavies.party.events - -import kotlinx.datetime.format.DateTimeFormatBuilder -import kotlinx.datetime.format.MonthNames - -private val MonthNamesList = listOf( - "Jan", // Res.string.january, - "Feb", // Res.string.february, - "Mar", // Res.string.march, - "Apr", // Res.string.april, - "May", // Res.string.may, - "Jun", // Res.string.june, - "Jul", // Res.string.july, - "Aug", // Res.string.august, - "Sep", // Res.string.september, - "Oct", // Res.string.october, - "Nov", // Res.string.november, - "Dec", // Res.string.december, -) - -internal fun DateTimeFormatBuilder.WithDate.monthName() { - monthName(MonthNames(MonthNamesList)) -} diff --git a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/upcoming/UpcomingEventsList.kt b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/upcoming/UpcomingEventsList.kt index 35f965b43..22b1f9c81 100644 --- a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/upcoming/UpcomingEventsList.kt +++ b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/upcoming/UpcomingEventsList.kt @@ -43,7 +43,6 @@ import coil3.compose.AsyncImage import io.ashdavies.analytics.OnClick import io.ashdavies.paging.LazyPagingItems import io.ashdavies.party.events.Event -import io.ashdavies.party.events.monthName import io.ashdavies.party.events.paging.errorMessage import io.ashdavies.party.events.paging.isRefreshing import io.ashdavies.placeholder.PlaceholderHighlight @@ -53,6 +52,7 @@ import kotlinx.datetime.Clock import kotlinx.datetime.LocalDate import kotlinx.datetime.TimeZone import kotlinx.datetime.format +import kotlinx.datetime.format.MonthNames import kotlinx.datetime.toLocalDateTime import org.jetbrains.compose.resources.stringResource import playground.conferences_app.generated.resources.Res @@ -187,7 +187,7 @@ private fun EventDateLabel( ) { Column { Text( - text = dateStart.format(LocalDate.Format { monthName() }), + text = dateStart.format(LocalDate.Format { monthName(MonthNames.ENGLISH_ABBREVIATED) }), modifier = Modifier.align(Alignment.CenterHorizontally), style = MaterialTheme.typography.labelSmall, )