Merge pull request #202 from icerockdev/develop

Release 0.14.0

README.md

@@ -50,21 +50,22 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
- commonMainApi("dev.icerock.moko:mvvm-core:0.13.1") // only ViewModel, EventsDispatcher, Dispatchers.UI
- commonMainApi("dev.icerock.moko:mvvm-flow:0.13.1") // api mvvm-core, CFlow for native and binding extensions
- commonMainApi("dev.icerock.moko:mvvm-livedata:0.13.1") // api mvvm-core, LiveData and extensions
- commonMainApi("dev.icerock.moko:mvvm-state:0.13.1") // api mvvm-livedata, ResourceState class and extensions
- commonMainApi("dev.icerock.moko:mvvm-livedata-resources:0.13.1") // api mvvm-core, moko-resources, extensions for LiveData with moko-resources
+ commonMainApi("dev.icerock.moko:mvvm-core:0.14.0") // only ViewModel, EventsDispatcher, Dispatchers.UI
+ commonMainApi("dev.icerock.moko:mvvm-flow:0.14.0") // api mvvm-core, CFlow for native and binding extensions
+ commonMainApi("dev.icerock.moko:mvvm-livedata:0.14.0") // api mvvm-core, LiveData and extensions
+ commonMainApi("dev.icerock.moko:mvvm-state:0.14.0") // api mvvm-livedata, ResourceState class and extensions
+ commonMainApi("dev.icerock.moko:mvvm-livedata-resources:0.14.0") // api mvvm-core, moko-resources, extensions for LiveData with moko-resources
+ commonMainApi("dev.icerock.moko:mvvm-flow-resources:0.14.0") // api mvvm-core, moko-resources, extensions for Flow with moko-resources
  
- androidMainApi("dev.icerock.moko:mvvm-flow-compose:0.13.1") // api mvvm-flow, binding extensions for Jetpack Compose (jvm, js, android)
- androidMainApi("dev.icerock.moko:mvvm-livedata-compose:0.13.1") // api mvvm-livedata, binding extensions for Jetpack Compose (jvm, js, android)
- androidMainApi("dev.icerock.moko:mvvm-livedata-material:0.13.1") // api mvvm-livedata, Material library android extensions
- androidMainApi("dev.icerock.moko:mvvm-livedata-glide:0.13.1") // api mvvm-livedata, Glide library android extensions
- androidMainApi("dev.icerock.moko:mvvm-livedata-swiperefresh:0.13.1") // api mvvm-livedata, SwipeRefreshLayout library android extensions
- androidMainApi("dev.icerock.moko:mvvm-databinding:0.13.1") // api mvvm-livedata, DataBinding support for Android
- androidMainApi("dev.icerock.moko:mvvm-viewbinding:0.13.1") // api mvvm-livedata, ViewBinding support for Android
+ androidMainApi("dev.icerock.moko:mvvm-flow-compose:0.14.0") // api mvvm-flow, binding extensions for Jetpack Compose (jvm, js, android)
+ androidMainApi("dev.icerock.moko:mvvm-livedata-compose:0.14.0") // api mvvm-livedata, binding extensions for Jetpack Compose (jvm, js, android)
+ androidMainApi("dev.icerock.moko:mvvm-livedata-material:0.14.0") // api mvvm-livedata, Material library android extensions
+ androidMainApi("dev.icerock.moko:mvvm-livedata-glide:0.14.0") // api mvvm-livedata, Glide library android extensions
+ androidMainApi("dev.icerock.moko:mvvm-livedata-swiperefresh:0.14.0") // api mvvm-livedata, SwipeRefreshLayout library android extensions
+ androidMainApi("dev.icerock.moko:mvvm-databinding:0.14.0") // api mvvm-livedata, DataBinding support for Android
+ androidMainApi("dev.icerock.moko:mvvm-viewbinding:0.14.0") // api mvvm-livedata, ViewBinding support for Android
  
- commonTestImplementation("dev.icerock.moko:mvvm-test:0.13.1") // test utilities
+ commonTestImplementation("dev.icerock.moko:mvvm-test:0.14.0") // test utilities
 }
 ```
 
@@ -74,10 +75,10 @@ kotlin {
  // export correct artifact to use all classes of library directly from Swift
  targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget::class.java).all {
  binaries.withType(org.jetbrains.kotlin.gradle.plugin.mpp.Framework::class.java).all {
- export("dev.icerock.moko:mvvm-core:0.13.1")
- export("dev.icerock.moko:mvvm-livedata:0.13.1")
- export("dev.icerock.moko:mvvm-livedata-resources:0.13.1")
- export("dev.icerock.moko:mvvm-state:0.13.1")
+ export("dev.icerock.moko:mvvm-core:0.14.0")
+ export("dev.icerock.moko:mvvm-livedata:0.14.0")
+ export("dev.icerock.moko:mvvm-livedata-resources:0.14.0")
+ export("dev.icerock.moko:mvvm-state:0.14.0")
  }
  }
 }
@@ -93,7 +94,7 @@ generation enabled. All `LiveData` to `UIView` bindings is extensions for UI ele
 To use MOKO MVVM with SwiftUI set name of your kotlin framework to `MultiPlatformLibrary` and add
 dependency to CocoaPods:
 ```ruby
