Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,19 @@
 # ChangeLog
 
 
+## Version 1.6.0
+
+* New: Fragment module
+* New: Bindings list:
+    * AndroidX library bindings:
+        * `corbind-fragment`:
+            * `FragmentManager`:
+                * `resultEvents`
+* Update: Kotlin modules dependency to v1.7.20.
+* Update: Material components dependency to v1.7.0.
+* Update: Minor update of other libraries.
+
+
 ## Version 1.5.5
 
 * New: Build logic module.

README.md

@@ -1,7 +1,7 @@
 [![Corbind](logo.svg)](https://ldralighieri.github.io/Corbind)
 
 [![Maven Central](https://img.shields.io/maven-central/v/ru.ldralighieri.corbind/corbind.svg)](https://search.maven.org/search?q=g:ru.ldralighieri.corbind)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.7.10-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.7.20-blue.svg)](https://kotlinlang.org)
 [![Kotlin Coroutines Version](https://img.shields.io/badge/Coroutines-v1.6.4-blue.svg)](https://kotlinlang.org/docs/reference/coroutines-overview.html)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
 
@@ -25,28 +25,29 @@ This library is for Android applications only. Help you to transform Android UI
 
 Platform bindings:
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind:1.6.0'
 ```
 
 AndroidX library bindings:
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-activity:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-appcompat:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-core:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-drawerlayout:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-leanback:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-lifecycle:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-navigation:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-recyclerview:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-slidingpanelayout:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-swiperefreshlayout:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-viewpager:1.5.5'
-implementation 'ru.ldralighieri.corbind:corbind-viewpager2:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-activity:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-appcompat:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-core:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-drawerlayout:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-fragment:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-leanback:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-lifecycle:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-navigation:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-recyclerview:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-slidingpanelayout:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-swiperefreshlayout:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-viewpager:1.6.0'
+implementation 'ru.ldralighieri.corbind:corbind-viewpager2:1.6.0'
 ```
 
 Google 'material' library bindings:
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-material:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-material:1.6.0'
 ```
 
 Snapshot build:
@@ -56,7 +57,7 @@ repositories {
 }
 
 dependencies {
-   implementation 'ru.ldralighieri.corbind:{module}:1.5.6-SNAPSHOT'
+   implementation 'ru.ldralighieri.corbind:{module}:1.6.1-SNAPSHOT'
 }
 ```
 

build-logic/convention/src/main/kotlin/LibraryConventionPlugin.kt

@@ -18,6 +18,7 @@ import com.android.build.gradle.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.provideDelegate
 import ru.ldralighieri.corbind.configureKotlinAndroid
 
 @Suppress("unused")
@@ -32,8 +33,10 @@ class LibraryConventionPlugin : Plugin<Project> {
             }
 
             extensions.configure<LibraryExtension> {
+                val targetSdk: String by project
+
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = findProperty("android.targetSdk").toString().toInt()
+                defaultConfig.targetSdk = targetSdk.toInt()
 
                 buildTypes {
                     release {

build-logic/convention/src/main/kotlin/ru/ldralighieri/corbind/Project+configureKotlinAndroid.kt

@@ -22,16 +22,20 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.provideDelegate
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *>,
 ) {
+    val compileSdk: String by project
+    val minSdk: String by project
+
     commonExtension.apply {
-        compileSdk = findProperty("android.compileSdk").toString().toInt()
+        this.compileSdk = compileSdk.toInt()
 
         defaultConfig {
-            minSdk = findProperty("android.minSdk").toString().toInt()
+            this.minSdk = minSdk.toInt()
         }
 
         compileOptions {

build.gradle.kts

@@ -40,6 +40,7 @@ detekt {
             "corbind-appcompat/src/main/kotlin",
             "corbind-core/src/main/kotlin",
             "corbind-drawerlayout/src/main/kotlin",
+            "corbind-fragment/src/main/kotlin",
             "corbind-leanback/src/main/kotlin",
             "corbind-lifecycle/src/main/kotlin",
             "corbind-material/src/main/kotlin",
@@ -65,8 +66,7 @@ tasks.withType<Detekt>().configureEach {
 
 // Dependency updates
 fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL")
-        .any { version.toUpperCase().contains(it) }
+    val stableKeyword = listOf("RELEASE", "FINAL").any { version.toUpperCase().contains(it) }
     val regex = "^[0-9,.v-]+(-r)?$".toRegex()
     val isStable = stableKeyword || regex.matches(version)
     return isStable.not()

corbind-activity/README.md

@@ -4,7 +4,7 @@
 To add androidx activity bindings, import `corbind-activity` module:
 
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-activity:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-activity:1.6.0'
 ```
 
 ## List of extensions
@@ -17,7 +17,7 @@ Component | Extension | Description
 ## Simple examples
 
 ```kotlin
-requireActivity().onBackPressedDispatcher.backPresses()
+onBackPressedDispatcher.backPresses(lifecycleOwner = this)
     .onEach { /* handle onBackPressed event */ }
     .flowWithLifecycle(lifecycle)
     .launchIn(lifecycleScope) // lifecycle-runtime-ktx

corbind-activity/build.gradle.kts

@@ -20,7 +20,11 @@ plugins {
     id("corbind.dokka")
 }
 
+android {
+    namespace = "ru.ldralighieri.corbind.activity"
+}
+
 dependencies {
-    api(project(":corbind"))
+    api(projects.corbind)
     api(libs.androidx.activity)
 }

corbind-activity/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="ru.ldralighieri.corbind.activity" />
+<manifest />

corbind-activity/src/main/kotlin/ru/ldralighieri/corbind/activity/OnBackPressedDispatcherBackPresses.kt

@@ -36,38 +36,38 @@ import ru.ldralighieri.corbind.internal.corbindReceiveChannel
  * Perform an action on [OnBackPressedDispatcher.onBackPressed] call.
  *
  * @param scope Root coroutine scope
+ * @param lifecycleOwner The LifecycleOwner which controls when the callback should be invoked
  * @param capacity Capacity of the channel's buffer (no buffer by default)
- * @param owner The LifecycleOwner which controls when the callback should be invoked
  * @param action An action to perform
  */
 fun OnBackPressedDispatcher.backPresses(
     scope: CoroutineScope,
+    lifecycleOwner: LifecycleOwner,
     capacity: Int = Channel.RENDEZVOUS,
-    owner: LifecycleOwner,
     action: suspend () -> Unit
 ) {
     val events = scope.actor<Unit>(Dispatchers.Main.immediate, capacity) {
         for (ignored in channel) action()
     }
 
     val callback = callback(scope, events::trySend)
-    addCallback(owner, callback)
+    addCallback(lifecycleOwner, callback)
     events.invokeOnClose { callback.remove() }
 }
 
 /**
  * Perform an action on [OnBackPressedDispatcher.onBackPressed] call, inside new [CoroutineScope].
  *
+ * @param lifecycleOwner The LifecycleOwner which controls when the callback should be invoked
  * @param capacity Capacity of the channel's buffer (no buffer by default)
- * @param owner The LifecycleOwner which controls when the callback should be invoked
  * @param action An action to perform
  */
 suspend fun OnBackPressedDispatcher.backPresses(
+    lifecycleOwner: LifecycleOwner,
     capacity: Int = Channel.RENDEZVOUS,
-    owner: LifecycleOwner,
     action: suspend () -> Unit
 ) = coroutineScope {
-    backPresses(this, capacity, owner, action)
+    backPresses(this, lifecycleOwner, capacity, action)
 }
 
 /**
@@ -77,22 +77,22 @@ suspend fun OnBackPressedDispatcher.backPresses(
  *
  * ```
  * launch {
- *      requireActivity().onBackPressedDispatcher.backPresses()
+ *      onBackPressedDispatcher.backPresses(lifecycleOwner = this)
  *          .consumeEach { /* handle onBackPressed event */ }
  * }
  * ```
  *
  * @param scope Root coroutine scope
+ * @param lifecycleOwner The LifecycleOwner which controls when the callback should be invoked
  * @param capacity Capacity of the channel's buffer (no buffer by default)
- * @param owner The LifecycleOwner which controls when the callback should be invoked
  */
 fun OnBackPressedDispatcher.backPresses(
     scope: CoroutineScope,
-    capacity: Int = Channel.RENDEZVOUS,
-    owner: LifecycleOwner
+    lifecycleOwner: LifecycleOwner,
+    capacity: Int = Channel.RENDEZVOUS
 ): ReceiveChannel<Unit> = corbindReceiveChannel(capacity) {
     val callback = callback(scope, ::trySend)
-    addCallback(owner, callback)
+    addCallback(lifecycleOwner, callback)
     invokeOnClose { callback.remove() }
 }
 
@@ -102,17 +102,17 @@ fun OnBackPressedDispatcher.backPresses(
  * Example:
  *
  * ```
- * requireActivity().onBackPressedDispatcher.backPresses()
+ * onBackPressedDispatcher.backPresses(lifecycleOwner = this)
  *      .onEach { /* handle onBackPressed event */ }
  *      .flowWithLifecycle(lifecycle)
  *      .launchIn(lifecycleScope) // lifecycle-runtime-ktx
  * ```
  *
- * @param owner The LifecycleOwner which controls when the callback should be invoked
+ * @param lifecycleOwner The LifecycleOwner which controls when the callback should be invoked
  */
-fun OnBackPressedDispatcher.backPresses(owner: LifecycleOwner): Flow<Unit> = channelFlow {
+fun OnBackPressedDispatcher.backPresses(lifecycleOwner: LifecycleOwner): Flow<Unit> = channelFlow {
     val callback = callback(this, ::trySend)
-    addCallback(owner, callback)
+    addCallback(lifecycleOwner, callback)
     awaitClose { callback.remove() }
 }
 

corbind-appcompat/README.md

@@ -4,7 +4,7 @@
 To add androidx appcompat bindings, import `corbind-appcompat` module:
 
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-appcompat:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-appcompat:1.6.0'
 ```
 
 ## List of extensions

corbind-appcompat/build.gradle.kts

@@ -20,7 +20,11 @@ plugins {
     id("corbind.dokka")
 }
 
+android {
+    namespace = "ru.ldralighieri.corbind.appcompat"
+}
+
 dependencies {
-    api(project(":corbind"))
+    api(projects.corbind)
     api(libs.androidx.appcompat)
 }

corbind-appcompat/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="ru.ldralighieri.corbind.appcompat" />
+<manifest />

corbind-core/README.md

@@ -4,7 +4,7 @@
 To add androidx core bindings, import `corbind-core` module:
 
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-core:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-core:1.6.0'
 ```
 
 ## List of extensions

corbind-core/build.gradle.kts

@@ -20,7 +20,11 @@ plugins {
     id("corbind.dokka")
 }
 
+android {
+    namespace = "ru.ldralighieri.corbind.core"
+}
+
 dependencies {
-    api(project(":corbind"))
+    api(projects.corbind)
     api(libs.androidx.core)
 }

corbind-core/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="ru.ldralighieri.corbind.core" />
+<manifest />

corbind-drawerlayout/README.md

@@ -4,7 +4,7 @@
 To add androidx drawerlayout bindings, import `corbind-drawerlayout` module:
 
 ```groovy
-implementation 'ru.ldralighieri.corbind:corbind-drawerlayout:1.5.5'
+implementation 'ru.ldralighieri.corbind:corbind-drawerlayout:1.6.0'
 ```
 
 ## List of extensions

corbind-drawerlayout/build.gradle.kts

@@ -20,7 +20,11 @@ plugins {
     id("corbind.dokka")
 }
 
+android {
+    namespace = "ru.ldralighieri.corbind.drawerlayout"
+}
+
 dependencies {
-    api(project(":corbind"))
+    api(projects.corbind)
     api(libs.androidx.drawerlayout)
 }

corbind-drawerlayout/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
   ~ limitations under the License.
   -->
 
-<manifest package="ru.ldralighieri.corbind.drawerlayout" />
+<manifest />

corbind-fragment/.gitignore

@@ -0,0 +1 @@
+/build

corbind-fragment/README.md

@@ -0,0 +1,30 @@
+
+# corbind-activity
+
+To add androidx fragment bindings, import `corbind-fragment` module:
+
+```groovy
+implementation 'ru.ldralighieri.corbind:corbind-fragment:1.6.0'
+```
+
+## List of extensions
+
+Component | Extension | Description
+--|---|--
+**FragmentManager** | `resultEvents` | Called when any results set by setFragmentResult using the same requestKey.
+
+
+## Simple examples
+
+```kotlin
+lifecycleScope.launchWhenStarted {
+    parentFragmentManager.resultEvents(
+        requestKey = FRAGMENT_REQUEST_KEY,
+        lifecycleOwner = this@CurrentFragment
+    )
+        .onEach { event -> /* handle result event */ }
+        .launchIn(this@launchWhenStarted) // lifecycle-runtime-ktx
+}
+```
+
+More examples in source code