#259 Update some dependencies in samples

Zhuinden · Mar 31, 2023 · 7b46fa2 · 7b46fa2
1 parent 5a1682e
commit 7b46fa2
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git a/samples/advanced-samples/extensions-compose-example/build.gradle b/samples/advanced-samples/extensions-compose-example/build.gradle
@@ -62,8 +62,8 @@ dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.activity:activity-ktx:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity-ktx:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")

diff --git a/samples/advanced-samples/extensions-example/build.gradle b/samples/advanced-samples/extensions-example/build.gradle
@@ -49,8 +49,8 @@ dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.activity:activity-ktx:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity-ktx:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")

diff --git a/samples/advanced-samples/mvvm-sample/build.gradle.kts b/samples/advanced-samples/mvvm-sample/build.gradle.kts
@@ -95,7 +95,7 @@ dependencies {
     implementation("io.reactivex.rxjava2:rxkotlin:2.4.0")
     implementation("com.jakewharton.rxrelay2:rxrelay:2.1.1")
 
-    implementation("androidx.activity:activity:1.6.1")
+    implementation("androidx.activity:activity:1.7.0")
     implementation("androidx.cardview:cardview:1.0.0")
     implementation("com.google.android.material:material:1.8.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")

diff --git a/samples/basic-samples/simple-stack-example-basic-kotlin-fragment/build.gradle.kts b/samples/basic-samples/simple-stack-example-basic-kotlin-fragment/build.gradle.kts
@@ -67,8 +67,8 @@ dependencies {
     androidTestImplementation("androidx.test:rules:1.5.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.activity:activity:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation("com.google.android.material:material:1.8.0")
     testImplementation("junit:junit:4.13.2")

diff --git a/samples/basic-samples/simple-stack-example-basic-kotlin-view/build.gradle.kts b/samples/basic-samples/simple-stack-example-basic-kotlin-view/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     }
 
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.activity:activity:1.6.1")
+    implementation("androidx.activity:activity:1.7.0")
 
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("androidx.test:runner:1.5.2")

diff --git a/samples/community-samples/simple-stack-example-kotlin-community-sample/build.gradle.kts b/samples/community-samples/simple-stack-example-kotlin-community-sample/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
 
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.activity:activity:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation(project(":simple-stack"))
 

diff --git a/samples/legacy-samples/simple-stack-example-multistack-fragment/build.gradle.kts b/samples/legacy-samples/simple-stack-example-multistack-fragment/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
     compileOnly("org.glassfish:javax.annotation:10.0-b28")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.activity:activity:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")

diff --git a/samples/legacy-samples/simple-stack-example-multistack-view/build.gradle.kts b/samples/legacy-samples/simple-stack-example-multistack-view/build.gradle.kts
@@ -53,8 +53,8 @@ dependencies {
     compileOnly("org.glassfish:javax.annotation:10.0-b28")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core:1.9.0")
-    implementation("androidx.activity:activity:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
 
     implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")

diff --git a/tutorials/tutorial-sample/build.gradle.kts b/tutorials/tutorial-sample/build.gradle.kts
@@ -52,8 +52,8 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.activity:activity-ktx:1.6.1")
-    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity-ktx:1.7.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.6")
     implementation("com.google.android.material:material:1.8.0")
     testImplementation("junit:junit:4.13.2")
 

diff --git a/...rials/tutorial-sample/src/main/java/com/zhuinden/simplestacktutorials/app/MainActivity.kt b/...rials/tutorial-sample/src/main/java/com/zhuinden/simplestacktutorials/app/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.zhuinden.simplestacktutorials.app
 
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.zhuinden.simplestacktutorials.databinding.ActivityMainBinding
 import com.zhuinden.simplestacktutorials.steps.step_1.Step1Activity
@@ -16,9 +17,16 @@ import com.zhuinden.simplestacktutorials.utils.onClick
 import com.zhuinden.simplestacktutorials.utils.startActivity
 
 class MainActivity : AppCompatActivity() {
+    private val onBackCallback = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        onBackPressedDispatcher.addCallback(onBackCallback)
+
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)