migrate color module

clock/src/main/java/com/maxkeppeler/sheets/clock/ClockView.kt

@@ -67,7 +67,7 @@ fun ClockView(
  PortraitTimeValueComponent(
  modifier = Modifier
  .fillMaxWidth()
- .padding(bottom = dimensionResource(R.dimen.scd_normal_100)),
+ .padding(bottom = 16.dp),
  unitValues = clockState.timeTextValues,
  isAm = clockState.isAm,
  is24hourFormat = clockState.is24HourFormat,

color/build.gradle.kts

@@ -1,27 +1,49 @@
-/*
- * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http:https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+import com.vanniktech.maven.publish.SonatypeHost
+
 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.COLOR.namespace
+ namespace = Modules.OPTION.namespace
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 21
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+}
+
+kotlin {
+ androidTarget {
+ publishAllLibraryVariants()
+ }
+ jvm()
+
+ applyDefaultHierarchyTemplate()
+
+ sourceSets {
+ commonMain.dependencies {
+ implementation(compose.runtime)
+ implementation(compose.foundation)
+ implementation(compose.material3)
+ implementation(compose.components.resources)
+
+ implementation(libs.serialization)
+
+ api(project(":core"))
+ }
+ }
 }
 
 mavenPublishing {
- publishToMavenCentral()
- signAllPublications()
-}
+ publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
+}

color/src/main/java/com/maxkeppeler/sheets/color/ColorState.kt → color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/ColorState.kt

@@ -15,7 +15,6 @@
  */
 package com.maxkeppeler.sheets.color
 
-import android.content.Context
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -36,7 +35,6 @@ import java.io.Serializable
  * @param stateData The data of the state when the state is required to be restored.
  */
 internal class ColorState(
- private val context: Context,
  val selection: ColorSelection,
  val config: ColorConfig = ColorConfig(),
  stateData: ColorStateData? = null,
@@ -48,10 +46,10 @@ internal class ColorState(
  var valid by mutableStateOf(isValid())
 
  private fun getInitColor(): Int? =
- selection.selectedColor?.colorInInt(context)
+ selection.selectedColor?.colorInInt()
 
  private fun getInitColors(): List<Int> =
- config.templateColors.getColorsAsInt(context)
+ config.templateColors.getColorsAsInt()
 
  private fun getInitDisplayMode(): ColorSelectionMode =
  config.defaultDisplayMode.takeUnless {
@@ -86,12 +84,11 @@ internal class ColorState(
  * @param config The general configuration for the dialog view.
  */
  fun Saver(
- context: Context,
  selection: ColorSelection,
  config: ColorConfig
  ): Saver<ColorState, *> = Saver(
  save = { state -> ColorStateData(state.color, state.displayMode) },
- restore = { data -> ColorState(context, selection, config, data) }
+ restore = { data -> ColorState(selection, config, data) }
  )
  }
 
@@ -113,11 +110,10 @@ internal class ColorState(
  */
 @Composable
 internal fun rememberColorState(
- context: Context,
  selection: ColorSelection,
  config: ColorConfig,
 ): ColorState = rememberSaveable(
  inputs = arrayOf(selection, config),
- saver = ColorState.Saver(context, selection, config),
- init = { ColorState(context, selection, config) }
+ saver = ColorState.Saver(selection, config),
+ init = { ColorState(selection, config) }
 )

color/src/main/java/com/maxkeppeler/sheets/color/ColorView.kt → color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/ColorView.kt

@@ -22,7 +22,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
 import com.maxkeppeker.sheets.core.models.base.*
 import com.maxkeppeker.sheets.core.views.ButtonsComponent
 import com.maxkeppeker.sheets.core.views.base.FrameBase
@@ -48,8 +47,7 @@ fun ColorView(
  config: ColorConfig = ColorConfig(),
  header: Header? = null,
 ) {
- val context = LocalContext.current
- val colorState = rememberColorState(context, selection, config)
+ val colorState = rememberColorState(selection, config)
  StateHandler(useCaseState, colorState)
 
  val coroutine = rememberCoroutineScope()

color/src/main/java/com/maxkeppeler/sheets/color/models/MultipleColors.kt → color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/MultipleColors.kt

@@ -17,11 +17,8 @@
 
 package com.maxkeppeler.sheets.color.models
 
-import android.content.Context
-import android.graphics.Color
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 
 /**
  * Holds various colors of a specific type.
@@ -30,29 +27,10 @@ import androidx.core.content.ContextCompat
  * @param colorsHex color as String value, #RRGGBB or #AARRGGBB.
  */
 sealed class MultipleColors(
- @ColorInt private var colorsInt: Array<Int>? = null,
- @ColorRes private var colorsRes: Array<Int>? = null,
+ private var colorsInt: Array<Int>? = null,
  private var colorsHex: Array<String>? = null,
 ) {
 
- /**
- * Define a variety of color integers.
- */
- class ColorsRes : MultipleColors {
-
- /**
- * Define dynamic amount of colors.
- * @param colors The color integers
- */
- constructor(@ColorRes vararg colors: Int) : super(colorsRes = colors.toTypedArray())
-
- /**
- * Define a list of colors.
- * @param colors The color integers
- */
- constructor(@ColorRes colors: List<Int>) : super(colorsRes = colors.toTypedArray())
- }
-
  /**
  * Define a variety of color resource references.
  */
@@ -62,13 +40,13 @@ sealed class MultipleColors(
  * Define dynamic amount of colors.
  * @param colors The color resource references
  */
- constructor(@ColorInt vararg colors: Int) : super(colorsInt = colors.toTypedArray())
+ constructor(vararg colors: Int) : super(colorsInt = colors.toTypedArray())
 
  /**
  * Define an array of colors.
  * @param colors The color resource references
  */
- constructor(@ColorInt colors: List<Int>) : super(colorsInt = colors.toTypedArray())
+ constructor(colors: List<Int>) : super(colorsInt = colors.toTypedArray())
  }
 
  /**
@@ -93,10 +71,12 @@ sealed class MultipleColors(
  * Resolve the defined colors as color integers.
  * @param context the Context to resolve the colors.
  */
- fun getColorsAsInt(context: Context): List<Int> {
+ @OptIn(ExperimentalStdlibApi::class)
+ fun getColorsAsInt(): List<Int> {
  return colorsInt?.toList()
- ?: colorsRes?.map { ContextCompat.getColor(context, it) }
- ?: colorsHex?.map { Color.parseColor(it) }
+ ?: colorsHex?.map {
+ Color(it.substringAfter('#').hexToLong()).toArgb()
+ }
  ?: throw IllegalStateException("No colors available for color templates view. Either disabled template view or add colors.")
  }
 }

color/src/main/java/com/maxkeppeler/sheets/color/models/SingleColor.kt → color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/models/SingleColor.kt

@@ -15,11 +15,9 @@
  */
 package com.maxkeppeler.sheets.color.models
 
-import android.content.Context
-import android.graphics.Color
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+
 
 /**
  * Helper class to simplify passing colors.
@@ -28,11 +26,12 @@ import androidx.core.content.ContextCompat
  * @param colorHex Color value as Hex-String.
  */
 data class SingleColor(
- @ColorInt val colorInt: Int? = null,
- @ColorRes val colorRes: Int? = null,
+ val colorInt: Int? = null,
  val colorHex: String? = null,
 ) {
- fun colorInInt(context: Context): Int? = colorInt
- ?: colorRes?.let { ContextCompat.getColor(context, it) }
- ?: colorHex?.let { Color.parseColor(it) }
+ @OptIn(ExperimentalStdlibApi::class)
+ fun colorInInt(): Int? = colorInt
+ ?: colorHex?.let {
+ Color(it.substringAfter('#').hexToLong()).toArgb()
+ }
 }

color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/utils/Utils.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022-2024. Maximilian Keppeler (https://www.maxkeppeler.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.maxkeppeler.sheets.color.utils
+
+/** Receive the clipboard data. */
+@OptIn(ExperimentalStdlibApi::class)
+internal fun getFormattedColor(color: Int): String {
+ return "#" + (0xFFFFFFFF and color.toLong()).toHexString()
+}

color/src/main/java/com/maxkeppeler/sheets/color/views/ColorCustomControlComponent.kt → color/src/commonMain/kotlin/com/maxkeppeler/sheets/color/views/ColorCustomControlComponent.kt

@@ -21,27 +21,27 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.res.dimensionResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.graphics.alpha
-import androidx.core.graphics.blue
-import androidx.core.graphics.green
-import androidx.core.graphics.red
 import com.maxkeppeker.sheets.core.models.base.LibOrientation
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testSequenceTagOf
 import com.maxkeppeker.sheets.core.views.Grid
-import com.maxkeppeler.sheets.color.R
 import com.maxkeppeler.sheets.color.models.ColorConfig
-import com.maxkeppeler.sheets.core.R as RC
+import org.jetbrains.compose.resources.ExperimentalResourceApi
+import org.jetbrains.compose.resources.stringResource
+import sheets_compose_dialogs.color.generated.resources.*
+import sheets_compose_dialogs.color.generated.resources.Res
+import sheets_compose_dialogs.color.generated.resources.scd_color_dialog_alpha
+import sheets_compose_dialogs.color.generated.resources.scd_color_dialog_blue
+import sheets_compose_dialogs.color.generated.resources.scd_color_dialog_green
 
 /**
  * The control component to build up a custom color.
  * @param config The general configuration for the dialog view.
  * @param color The color that is currently selected.
  * @param onColorChange The listener that returns a selected color.
  */
+@OptIn(ExperimentalResourceApi::class)
 @Composable
 internal fun ColorCustomControlComponent(
  config: ColorConfig,
@@ -50,13 +50,18 @@ internal fun ColorCustomControlComponent(
  onColorChange: (Int) -> Unit
 ) {
 
+ val composeColor = Color(color)
  val alphaValue = remember(color) {
- val value = if (config.allowCustomColorAlphaValues) color.alpha else 255
+ val value = if (config.allowCustomColorAlphaValues) {
+ composeColor.alpha
+ } else {
+ 1F
+ }
  mutableStateOf(value)
  }
- val redValue = remember(color) { mutableStateOf(color.red) }
- val greenValue = remember(color) { mutableStateOf(color.green) }
- val blueValue = remember(color) { mutableStateOf(color.blue) }
+ val redValue = remember(color) { mutableStateOf(composeColor.red) }
+ val greenValue = remember(color) { mutableStateOf(composeColor.green) }
+ val blueValue = remember(color) { mutableStateOf(composeColor.blue) }
 
  val newColor by remember(alphaValue.value, redValue.value, greenValue.value, blueValue.value) {
  mutableStateOf(Color(redValue.value, greenValue.value, blueValue.value, alphaValue.value))
@@ -68,10 +73,10 @@ internal fun ColorCustomControlComponent(
  val colorValueLabelWidth = remember { mutableStateOf<Int?>(null) }
 
  val colorItems = mutableListOf(
- if (config.allowCustomColorAlphaValues) stringResource(R.string.scd_color_dialog_alpha) to alphaValue else null,
- stringResource(R.string.scd_color_dialog_red) to redValue,
- stringResource(R.string.scd_color_dialog_green) to greenValue,
- stringResource(R.string.scd_color_dialog_blue) to blueValue
+ if (config.allowCustomColorAlphaValues) stringResource(Res.string.scd_color_dialog_alpha) to alphaValue else null,
+ stringResource(Res.string.scd_color_dialog_red) to redValue,
+ stringResource(Res.string.scd_color_dialog_green) to greenValue,
+ stringResource(Res.string.scd_color_dialog_blue) to blueValue
  ).filterNotNull()
 
  Grid(
@@ -87,7 +92,9 @@ internal fun ColorCustomControlComponent(
  columnSpacing = 24.dp
  ) { entry ->
  val index = colorItems.indexOf(entry)
- val onValueChange: (Int) -> Unit = { entry.second.value = it }
+ val onValueChange: (Int) -> Unit = {
+ entry.second.value = it.toFloat()
+ }
  val sliderTestTag = testSequenceTagOf(
  TestTags.COLOR_CUSTOM_VALUE_SLIDER,
  index.toString()
@@ -96,7 +103,7 @@ internal fun ColorCustomControlComponent(
  LibOrientation.PORTRAIT ->
  ColorCustomControlListItemComponent(
  label = entry.first,
- value = entry.second.value,
+ value = entry.second.value.toInt(),
  onValueChange = onValueChange,
  colorItemLabelWidth = colorItemLabelWidth,
  colorValueLabelWidth = colorValueLabelWidth,
@@ -105,7 +112,7 @@ internal fun ColorCustomControlComponent(
  LibOrientation.LANDSCAPE ->
  ColorCustomControlGridItemComponent(
  label = entry.first,
- value = entry.second.value,
+ value = entry.second.value.toInt(),
  onValueChange = onValueChange,
  sliderTestTag = sliderTestTag,
  )