migrate clock module

clock/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.vanniktech.maven.publish.SonatypeHost
+
 /*
  * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
  *
@@ -14,22 +16,67 @@
  * 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.CLOCK.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"))
+ }
  }
 }
 
 dependencies {
- coreLibraryDesugaring(Dependencies.DESUGAR)
+ coreLibraryDesugaring(libs.desugar)
 }
 
 mavenPublishing {
- publishToMavenCentral()
- signAllPublications()
-}
+ publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
+}

clock/src/androidMain/kotlin/com/maxkeppeler/sheets/clock/ClockState.android.kt

@@ -0,0 +1,10 @@
+package com.maxkeppeler.sheets.clock
+
+import android.text.format.DateFormat
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+
+@Composable
+internal actual fun is24HourFormat(): Boolean {
+ return DateFormat.is24HourFormat(LocalContext.current)
+}

clock/src/androidMain/kotlin/com/maxkeppeler/sheets/clock/views/TimeHintComponent.android.kt

@@ -0,0 +1,31 @@
+package com.maxkeppeler.sheets.clock.views
+
+import com.maxkeppeler.sheets.clock.utils.FormatStyle
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.format.DateTimeFormat
+import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.byUnicodePattern
+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
+ }
+}
+
+@OptIn(FormatStringsInDatetimeFormats::class)
+internal actual fun getTimeFormatter(style: FormatStyle): DateTimeFormat<LocalTime> {
+ val locale = Locale.getDefault()
+ val pattern = DateTimeFormatterBuilder.getLocalizedDateTimePattern(
+ null, style.toJava(), Chronology.ofLocale(locale), locale
+ ).toString()
+
+ return LocalTime.Format {
+ byUnicodePattern(pattern)
+ }
+}

clock/src/appleMain/kotlin/com/maxkeppeler/sheets/clock/ClockState.apple.kt

@@ -0,0 +1,12 @@
+package com.maxkeppeler.sheets.clock
+
+import androidx.compose.runtime.Composable
+import platform.Foundation.NSDateFormatter
+import platform.Foundation.NSLocale
+import platform.Foundation.currentLocale
+
+@Composable
+internal actual fun is24HourFormat(): Boolean {
+ val dateFormat = NSDateFormatter.dateFormatFromTemplate("j", 0u, NSLocale.currentLocale)
+ return dateFormat?.contains('a')?.not() ?: true
+}

clock/src/appleMain/kotlin/com/maxkeppeler/sheets/clock/views/TimeHintComponent.apple.kt

@@ -0,0 +1,29 @@
+package com.maxkeppeler.sheets.clock.views
+
+import com.maxkeppeler.sheets.clock.utils.FormatStyle
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.format.DateTimeFormat
+import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.byUnicodePattern
+import platform.Foundation.*
+
+internal fun FormatStyle.toSwift(): NSDateFormatterStyle {
+ return when (this) {
+ FormatStyle.FULL -> NSDateFormatterFullStyle
+ FormatStyle.LONG -> NSDateFormatterLongStyle
+ FormatStyle.MEDIUM -> NSDateFormatterMediumStyle
+ FormatStyle.SHORT -> NSDateFormatterShortStyle
+ }
+}
+
+@OptIn(FormatStringsInDatetimeFormats::class)
+internal actual fun getTimeFormatter(style: FormatStyle): DateTimeFormat<LocalTime> {
+ val formatter = NSDateFormatter()
+ formatter.setDateStyle(NSDateFormatterNoStyle)
+ formatter.setTimeStyle(style.toSwift())
+ val pattern = formatter.dateFormat()
+
+ return LocalTime.Format {
+ byUnicodePattern(pattern)
+ }
+}

clock/src/main/java/com/maxkeppeler/sheets/clock/ClockState.kt → clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/ClockState.kt

@@ -15,8 +15,6 @@
  */
 package com.maxkeppeler.sheets.clock
 
-import android.content.Context
-import android.text.format.DateFormat
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -27,6 +25,7 @@ import com.maxkeppeker.sheets.core.models.base.Debouncer
 import com.maxkeppeker.sheets.core.views.BaseTypeState
 import com.maxkeppeler.sheets.clock.models.ClockConfig
 import com.maxkeppeler.sheets.clock.models.ClockSelection
+import com.maxkeppeler.sheets.clock.utils.*
 import com.maxkeppeler.sheets.clock.utils.Constants
 import com.maxkeppeler.sheets.clock.utils.convertTimeIntoTimeTextValues
 import com.maxkeppeler.sheets.clock.utils.convertTimeTextValuesIntoTime
@@ -36,8 +35,9 @@ import com.maxkeppeler.sheets.clock.utils.inputValue
 import com.maxkeppeler.sheets.clock.utils.isAm
 import com.maxkeppeler.sheets.clock.utils.moveToNextIndex
 import com.maxkeppeler.sheets.clock.utils.moveToPreviousIndex
