Fixed deprecation

splendo · Nov 8, 2023 · 18abba8 · 18abba8
1 parent ec41eb1
commit 18abba8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/.../src/main/java/com/splendo/kaluga/example/architecture/xml/ArchitectureDetailsActivity.kt b/.../src/main/java/com/splendo/kaluga/example/architecture/xml/ArchitectureDetailsActivity.kt
@@ -19,6 +19,8 @@ Copyright 2022 Splendo Consulting B.V. The Netherlands
 package com.splendo.kaluga.example.architecture.xml
 
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
 import com.splendo.kaluga.architecture.navigation.parseTypeOfOrNull
@@ -59,9 +61,14 @@ class ArchitectureDetailsActivity : KalugaViewModelActivity<ArchitectureDetailsV
         setContentView(binding.root)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
-    }
 
-    override fun onBackPressed() {
-        viewModel.onBackPressed()
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    viewModel.onBackPressed()
+                }
+            },
+        )
     }
 }
diff --git a/...ndroid/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt b/...ndroid/src/main/java/com/splendo/kaluga/example/scientific/ScientificConverterActivity.kt
@@ -18,6 +18,7 @@
 package com.splendo.kaluga.example.scientific
 
 import android.os.Bundle
+import androidx.activity.OnBackPressedCallback
 import com.splendo.kaluga.architecture.navigation.ActivityNavigator
 import com.splendo.kaluga.architecture.navigation.NavigationBundleSpecType
 import com.splendo.kaluga.architecture.navigation.NavigationSpec
@@ -75,9 +76,14 @@ class ScientificConverterActivity : KalugaViewModelActivity<ScientificConverterV
         setContentView(binding.root)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
-    }
 
-    override fun onBackPressed() {
-        viewModel.onClosePressed()
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+                override fun handleOnBackPressed() {
+                    viewModel.onClosePressed()
+                }
+            },
+        )
     }
 }