Default navigation extras

BulatMukhutdinov · Jul 4, 2021 · 79a0ff3 · 79a0ff3
1 parent 0ade212
commit 79a0ff3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
-    ext.kotlin_version = '1.4.32'
+    ext.kotlin_version = '1.5.20'
     ext.nav_version = "2.3.5"
-    ext.koin_version = '3.0.1'
+    ext.koin_version = '3.1.1'
 
     repositories {
         google()

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -74,12 +74,12 @@ dependencies {
     implementation project(":structure")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-    implementation "com.github.bulatmukhutdinov:utils:1.9.0"
+    implementation "com.github.bulatmukhutdinov:utils:1.9.1"
 
     // Retrofit
     def retrofit_version = '2.9.0'
@@ -88,7 +88,6 @@ dependencies {
 
     //Koin
     implementation "io.insert-koin:koin-android:$koin_version"
-    implementation "io.insert-koin:koin-android-ext:$koin_version"
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"

diff --git a/structure/build.gradle b/structure/build.gradle
@@ -48,11 +48,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation "com.github.bulatmukhutdinov:utils:1.9.0"
+    implementation "com.github.bulatmukhutdinov:utils:1.9.1"
 
     //Koin
     implementation "io.insert-koin:koin-android:$koin_version"
-    implementation "io.insert-koin:koin-android-ext:$koin_version"
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
@@ -70,7 +69,7 @@ afterEvaluate {
 
                 groupId = 'tat.mukhutdinov.android'
                 artifactId = 'structure'
-                version = '3.1.3'
+                version = '3.1.4'
             }
         }
     }

diff --git a/structure/src/main/kotlin/tat/mukhutdinov/android/structure/StructureFragment.kt b/structure/src/main/kotlin/tat/mukhutdinov/android/structure/StructureFragment.kt
@@ -8,6 +8,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavDirections
 import androidx.navigation.Navigator
+import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import tat.mukhutdinov.android.utils.autoCleared
 import timber.log.Timber
@@ -49,7 +50,7 @@ abstract class StructureFragment<ViewBinding : ViewDataBinding> : Fragment() {
         viewBinding.lifecycleOwner = viewLifecycleOwner
     }
 
-    open fun navigate(directions: NavDirections, extras: Navigator.Extras) {
+    open fun navigate(directions: NavDirections, extras: Navigator.Extras = FragmentNavigatorExtras()) {
         // Показ диалогов через navigation падает при вызове на бекграунд потоке
         activity?.runOnUiThread {
             try {