-pod 'mokoMvvmFlowSwiftUI', :podspec => 'https://raw.githubusercontent.com/icerockdev/moko-mvvm/release/0.13.1/mokoMvvmFlowSwiftUI.podspec'
+pod 'mokoMvvmFlowSwiftUI', :podspec => 'https://raw.githubusercontent.com/icerockdev/moko-mvvm/release/0.14.0/mokoMvvmFlowSwiftUI.podspec'
 ```
 required export of `mvvm-core` and `mvvm-flow`.
 

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ androidLifecycleVersion = "2.2.0"
 coroutinesVersion = "1.6.0-native-mt"
 mokoResourcesVersion = "0.18.0"
 mokoTestVersion = "0.6.1"
-mokoMvvmVersion = "0.13.1"
+mokoMvvmVersion = "0.14.0"
 mokoKSwiftVersion = "0.4.0"
 composeVersion = "1.1.1"
 composeJetBrainsVersion = "1.1.1"

mvvm-flow-resources/build.gradle.kts

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+ id("kmm-library-convention")
+ id("detekt-convention")
+ id("publication-convention")
+}
+
+dependencies {
+ commonMainApi(projects.mvvmFlow)
+ commonMainApi(libs.mokoResources)
+}

mvvm-flow-resources/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="dev.icerock.moko.mvvm.flow.resources" />

mvvm-flow-resources/src/androidMain/kotlin/dev/icerock/moko/mvvm/flow/resources/TextViewBindings.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.resources
+
+import android.widget.TextView
+import androidx.lifecycle.LifecycleOwner
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import kotlinx.coroutines.DisposableHandle
+
+fun <T : StringDesc?> TextView.bindText(
+ lifecycleOwner: LifecycleOwner,
+ flow: CStateFlow<T>
+): DisposableHandle {
+ return flow.bind(lifecycleOwner) { this.text = it?.toString(this.context) }
+}

mvvm-flow-resources/src/iosMain/kotlin/dev/icerock/moko/mvvm/flow/resources/UIButtonBinding.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.resources
+
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.DisposableHandle
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import platform.UIKit.UIButton
+import platform.UIKit.UIControlStateNormal
+
+fun <T : StringDesc?> UIButton.bindTitle(
+ flow: CStateFlow<T>
+): DisposableHandle {
+ return bind(flow) {
+ this.setTitle(
+ it?.localized(),
+ forState = UIControlStateNormal
+ )
+ }
+}

mvvm-flow-resources/src/iosMain/kotlin/dev/icerock/moko/mvvm/flow/resources/UILabelBinding.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.resources
+
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.DisposableHandle
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import platform.UIKit.UILabel
+
+fun <T : StringDesc?> UILabel.bindText(
+ flow: CStateFlow<T>
+): DisposableHandle {
+ return bind(flow) { this.text = it?.localized() }
+}

mvvm-flow-resources/src/iosMain/kotlin/dev/icerock/moko/mvvm/flow/resources/UITextFieldBinding.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.resources
+
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.DisposableHandle
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import platform.UIKit.UITextField
+
+fun <T : StringDesc?> UITextField.bindText(
+ flow: CStateFlow<T>
+): DisposableHandle {
+ return bind(flow) { value ->
+ val newValue = value?.localized().orEmpty()
+ if (this.text == newValue) return@bind
+ this.text = newValue
+ }
+}

mvvm-flow-resources/src/iosMain/kotlin/dev/icerock/moko/mvvm/flow/resources/UITextViewBinding.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.resources
+
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.DisposableHandle
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import platform.UIKit.UITextView
+
+fun <T : StringDesc?> UITextView.bindText(
+ flow: CStateFlow<T>
+): DisposableHandle {
+ return bind(flow) { value ->
+ val newValue = value?.localized().orEmpty()
+ if (this.text == newValue) return@bind
+ this.text = newValue
+ }
+}

mvvm-flow-resources/src/iosTest/kotlin/UIButtonBindingsTests.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import dev.icerock.moko.mvvm.flow.cStateFlow
+import dev.icerock.moko.mvvm.flow.resources.bindTitle
+import dev.icerock.moko.resources.desc.StringDesc
+import dev.icerock.moko.resources.desc.desc
+import kotlinx.cinterop.readValue
+import kotlinx.coroutines.flow.MutableStateFlow
+import platform.CoreGraphics.CGRectZero
+import platform.UIKit.UIButton
+import kotlin.test.BeforeTest
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@Ignore
+class UIButtonBindingsTests {
+
+ private lateinit var destination: UIButton
+
+ @BeforeTest
+ fun setup() {
+ destination = UIButton(frame = CGRectZero.readValue())
+ }
+
+ @Test
+ fun `nonnullable stringdesc title`() {
+ val source: MutableStateFlow<StringDesc> = MutableStateFlow("init".desc())
+ destination.bindTitle(source.cStateFlow())
+ assertEquals(
+ expected = "init",
+ actual = destination.currentTitle
+ )
+ source.value = "second".desc()
+ assertEquals(
+ expected = "second",
+ actual = destination.currentTitle
+ )
+ }
+
+ @Test
+ fun `nullable stringdesc title`() {
+ val source: MutableStateFlow<StringDesc?> = MutableStateFlow(null)
+ destination.bindTitle(source.cStateFlow())
+ assertEquals(
+ expected = null,
+ actual = destination.currentTitle
+ )
+ source.value = "value".desc()
+ assertEquals(
+ expected = "value",
+ actual = destination.currentTitle
+ )
+ }
+}

mvvm-flow-resources/src/iosTest/kotlin/UILabelBindingsTests.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import dev.icerock.moko.mvvm.flow.cStateFlow
+import dev.icerock.moko.mvvm.flow.resources.bindText
+import dev.icerock.moko.resources.desc.StringDesc
+import dev.icerock.moko.resources.desc.desc
+import kotlinx.cinterop.readValue
+import kotlinx.coroutines.flow.MutableStateFlow
+import platform.CoreGraphics.CGRectZero
+import platform.UIKit.UILabel
+import kotlin.test.BeforeTest
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@Ignore
+class UILabelBindingsTests {
+
+ private lateinit var destination: UILabel
+
+ @BeforeTest
+ fun setup() {
+ destination = UILabel(frame = CGRectZero.readValue())
+ }
+
+ @Test
+ fun `nonnullable stringdesc text`() {
+ val source: MutableStateFlow<StringDesc> = MutableStateFlow("init".desc())
+ destination.bindText(source.cStateFlow())
+ assertEquals(
+ expected = "init",
+ actual = destination.text
+ )
+ source.value = "second".desc()
+ assertEquals(
+ expected = "second",
+ actual = destination.text
+ )
+ }
+
+ @Test
+ fun `nullable stringdesc text`() {
+ val source: MutableStateFlow<StringDesc?> = MutableStateFlow(null)
+ destination.bindText(source.cStateFlow())
+ assertEquals(
+ expected = null,
+ actual = destination.text
+ )
+ source.value = "value".desc()
+ assertEquals(
+ expected = "value",
+ actual = destination.text
+ )
+ }
+}

mvvm-flow-resources/src/iosTest/kotlin/UITextFieldBindingsTests.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import dev.icerock.moko.mvvm.flow.cStateFlow
+import dev.icerock.moko.mvvm.flow.resources.bindText
+import dev.icerock.moko.resources.desc.StringDesc
+import dev.icerock.moko.resources.desc.desc
+import kotlinx.cinterop.readValue
+import kotlinx.coroutines.flow.MutableStateFlow
+import platform.CoreGraphics.CGRectZero
+import platform.UIKit.UITextField
+import kotlin.test.BeforeTest
+import kotlin.test.Ignore
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+@Ignore
+class UITextFieldBindingsTests {
+
+ private lateinit var destination: UITextField
+
+ @BeforeTest
+ fun setup() {
+ destination = UITextField(frame = CGRectZero.readValue())
+ }
+
+ @Test
+ fun `nonnullable stringdesc text`() {
+ val source: MutableStateFlow<StringDesc> = MutableStateFlow("init".desc())
+ destination.bindText(source.cStateFlow())
+ assertEquals(
+ expected = "init",
+ actual = destination.text
+ )
+ source.value = "second".desc()
+ assertEquals(
+ expected = "second",
+ actual = destination.text
+ )
+ }
+
+ @Test
+ fun `nullable stringdesc text`() {
+ val source: MutableStateFlow<StringDesc?> = MutableStateFlow(null)
+ destination.bindText(source.cStateFlow())
+ assertEquals(
+ expected = "",
+ actual = destination.text
+ )
+ source.value = "value".desc()
+ assertEquals(
+ expected = "value",
+ actual = destination.text
+ )
+ }
+}