-import java.io.Serializable
-import java.time.LocalTime
+import kotlinx.datetime.LocalTime
+import kotlinx.serialization.Serializable
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
 
 /**
  * Handles the clock state.
@@ -47,9 +47,9 @@ import java.time.LocalTime
  * @param stateData The data of the state when the state is required to be restored.
  */
 internal class ClockState(
- private val context: Context,
  val selection: ClockSelection,
  val config: ClockConfig,
+ private val _is24HourFormat: Boolean,
  stateData: ClockStateData? = null
 ) : BaseTypeState() {
 
@@ -79,7 +79,7 @@ internal class ClockState(
  private fun isValid(): Boolean = config.boundary?.let { time in it } ?: true
 
  private fun isInit24HourFormat(): Boolean {
- return config.is24HourFormat ?: DateFormat.is24HourFormat(context)
+ return config.is24HourFormat ?: _is24HourFormat
  }
 
  private fun getInitTime(): LocalTime {
@@ -194,9 +194,9 @@ internal class ClockState(
  * @param config The general configuration for the dialog view.
  */
  fun Saver(
- context: Context,
  selection: ClockSelection,
- config: ClockConfig
+ config: ClockConfig,
+ is24HourFormat: Boolean
  ): Saver<ClockState, *> = Saver(
  save = { state ->
  ClockStateData(
@@ -207,21 +207,22 @@ internal class ClockState(
  isAm = state.isAm
  )
  },
- restore = { data -> ClockState(context, selection, config, data) }
+ restore = { data -> ClockState(selection, config, is24HourFormat, data) }
  )
  }
 
  /**
  * Data class that stores the important information of the current state
  * and can be used by the [Saver] to save and restore the state.
  */
+ @Serializable
  data class ClockStateData(
  val groupIndex: Int,
  val valueIndex: Int,
  val is24HourFormat: Boolean,
  val time: LocalTime,
  val isAm: Boolean
- ) : Serializable
+ ) : JvmSerializable
 }
 
 /**
@@ -232,11 +233,17 @@ internal class ClockState(
  */
 @Composable
 internal fun rememberClockState(
- context: Context,
  selection: ClockSelection,
  config: ClockConfig,
-): ClockState = rememberSaveable(
- inputs = arrayOf(selection, config),
- saver = ClockState.Saver(context, selection, config),
- init = { ClockState(context, selection, config) }
-)
+): ClockState {
+ val is24Hour = is24HourFormat()
+
+ return rememberSaveable(
+ inputs = arrayOf(selection, config),
+ saver = ClockState.Saver(selection, config, is24Hour),
+ init = { ClockState(selection, config, is24Hour) }
+ )
+}
+
+@Composable
+internal expect fun is24HourFormat(): Boolean

clock/src/main/java/com/maxkeppeler/sheets/clock/ClockView.kt → clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/ClockView.kt

@@ -22,8 +22,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.models.base.Header
 import com.maxkeppeker.sheets.core.models.base.LibOrientation
@@ -38,7 +36,6 @@ import com.maxkeppeler.sheets.clock.views.KeyboardComponent
 import com.maxkeppeler.sheets.clock.views.LandscapeTimeValueComponent
 import com.maxkeppeler.sheets.clock.views.PortraitTimeValueComponent
 import com.maxkeppeler.sheets.clock.views.TimeHintComponent
-import com.maxkeppeler.sheets.core.R
 
 /**
  * Clock view for the use-case to to select a clock time.
@@ -55,8 +52,7 @@ fun ClockView(
  config: ClockConfig = ClockConfig(),
  header: Header? = null,
 ) {
- val context = LocalContext.current
- val clockState = rememberClockState(context, selection, config)
+ val clockState = rememberClockState(selection, config)
  StateHandler(useCaseState, clockState)
 
  FrameBase(

clock/src/main/java/com/maxkeppeler/sheets/clock/models/ClockConfig.kt → clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/models/ClockConfig.kt

@@ -19,7 +19,7 @@ import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
 import com.maxkeppeker.sheets.core.models.base.LibOrientation
 import com.maxkeppeker.sheets.core.utils.BaseConstants
-import java.time.LocalTime
+import kotlinx.datetime.LocalTime
 
 /**
  * The general configuration for the clock dialog.

clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/utils/ExtendAny.kt

@@ -0,0 +1,40 @@
+package com.maxkeppeler.sheets.clock.utils
+
+import kotlinx.datetime.Clock
+import kotlinx.datetime.LocalTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+
+internal fun LocalTime.Companion.now(): LocalTime {
+ return Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()).time
+}
+
+internal val Char.numericValue: Int
+ get() {
+ if (this.isDigit()) {
+ return this.digitToInt()
+ }
+ val codePoint = this.code
+
+ if (codePoint < 128) {
+ if (codePoint >= '0'.code && codePoint <= '9'.code) {
+ return codePoint - '0'.code
+ }
+ if (codePoint >= 'a'.code && codePoint <= 'z'.code) {
+ return codePoint - ('a'.code - 10)
+ }
+ if (codePoint >= 'A'.code && codePoint <= 'Z'.code) {
+ return codePoint - ('A'.code - 10)
+ }
+ return codePoint
+ }
+ // Full-width uppercase A-Z.
+ if (codePoint in 0xff21..0xff3a) {
+ return codePoint - 0xff17
+ }
+ // Full-width lowercase a-z.
+ if (codePoint in 0xff41..0xff5a) {
+ return codePoint - 0xff37
+ }
+ return codePoint
+ }

clock/src/commonMain/kotlin/com/maxkeppeler/sheets/clock/utils/FormatStyle.kt

@@ -0,0 +1,33 @@
+package com.maxkeppeler.sheets.clock.utils
+
+/**
+ * Enumeration of the style of a localized date, time or date-time formatter.
+ *
+ * These styles are used when obtaining a date-time style from configuration.
+ */
+enum class FormatStyle {
+ // ordered from large to small
+ /**
+ * Full text style, with the most detail.
+ * For example, the format might be 'Tuesday, April 12, 1952 AD' or '3:30:42pm PST'.
+ */
+ FULL,
+
+ /**
+ * Long text style, with lots of detail.
+ * For example, the format might be 'January 12, 1952'.
+ */
+ LONG,
+
+ /**
+ * Medium text style, with some detail.
+ * For example, the format might be 'Jan 12, 1952'.
+ */
+ MEDIUM,
+
+ /**
+ * Short text style, typically numeric.
+ * For example, the format might be '12.13.52' or '3:30pm'.
+ */
+ SHORT
+}