migrate input module

input/build.gradle.kts

@@ -1,27 +1,60 @@
-/*
- * 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.INPUT.namespace
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 21
+ }
+ compileOptions {
+ 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(libs.serialization)
+
+ api(project(":core"))
+ }
+ }
 }
 
 mavenPublishing {
- publishToMavenCentral()
- signAllPublications()
-}
+ publishToMavenCentral(SonatypeHost.S01, automaticRelease = true)
+}

input/src/main/java/com/maxkeppeler/sheets/input/InputPopup.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/InputPopup.kt

@@ -38,6 +38,7 @@ import com.maxkeppeler.sheets.input.models.InputSelection
  * @param offset The offset of the popup.
  * @param properties PopupProperties for further customization of this popup's behavior.
  */
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun InputPopup(
  state: UseCaseState,

input/src/main/java/com/maxkeppeler/sheets/input/InputState.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/InputState.kt

@@ -15,14 +15,14 @@
  */
 package com.maxkeppeler.sheets.input
 
-import android.os.Bundle
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
 import com.maxkeppeker.sheets.core.views.BaseTypeState
 import com.maxkeppeler.sheets.input.models.Input
 import com.maxkeppeler.sheets.input.models.InputSelection
-import java.io.Serializable
+import kotlinx.serialization.Serializable
 
 /**
  * Handles the list state.
@@ -61,14 +61,12 @@ internal class InputState(
  }
 
  fun onFinish() {
- val bundle = Bundle()
  input.forEach { input ->
  if (input.isInput()) {
  input.onResult()
- input.putValue(bundle)
  }
  }
- selection.onPositiveClick?.invoke(bundle)
+ selection.onPositiveClick?.invoke()
  }
 
  override fun reset() {
@@ -95,9 +93,10 @@ internal class InputState(
  * 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 InputStateData(
  val input: List<Input>
- ) : Serializable
+ ) : JvmSerializable
 }
 
 

input/src/main/java/com/maxkeppeler/sheets/input/models/Input.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/Input.kt

@@ -17,8 +17,8 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
-import java.io.Serializable
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
+import kotlinx.serialization.Serializable
 
 /**
  * Base input definition that can be added to the input dialog.
@@ -27,12 +27,13 @@ import java.io.Serializable
  * @param header The additional [InputHeader] to add more context information to the selection.
  * @param columns The columns that this input spans.
  */
+@Serializable
 abstract class Input(
  internal open val key: String? = null,
  internal open val required: Boolean = false,
  internal open val header: InputHeader? = null,
  internal open val columns: Int? = null,
-) : Serializable {
+) : JvmSerializable {
 
  internal var position: Int = 0
 
@@ -58,13 +59,6 @@ abstract class Input(
  */
  internal open fun onResult(): Unit? = Unit
 
- /**
- * Save the input value into the bundle.
- * Takes the index as an key, if there's no unique input key available.
- * @param bundle The bundle where the input data is saved.
- */
- internal open fun putValue(bundle: Bundle): Unit? = Unit
-
  /**
  * Helper method that either uses the key or the index as String to assign key-value pairs
  * Returns the key that is used to store input data in the bundle.

input/src/main/java/com/maxkeppeler/sheets/input/models/InputCheckbox.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputCheckbox.kt

@@ -17,8 +17,6 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
-
 /**
  * Represents a checkbox.
  * @param text The text to the checkbox.
@@ -56,6 +54,4 @@ class InputCheckbox(
 
  override fun isValid(): Boolean = (required && value) || !required
 
- override fun putValue(bundle: Bundle) = bundle.putBoolean(getBundleKey(), value)
-
 }

input/src/main/java/com/maxkeppeler/sheets/input/models/InputCheckboxGroup.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputCheckboxGroup.kt

@@ -17,8 +17,6 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
-
 /**
  * Represents a group of checkboxes.
  * @param items A list of Strings representing the individual checkbox text.
@@ -55,6 +53,4 @@ class InputCheckboxGroup(
  override fun onResult() = resultListener?.invoke(value)
 
  override fun isValid(): Boolean = required && value.isNotEmpty() || !required
-
- override fun putValue(bundle: Bundle) = bundle.putIntArray(getBundleKey(), value.toIntArray())
 }

input/src/main/java/com/maxkeppeler/sheets/input/models/InputHeader.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputHeader.kt

@@ -18,16 +18,19 @@
 package com.maxkeppeler.sheets.input.models
 
 import com.maxkeppeker.sheets.core.models.base.IconSource
-import java.io.Serializable
+import com.maxkeppeker.sheets.core.utils.JvmSerializable
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 /**
  * Represents a header that can be added to invidual input types.
  * @param title The text that is used for the title.
  * @param body The text that is used for the body.
  * @param icon The icon that is displayed on the left side of the title.
  */
+@Serializable
 class InputHeader(
  val title: String? = null,
  val body: String? = null,
- val icon: IconSource? = null,
-) : Serializable
+ @Transient val icon: IconSource? = null,
+) : JvmSerializable

input/src/main/java/com/maxkeppeler/sheets/input/models/InputRadioButtonGroup.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputRadioButtonGroup.kt

@@ -17,8 +17,6 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
-
 /**
  * Represents a group of radio buttons.
  * @param items A list of Strings representing the individual radio button text.
@@ -56,6 +54,4 @@ class InputRadioButtonGroup(
 
  override fun isValid(): Boolean = required && value != null || !required
 
- override fun putValue(bundle: Bundle) = value?.let { bundle.putInt(getBundleKey(), it) }
-
 }

input/src/main/java/com/maxkeppeler/sheets/input/models/InputSelection.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputSelection.kt

@@ -17,7 +17,6 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
 import com.maxkeppeker.sheets.core.models.base.BaseSelection
 import com.maxkeppeker.sheets.core.models.base.SelectionButton
 import com.maxkeppeker.sheets.core.utils.BaseConstants
@@ -41,5 +40,5 @@ class InputSelection(
  override val negativeButton: SelectionButton? = BaseConstants.DEFAULT_NEGATIVE_BUTTON,
  override val onNegativeClick: (() -> Unit)? = null,
  override val positiveButton: SelectionButton = BaseConstants.DEFAULT_POSITIVE_BUTTON,
- val onPositiveClick: ((result: Bundle) -> Unit)? = null,
+ val onPositiveClick: (() -> Unit)? = null,
 ) : BaseSelection()

input/src/main/java/com/maxkeppeler/sheets/input/models/InputTextField.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/models/InputTextField.kt

@@ -18,7 +18,6 @@
 
 package com.maxkeppeler.sheets.input.models
 
-import android.os.Bundle
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -89,8 +88,4 @@ data class InputTextField(
  val requiredValid = (required && value?.isNotEmpty() == true || !required)
  return customValidationOk && requiredValid
  }
-
- override fun putValue(bundle: Bundle) {
- bundle.putString(getBundleKey(), value)
- }
 }

input/src/main/java/com/maxkeppeler/sheets/input/views/InputCheckboxComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputCheckboxComponent.kt

@@ -24,12 +24,11 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.input.models.Input
 import com.maxkeppeler.sheets.input.models.InputCheckbox
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * Checkbox component.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputCheckboxGroupComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputCheckboxGroupComponent.kt

@@ -23,12 +23,11 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.input.models.Input
 import com.maxkeppeler.sheets.input.models.InputCheckboxGroup
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * Checkbox-Group component.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputCheckboxItemComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputCheckboxItemComponent.kt

@@ -24,10 +24,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The CheckBox item for the CheckBox-Group.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputComponent.kt

@@ -22,10 +22,9 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeler.sheets.input.models.Input
 import com.maxkeppeler.sheets.input.models.InputConfig
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * Input component that displays the setup inputs.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputDividerComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputDividerComponent.kt

@@ -21,10 +21,9 @@ import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * Divider component.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputItemHeaderComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputItemHeaderComponent.kt

@@ -21,13 +21,11 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeker.sheets.core.views.IconComponent
 import com.maxkeppeler.sheets.input.models.InputHeader
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The header for an input item type component.

input/src/main/java/com/maxkeppeler/sheets/input/views/InputItemOverlayComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputItemOverlayComponent.kt

@@ -23,11 +23,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.input.models.InputConfig
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The overlay for an input item type component when the data is required.
@@ -43,7 +42,7 @@ internal fun BoxScope.InputItemOverlayComponent(
  .align(Alignment.TopEnd)
  .testTags(TestTags.INPUT_ITEM_OVERLAY, index)
  .padding(8.dp)
- .size(dimensionResource(RC.dimen.scd_size_50)),
+ .size(8.dp),
  imageVector = config.icons.Star,
  contentDescription = null,
  tint = MaterialTheme.colorScheme.error

input/src/main/java/com/maxkeppeler/sheets/input/views/InputRadioButtonGroupComponent.kt → input/src/commonMain/kotlin/com/maxkeppeler/sheets/input/views/InputRadioButtonGroupComponent.kt

@@ -20,12 +20,11 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.input.models.Input
 import com.maxkeppeler.sheets.input.models.InputRadioButtonGroup
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * RadioButton-Group component.