migrate date_time module

date_time/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.vanniktech.maven.publish.SonatypeHost
+
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
  *
@@ -14,23 +16,74 @@
  * limitations under the License.
  */
 plugins {
- id(Plugins.CUSTOM_LIBRARY_MODULE.id)
+ alias(libs.plugins.android.library)
+ alias(libs.plugins.compose)
+ alias(libs.plugins.multiplatform)
+ alias(libs.plugins.serialization)
+ alias(libs.plugins.publish)
+ `maven-publish`
 }
 
 android {
- namespace = Modules.DATE_TIME.namespace
+ namespace = Modules.CALENDAR.namespace
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 21
+ }
  compileOptions {
- // Flag to enable support for the new language APIs
  isCoreLibraryDesugaringEnabled = true
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
+
+kotlin {
+ androidTarget {
+ publishAllLibraryVariants()
+ }
+ jvm()
+
+ iosX64()
+ iosArm64()
+ iosSimulatorArm64()
+
+ macosX64()
+ macosArm64()
+
+ js(IR) {
+ browser()
+ binaries.executable()
+ }
+
+ applyDefaultHierarchyTemplate()
+
+ sourceSets {
+ commonMain.dependencies {
+ implementation(compose.runtime)
+ implementation(compose.foundation)
+ implementation(compose.material3)
+ implementation(compose.components.resources)
+
+ implementation(libs.datetime)
+ implementation(libs.serialization)
+
+ api(project(":core"))
+ }
+
+ val nonJvmMain by creating {
+ dependsOn(commonMain.get())
+
+ nativeMain.orNull?.dependsOn(this)
+ jsMain.orNull?.dependsOn(this)
+ }
  }
 }
 
 dependencies {
- implementations(Dependencies.SNAPPER)
- coreLibraryDesugaring(Dependencies.DESUGAR)
+ coreLibraryDesugaring(libs.desugar)
 }
 
 mavenPublishing {
- publishToMavenCentral()
- signAllPublications()
-}
+ publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
+}

date_time/src/androidMain/kotlin/com/maxkeppeler/sheets/date_time/utils/Utils.android.kt

@@ -0,0 +1,25 @@
+package com.maxkeppeler.sheets.date_time.utils
+
+import java.time.chrono.Chronology
+import java.time.format.DateTimeFormatterBuilder
+import java.util.Locale
+
+internal fun FormatStyle.toJava(): java.time.format.FormatStyle {
+ return when (this) {
+ FormatStyle.FULL -> java.time.format.FormatStyle.FULL
+ FormatStyle.LONG -> java.time.format.FormatStyle.LONG
+ FormatStyle.MEDIUM -> java.time.format.FormatStyle.MEDIUM
+ FormatStyle.SHORT -> java.time.format.FormatStyle.SHORT
+ }
+}
+
+internal actual fun getLocalizedPattern(
+ isDate: Boolean,
+ formatStyle: FormatStyle
+): String {
+ val locale = Locale.getDefault()
+ return DateTimeFormatterBuilder.getLocalizedDateTimePattern(
+ if (isDate) formatStyle.toJava() else null,
+ if (!isDate) formatStyle.toJava() else null, Chronology.ofLocale(locale), locale
+ ).toString()
+}

date_time/src/appleMain/kotlin/com/maxkeppeler/sheets/date_time/utils/Utils.apple.kt

@@ -0,0 +1,25 @@
+package com.maxkeppeler.sheets.date_time.utils
+
+import platform.Foundation.*
+
+internal fun FormatStyle.toSwift(isAbsent: Boolean): NSDateFormatterStyle {
+ if (isAbsent) {
+ return NSDateFormatterNoStyle
+ }
+ return when (this) {
+ FormatStyle.FULL -> NSDateFormatterFullStyle
+ FormatStyle.LONG -> NSDateFormatterLongStyle
+ FormatStyle.MEDIUM -> NSDateFormatterMediumStyle
+ FormatStyle.SHORT -> NSDateFormatterShortStyle
+ }
+}
+
+internal actual fun getLocalizedPattern(
+ isDate: Boolean,
+ formatStyle: FormatStyle
+): String {
+ val formatter = NSDateFormatter()
+ formatter.setDateStyle(formatStyle.toSwift(!isDate))
+ formatter.setTimeStyle(formatStyle.toSwift(isDate))
+ return formatter.dateFormat()
+}

date_time/src/main/java/com/maxkeppeler/sheets/date_time/DateTimeDialog.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/DateTimeDialog.kt

