Merge pull request benjamin-luescher#4 from benjamin-luescher/develop

Fix nullable picker value and update version to 0.2.3

Author: benjamin-luescher

README.md

@@ -23,7 +23,7 @@ dependencyResolutionManagement {
 
 2. Add the dependency in your build.gradle file.
 ```kotlin
-implementation 'com.github.benjamin-luescher:compose-form:0.2.2'
+implementation 'com.github.benjamin-luescher:compose-form:0.2.3'
 ```
 
 ## Easy example

app/src/main/java/com/edorex/mobile/composeForm/MainActivity.kt

@@ -95,6 +95,14 @@ fun FormPage() {
                             fieldState = viewModel.form.country
                         ).Field()
 
+                        PickerField(
+                            modifier = Modifier.padding(bottom = 8.dp),
+                            label = "Country Not searchable",
+                            form = viewModel.form,
+                            fieldState = viewModel.form.countryNotSearchable,
+                            isSearchable = false
+                        ).Field()
+
                         DateField(
                             modifier = Modifier.padding(bottom = 8.dp),
                             label = "Start Date",

app/src/main/java/com/edorex/mobile/composeForm/MainForm.kt

@@ -75,6 +75,23 @@ class MainForm(resourcesProvider: ResourcesProvider): Form() {
         )
     )
 
+    @FormField
+    val countryNotSearchable = FieldState(
+        state = mutableStateOf<Country?>(null),
+        options = mutableListOf(
+            null,
+            Country(code = "CH", name = "Switzerland"),
+            Country(code = "DE", name = "Germany")
+        ),
+        optionItemFormatter = {
+            if (it != null) {
+                "${it.name} (${it.code})"
+            } else {
+                "All"
+            }
+        }
+    )
+
     @FormField
     val startDate = FieldState(
         state = mutableStateOf<Date?>(null),

composeform/build.gradle

@@ -69,7 +69,7 @@ publishing {
         release(MavenPublication) {
             groupId = 'com.github.benjamin-luescher'
             artifactId = 'compose-form'
-            version = '0.2.2'
+            version = '0.2.3'
 
             afterEvaluate {
                 from components.release

composeform/src/main/java/ch/benlu/composeform/components/RadioButtonComponent.kt

@@ -23,7 +23,7 @@ fun <T>RadioButtonComponent(
         Modifier
             .fillMaxWidth()
             .selectable(
-                selected = ((value ?: label) == selectedValue),
+                selected = value == selectedValue,
                 onClick = {
                     onClickListener(value)
                 }
@@ -33,7 +33,7 @@ fun <T>RadioButtonComponent(
             modifier = Modifier
                 .padding(start = 16.dp)
                 .align(alignment = Alignment.CenterVertically),
-            selected = ((value ?: label) == selectedValue),
+            selected = value == selectedValue,
             onClick = {
                 onClickListener(value)
             }

composeform/src/main/java/ch/benlu/composeform/components/SingleSelectDialogComponent.kt

@@ -22,7 +22,7 @@ fun <T> SingleSelectDialogComponent(
     optionsList: MutableList<T?>,
     defaultSelected: T?,
     submitButtonText: String,
-    onSubmitButtonClick: (T) -> Unit,
+    onSubmitButtonClick: (T?) -> Unit,
     onDismissRequest: () -> Unit,
     optionItemFormatter: ((T?) -> String)? = null,
     search: ((options: MutableList<T?>, query: String) -> List<T?>)? = null
@@ -102,7 +102,7 @@ fun <T> SingleSelectDialogComponent(
                         Button(
                             onClick = {
                                 if (selectedOption.value >= 0 && optionsList.size > selectedOption.value) {
-                                    onSubmitButtonClick.invoke(optionsList[selectedOption.value]!!)
+                                    onSubmitButtonClick.invoke(optionsList[selectedOption.value])
                                 }
                                 onDismissRequest.invoke()
                             },

composeform/src/main/java/ch/benlu/composeform/fields/PickerField.kt

@@ -28,7 +28,8 @@ class PickerField<T: PickerValue>(
     isVisible: Boolean = true,
     isEnabled: Boolean = true,
     imeAction: ImeAction = ImeAction.Next,
-    formatter: ((raw: T?) -> String)? = null
+    formatter: ((raw: T?) -> String)? = null,
+    private val isSearchable: Boolean = true
 ) : Field<T>(
     label = label,
     form = form,
@@ -86,10 +87,15 @@ class PickerField<T: PickerValue>(
                 onDismissRequest = {
                     isDialogVisible = false
                     focusManager.clearFocus()
+                },
+                search = if (isSearchable) {
+                    { options, query ->
+                        options.filter { c -> c?.searchFilter(query) == true }
+                    }
+                } else {
+                    null
                 }
-            ) { options, query ->
-                options.filter { c -> c?.searchFilter(query) == true }
-            }
+            )
         }
     }