migrate state module

rating/src/commonMain/kotlin/com/maxkeppeler/sheets/rating/RatingState.kt

@@ -68,7 +68,7 @@ internal class RatingState(
  private fun isRatingValid(): Boolean = if (config.ratingZeroValid) {
  true
  } else {
- rating != null
+ rating != null && (rating ?: 0) > 0
  }
 
  private fun isFeedbackValid(): Boolean =

settings.gradle.kts

@@ -19,7 +19,7 @@ include(
  //":date_time",
  //":color",
  ":option",
- //":state",
+ ":state",
  //":input",
  //":emoji",
  ":list",

state/build.gradle.kts

@@ -1,27 +1,57 @@
-/*
- * 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
- *
- * 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.STATE.namespace
+ compileSdk = 34
+
+ defaultConfig {
+ minSdk = 21
+ }
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
 }
 
-mavenPublishing {
- publishToMavenCentral()
- signAllPublications()
+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.serialization)
+
+ api(project(":core"))
+ }
+ }
 }

state/src/main/java/com/maxkeppeler/sheets/state/StateView.kt → state/src/commonMain/kotlin/com/maxkeppeler/sheets/state/StateView.kt

@@ -21,13 +21,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-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.views.base.FrameBase
 import com.maxkeppeler.sheets.state.models.StateConfig
 import com.maxkeppeler.sheets.state.models.StateSelection
 import com.maxkeppeler.sheets.state.views.StateComponent
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * State dialog for the use-case to display various states.

state/src/main/java/com/maxkeppeler/sheets/state/views/CircularProgressIndicator.kt → state/src/commonMain/kotlin/com/maxkeppeler/sheets/state/views/CircularProgressIndicator.kt

@@ -22,20 +22,18 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
-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.state.R
 import com.maxkeppeler.sheets.state.models.ProgressIndicator
-import com.maxkeppeler.sheets.core.R as RC
 
 @Composable
 internal fun CircularProgressIndicator(
  indicator: ProgressIndicator.Circular,
 ) {
  val circularIndicatorModifier = Modifier
  .padding(24.dp)
- .width(dimensionResource(id = R.dimen.scd_state_dialog_indicator_width))
+ .width(64.dp)
  .aspectRatio(1f)
 
  indicator.customProgressIndicator?.invoke(indicator.value!!)

state/src/main/java/com/maxkeppeler/sheets/state/views/LinearProgressIndicator.kt → state/src/commonMain/kotlin/com/maxkeppeler/sheets/state/views/LinearProgressIndicator.kt

@@ -22,11 +22,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
-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.state.models.ProgressIndicator
-import com.maxkeppeler.sheets.core.R as RC
 
 @Composable
 internal fun LinearProgressIndicator(
@@ -47,9 +46,9 @@ internal fun LinearProgressIndicator(
  )
  }
  LinearProgressIndicator(
- progress = progress,
+ progress = { progress },
  modifier = linearIndicatorModifier
- .testTags(TestTags.STATE_LOADING_LINEAR, progress)
+ .testTags(TestTags.STATE_LOADING_LINEAR, progress),
  )
  } ?: run {
  LinearProgressIndicator(

state/src/main/java/com/maxkeppeler/sheets/state/views/StateFailureComponent.kt → state/src/commonMain/kotlin/com/maxkeppeler/sheets/state/views/StateFailureComponent.kt

@@ -22,11 +22,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeler.sheets.state.models.State
 import com.maxkeppeler.sheets.state.models.StateConfig
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The failure state component.
@@ -43,7 +42,7 @@ internal fun StateFailureComponent(
  modifier = Modifier
  .testTag(TestTags.STATE_FAILURE)
  .padding(vertical = 16.dp)
- .size(dimensionResource(id = RC.dimen.scd_size_350)),
+ .size(56.dp),
  imageVector = config.icons.Error,
  contentDescription = null,
  tint = Color.Red

state/src/main/java/com/maxkeppeler/sheets/state/views/StateSuccessComponent.kt → state/src/commonMain/kotlin/com/maxkeppeler/sheets/state/views/StateSuccessComponent.kt

@@ -22,11 +22,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeler.sheets.state.models.State
 import com.maxkeppeler.sheets.state.models.StateConfig
-import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The success state component.
@@ -43,7 +42,7 @@ internal fun StateSuccessComponent(
  modifier = Modifier
  .testTag(TestTags.STATE_SUCCESS)
  .padding(vertical = 16.dp)
- .size(dimensionResource(id = RC.dimen.scd_size_350)),
+ .size(56.dp),
  imageVector = config.icons.Check,
  contentDescription = null,
  tint = Color.Green