#309 fix usage of moko-fields

Author: Alex009

widgets-media/src/iosMain/kotlin/dev/icerock/moko/widgets/media/MediaControllerExt.kt

@@ -16,6 +16,4 @@ actual fun Screen<*>.createMediaPickerController(permissionsController: Permissi
     )
 }
 
-actual fun MediaPickerController.bind(screen: Screen<*>) {
-    // nothing todo - bind only for android
-}
+actual fun MediaPickerController.bind(screen: Screen<*>) = Unit

widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemSingleChoiceViewFactory.kt

@@ -129,17 +129,16 @@ actual class SystemSingleChoiceViewFactory actual constructor(
             spinner.setPopupBackgroundDrawable(it.buildBackground(context))
         }
 
-        // TODO fixme
-//        widget.field.data.mergeWith(widget.values) { index, values ->
-//            if (index == null) null
-//            else values[index]
-//        }.bind(lifecycleOwner) { stringDesc ->
-//            val string = stringDesc?.toString(context)
-//
-//            if (editText.text?.toString() == string) return@bind
-//
-//            editText.setText(string)
-//        }
+        widget.field.data.mergeWith(widget.values) { index, values ->
+            if (index == null) null
+            else values[index]
+        }.bind(lifecycleOwner) { stringDesc ->
+            val string = stringDesc?.toString(context)
+
+            if (editText.text?.toString() == string) return@bind
+
+            editText.setText(string)
+        }
         widget.field.observeError(lifecycleOwner) { error ->
             textInputLayout.error = error?.toString(context)
             textInputLayout.isErrorEnabled = error != null

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/InputWidget.kt

@@ -4,7 +4,7 @@
 
 package dev.icerock.moko.widgets.core.widget
 
-import dev.icerock.moko.fields.core.FormField
+import dev.icerock.moko.fields.livedata.FormField
 import dev.icerock.moko.mvvm.livedata.LiveData
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.widgets.core.RequireId

widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/widget/SingleChoiceWidget.kt

@@ -4,7 +4,7 @@
 
 package dev.icerock.moko.widgets.core.widget
 
-import dev.icerock.moko.fields.core.FormField
+import dev.icerock.moko.fields.livedata.FormField
 import dev.icerock.moko.mvvm.livedata.LiveData
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.widgets.core.RequireId

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/BaseInputViewFactory.kt

@@ -4,15 +4,15 @@
 
 package dev.icerock.moko.widgets.core.factory
 
-import dev.icerock.moko.fields.core.FormField
+import dev.icerock.moko.fields.livedata.FormField
 import dev.icerock.moko.mvvm.livedata.LiveData
+import dev.icerock.moko.mvvm.utils.bind
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.widgets.core.ViewBundle
 import dev.icerock.moko.widgets.core.ViewFactory
 import dev.icerock.moko.widgets.core.ViewFactoryContext
 import dev.icerock.moko.widgets.core.style.view.MarginValues
 import dev.icerock.moko.widgets.core.style.view.WidgetSize
-import dev.icerock.moko.widgets.core.utils.bind
 import dev.icerock.moko.widgets.core.utils.setEventHandler
 import dev.icerock.moko.widgets.core.widget.InputWidget
 import platform.Foundation.NSMakeRange
@@ -50,33 +50,33 @@ abstract class BaseInputViewFactory<V : UIView> : ViewFactory<InputWidget<out Wi
         rootView: V,
         textField: UITextField
     ) {
-        enabled?.bind { textField.enabled = it }
+        if (enabled == null) return
+        textField.bind(enabled) { this.enabled = it }
     }
 
     protected open fun bindLabel(
         label: LiveData<StringDesc>,
         rootView: V,
         textField: UITextField
     ) {
-        label.bind { textField.placeholder = it.localized() }
+        textField.bind(label) { this.placeholder = it.localized() }
     }
 
     protected open fun bindFieldToTextField(
         field: FormField<String, StringDesc>,
         rootView: V,
         textField: UITextField
     ) {
-        // TODO check leaks?
-        field.observeData { newValue ->
-            val currentText = textField.text.orEmpty()
-            val shouldApplyChange = textField.delegate?.run {
+        textField.bind(field.data) { newValue ->
+            val currentText = this.text.orEmpty()
+            val shouldApplyChange = this.delegate?.run {
                 textField(
-                    textField,
+                    this@bind,
                     NSMakeRange(0.toULong(), currentText.length.toULong()), newValue
                 )
             } ?: true
             if (shouldApplyChange) {
-                textField.text = newValue
+                this.text = newValue
             }
         }
 

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/FloatingLabelInputViewFactory.kt

@@ -4,7 +4,7 @@
 
 package dev.icerock.moko.widgets.core.factory
 
-import dev.icerock.moko.fields.core.FormField
+import dev.icerock.moko.fields.livedata.FormField
 import dev.icerock.moko.graphics.Color
 import dev.icerock.moko.graphics.toUIColor
 import dev.icerock.moko.mvvm.livedata.LiveData
@@ -125,15 +125,14 @@ actual class FloatingLabelInputViewFactory actual constructor(
         textField: UITextField
     ) {
         super.bindFieldToTextField(field, rootView, textField)
-        // TODO check leaks?
-        field.observeData {
-            if (!textField.isEditing()) {
+
+        textField.bind(field.data) {
+            if (!isEditing()) {
                 rootView.layoutPlaceholder()
             }
         }
-        // TODO check leaks?
-        field.observeError {
-            rootView.error = it?.localized()
+        rootView.bind(field.error) {
+            this.error = it?.localized()
         }
     }
 

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/InputLengthViewFactory.kt

@@ -19,12 +19,11 @@ actual open class InputLengthViewFactory : ViewFactory<InputLengthWidget<out Wid
     ): ViewBundle<WS> {
         val bundle = widget.child.buildView(viewFactoryContext) as ViewBundle<WS>
 
-        // TODO fixme
-//        widget.maxLength.mergeWith(widget.child.field.data) { maxLength, userInput ->
-//            if (maxLength != null && userInput.length > maxLength) {
-//                widget.child.field.data.value = userInput.take(maxLength)
-//            }
-//        }
+        widget.maxLength.mergeWith(widget.child.field.data) { maxLength, userInput ->
+            if (maxLength != null && userInput.length > maxLength) {
+                widget.child.field.data.value = userInput.take(maxLength)
+            }
+        }
 
         return bundle
     }

widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/MultilineInputViewFactory.kt

@@ -6,6 +6,7 @@ package dev.icerock.moko.widgets.core.factory
 
 import dev.icerock.moko.graphics.Color
 import dev.icerock.moko.graphics.toUIColor
+import dev.icerock.moko.mvvm.utils.bind
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.widgets.core.ViewBundle
 import dev.icerock.moko.widgets.core.ViewFactory
@@ -91,9 +92,10 @@ actual class MultilineInputViewFactory actual constructor(
             }
         }
 
-        widget.enabled?.bind { textView.editable = it }
-        // TODO check leaks?
-        widget.field.observeData { textView.text = it }
+        widget.enabled?.let { enabled ->
+            textView.bind(enabled) { this.editable = it }
+        }
+        textView.bind(widget.field.data) { this.text = it }
 
         val nc = NSNotificationCenter.defaultCenter
         val observer = TextViewObserver(