@@ -34,6 +34,7 @@ import com.maxkeppeler.sheets.date_time.models.DateTimeSelection
  * @param header The header to be displayed at the top of the dialog.
  * @param properties DialogProperties for further customization of this dialog's behavior.
  */
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun DateTimeDialog(
  state: UseCaseState,

date_time/src/main/java/com/maxkeppeler/sheets/date_time/DateTimeState.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/DateTimeState.kt

@@ -24,9 +24,10 @@ import androidx.compose.runtime.setValue
 import com.maxkeppeker.sheets.core.views.BaseTypeState
 import com.maxkeppeler.sheets.date_time.models.*
 import com.maxkeppeler.sheets.date_time.utils.*
-import java.io.Serializable
-import java.time.LocalDate
-import java.time.LocalTime
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.atTime
 
 /**
  * Handles the date time state.
@@ -128,15 +129,13 @@ internal class DateTimeState(
  private fun getDatePatternValue(): String? = selection.dateFormatStyle?.let {
  getLocalizedPattern(
  isDate = true,
- locale = config.locale,
  formatStyle = it
  )
  }
 
  private fun getTimePatternValue(): String? = selection.timeFormatStyle?.let {
  getLocalizedPattern(
  isDate = false,
- locale = config.locale,
  formatStyle = it
  )
  }
@@ -200,7 +199,7 @@ internal class DateTimeState(
  val dateSelection: LocalDate?,
  val timeSelection: LocalTime?,
  val typeValues: MutableMap<UnitType, UnitOptionEntry?>
- ) : Serializable
+ ) : JvmSerializable
 }
 
 /**

date_time/src/main/java/com/maxkeppeler/sheets/date_time/DateTimeView.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/DateTimeView.kt

@@ -26,7 +26,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import com.maxkeppeker.sheets.core.models.base.BaseBehaviors
 import com.maxkeppeker.sheets.core.models.base.Header
 import com.maxkeppeker.sheets.core.models.base.StateHandler
@@ -36,6 +35,12 @@ import com.maxkeppeker.sheets.core.views.base.FrameBase
 import com.maxkeppeler.sheets.date_time.models.DateTimeConfig
 import com.maxkeppeler.sheets.date_time.models.DateTimeSelection
 import com.maxkeppeler.sheets.date_time.views.PickerComponent
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.StringResource
+import org.jetbrains.compose.resources.stringResource
+import sheets_compose_dialogs.date_time.generated.resources.Res
+import sheets_compose_dialogs.date_time.generated.resources.sheets_compose_dialogs_set_date
+import sheets_compose_dialogs.date_time.generated.resources.sheets_compose_dialogs_set_time
 
 /**
  * Date Time dialog for the use-case to select a date, time or both in a quick way.
@@ -44,6 +49,7 @@ import com.maxkeppeler.sheets.date_time.views.PickerComponent
  * @param config The general configuration for the dialog view.
  * @param header The header to be displayed at the top of the dialog view.
  */
+@OptIn(ExperimentalResourceApi::class)
 @ExperimentalMaterial3Api
 @Composable
 fun DateTimeView(
@@ -70,7 +76,7 @@ fun DateTimeView(
  LaunchedEffect(state.isDateValid) { processSelection() }
  LaunchedEffect(state.isDateValid) { processSelection() }
 
- val skipButton: @Composable ColumnScope.(Int, Boolean) -> Unit = @Composable { labelRes, error ->
+ val skipButton: @Composable ColumnScope.(StringResource, Boolean) -> Unit = @Composable { labelRes, error ->
  Button(
  modifier = Modifier.align(Alignment.CenterHorizontally),
  onClick = state::skipSelection,
@@ -112,18 +118,18 @@ fun DateTimeView(
  if (selection.startWithTime) {
  if (!state.firstSkipped) {
  timePicker()
- skipButton(R.string.sheets_compose_dialogs_set_date, !state.isDateValid)
+ skipButton(Res.string.sheets_compose_dialogs_set_date, !state.isDateValid)
  } else {
  datePicker()
- skipButton(R.string.sheets_compose_dialogs_set_time, !state.isTimeValid)
+ skipButton(Res.string.sheets_compose_dialogs_set_time, !state.isTimeValid)
  }
  } else {
  if (!state.firstSkipped) {
  datePicker()
- skipButton(R.string.sheets_compose_dialogs_set_time, !state.isTimeValid)
+ skipButton(Res.string.sheets_compose_dialogs_set_time, !state.isTimeValid)
  } else {
  timePicker()
- skipButton(R.string.sheets_compose_dialogs_set_date, !state.isDateValid)
+ skipButton(Res.string.sheets_compose_dialogs_set_date, !state.isDateValid)
  }
  }
  }

date_time/src/main/java/com/maxkeppeler/sheets/date_time/models/DateTimeConfig.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/models/DateTimeConfig.kt

@@ -19,7 +19,6 @@ import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
 import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
 import com.maxkeppeler.sheets.date_time.utils.Constants
-import java.util.*
 
 /**
  * The general configuration for the date time dialog.
@@ -31,7 +30,6 @@ import java.util.*
  * @param icons The style of icons that are used for dialog/ view-specific icons.
  */
 class DateTimeConfig(
- val locale: Locale = Locale.getDefault(),
  val hideDateCharacters: Boolean = false,
  val hideTimeCharacters: Boolean = false,
  val minYear: Int = Constants.DEFAULT_MIN_YEAR,

date_time/src/main/java/com/maxkeppeler/sheets/date_time/models/DateTimeSelection.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/models/DateTimeSelection.kt

@@ -18,10 +18,11 @@ package com.maxkeppeler.sheets.date_time.models
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.BaseConstants
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import java.time.format.FormatStyle
+import com.maxkeppeler.sheets.date_time.utils.FormatStyle
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.format.DateTimeFormat
 
 /**
  * The selection configuration for the date time dialog.

date_time/src/main/java/com/maxkeppeler/sheets/date_time/models/UnitOptionEntry.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/models/UnitOptionEntry.kt

@@ -15,17 +15,19 @@
  */
 package com.maxkeppeler.sheets.date_time.models
 
-import androidx.annotation.StringRes
-import java.io.Serializable
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.StringResource
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
 
 /**
  * A class that acts as a value item that can be selected for a unit.
  * @param value The actual value.
  * @param label The textual representation of the value.
  * @param labelRes The textual representation of the value by resource.
  */
-data class UnitOptionEntry(
+@OptIn(ExperimentalResourceApi::class)
+data class UnitOptionEntry constructor(
  val value: Int,
  val label: String? = null,
- @StringRes val labelRes: Int? = null
-) : Serializable
+ val labelRes: StringResource? = null
+) : JvmSerializable

date_time/src/main/java/com/maxkeppeler/sheets/date_time/models/UnitSelection.kt → date_time/src/commonMain/kotlin/com/maxkeppeler/sheets/date_time/models/UnitSelection.kt

@@ -15,8 +15,13 @@
  */
 package com.maxkeppeler.sheets.date_time.models
 
-import androidx.annotation.StringRes
-import com.maxkeppeler.sheets.date_time.R
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.StringResource
+import sheets_compose_dialogs.date_time.generated.resources.*
+import sheets_compose_dialogs.date_time.generated.resources.Res
+import sheets_compose_dialogs.date_time.generated.resources.sheets_compose_dialogs_date_time_hour
+import sheets_compose_dialogs.date_time.generated.resources.sheets_compose_dialogs_date_time_minutes
+import sheets_compose_dialogs.date_time.generated.resources.sheets_compose_dialogs_date_time_seconds
 
 enum class UnitType(val isDate: Boolean) {
  DAY(true),
@@ -34,8 +39,9 @@ enum class UnitType(val isDate: Boolean) {
  * @param options The list of of options that can be selected.
  * @param value The current selected value.
  */
+@OptIn(ExperimentalResourceApi::class)
 internal sealed class UnitSelection(
- @StringRes open val placeholderRes: Int? = null,
+ open val placeholderRes: StringResource? = null,
  open val options: List<UnitOptionEntry> = listOf(),
  open val value: UnitOptionEntry? = null,
  open val type: UnitType? = null
@@ -60,7 +66,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>,
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_hour,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_hour,
  type = UnitType.HOUR
  )
 
@@ -73,7 +79,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>,
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_minutes,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_minutes,
  type = UnitType.MINUTE
  )
 
@@ -86,7 +92,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>,
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_seconds,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_seconds,
  type = UnitType.SECOND
  )
 
@@ -99,7 +105,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_day,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_day,
  type = UnitType.DAY
  )
 
@@ -112,7 +118,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>,
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_month,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_month,
  type = UnitType.MONTH
  )
 
@@ -125,7 +131,7 @@ internal sealed class UnitSelection(
  override val value: UnitOptionEntry? = null,
  override val options: List<UnitOptionEntry>
  ) : UnitSelection(
- placeholderRes = R.string.sheets_compose_dialogs_date_time_year,
+ placeholderRes = Res.string.sheets_compose_dialogs_date_time_year,
  type = UnitType.YEAR
  )
 }