Use data object in tutorials, remove deprecated empty Activity.onBa…

…ckPressed

README.md

@@ -110,27 +110,21 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove() 
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using `OnBackPressedDispatcher` 
+                onBackPressed() // this is the reliable way to handle back for now 
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed() 
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
-
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
 
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))

samples/advanced-samples/extensions-compose-example/src/main/java/com/zhuinden/simplestackextensionscomposesample/app/MainActivity.kt

@@ -24,32 +24,26 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.main_activity)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         val app = application as CustomApplication
         val globalServices = app.globalServices
 
         authenticationManager = globalServices.get()
 
         fragmentStateChanger = FragmentStateChanger(supportFragmentManager, R.id.container)
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))
             .setScopedServices(ServiceProvider())

samples/advanced-samples/extensions-example/src/main/java/com/zhuinden/simplestackextensionsample/app/MainActivity.kt

@@ -23,24 +23,19 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val binding = MainActivityBinding.inflate(layoutInflater)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         setContentView(binding.root)
 
         fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.step9Root)
@@ -51,8 +46,6 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
 
         authenticationManager = globalServices.get()
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))
             .setScopedServices(ServiceProvider())

samples/advanced-samples/mvvm-sample/src/main/java/com/zhuinden/simplestackexamplemvvm/application/MainActivity.kt

@@ -27,29 +27,24 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
     private lateinit var snackbarTextEmitter: SnackbarTextEmitter
     private lateinit var binding: MainActivityBinding
 
-
     @Suppress("DEPRECATION")
     private val backPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed()  // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = MainActivityBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         val app = application as CustomApplication
         val globalServices = app.globalServices
 
@@ -77,8 +72,6 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
             showSnackbar(binding.root, getString(textRes))
         }
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))
             .setGlobalServices(globalServices)

samples/basic-samples/simple-stack-example-basic-java-fragment/src/main/java/com/zhuinden/navigationexamplefrag/application/MainActivity.java

@@ -34,7 +34,7 @@ public class MainActivity
         public void handleOnBackPressed() {
             if(!Navigator.onBackPressed(MainActivity.this)) {
                 this.remove();
-                onBackPressed();  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed(); // this is the reliable way to handle back for now
                 MainActivity.this.getOnBackPressedDispatcher().addCallback(this);
             }
         }
@@ -71,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fragmentStateChanger = new DefaultFragmentStateChanger(getSupportFragmentManager(),
                                                                R.id.container);
 
-        getOnBackPressedDispatcher().addCallback(backPressedCallback); // this is required for `onBackPressedDispatcher` to work correctly
+        getOnBackPressedDispatcher().addCallback(backPressedCallback); // this is the reliable way to handle back for now
 
         Navigator.configure()
             .setStateChanger(new SimpleStateChanger(this))

samples/basic-samples/simple-stack-example-basic-java-view/src/main/java/com/zhuinden/navigationexampleview/application/MainActivity.java

@@ -25,7 +25,7 @@ public class MainActivity
         public void handleOnBackPressed() {
             if(!Navigator.onBackPressed(MainActivity.this)) {
                 this.remove();
-                onBackPressed();  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed(); // this is the reliable way to handle back for now
                 MainActivity.this.getOnBackPressedDispatcher().addCallback(this);
             }
         }
@@ -59,7 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
             return false;
         });
 
-        getOnBackPressedDispatcher().addCallback(backPressedCallback); // this is required for `onBackPressedDispatcher` to work correctly
+        getOnBackPressedDispatcher().addCallback(backPressedCallback); // this is the reliable way to handle back for now
 
         Navigator.install(this, binding.container, History.single(HomeKey.create()));
     }

samples/basic-samples/simple-stack-example-basic-kotlin-fragment/src/main/java/com/zhuinden/simplestackexamplekotlinfragment/application/MainActivity.kt

@@ -27,24 +27,20 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         binding.navigation.setOnNavigationItemSelectedListener { item ->
             val destination = when (item.itemId) {
                 R.id.navigation_home -> HomeKey
@@ -61,8 +57,6 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
 
         fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))
             .install(this, binding.container, History.single(HomeKey))

samples/basic-samples/simple-stack-example-basic-kotlin-view/src/main/java/com/zhuinden/navigationexamplekotlinview/application/MainActivity.kt

@@ -19,24 +19,20 @@ class MainActivity : AppCompatActivity() {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         binding.navigation.setOnNavigationItemSelectedListener { item ->
             when (item.itemId) {
                 R.id.navigation_home -> {
@@ -55,8 +51,6 @@ class MainActivity : AppCompatActivity() {
             false
         }
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         Navigator.install(this, binding.container, History.single(HomeKey))
     }
 }

samples/community-samples/simple-stack-example-kotlin-community-sample/src/main/java/com/community/simplestackkotlindaggerexample/application/MainActivity.kt

@@ -18,18 +18,12 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     private lateinit var fragmentStateChanger: DefaultFragmentStateChanger
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -38,9 +32,9 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         val binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
+        fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
 
         Navigator.configure()
             .setStateChanger(SimpleStateChanger(this))

samples/legacy-samples/simple-stack-example-multistack-fragment/src/main/java/com/zhuinden/simplestackdemomultistack/application/MainActivity.kt

@@ -24,18 +24,12 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
 
             if (!backstack.goBack()) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
     lateinit var multistack: Multistack
 
     private var isAnimating: Boolean = false
@@ -66,6 +60,8 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
 
         setContentView(R.layout.activity_main)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         multistackFragmentStateChanger = MultistackFragmentStateChanger(R.id.root, supportFragmentManager)
 
         findViewById<View>(R.id.bbn_item1).setOnClickListener {
@@ -84,8 +80,6 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
             multistack.setSelectedStack(StackType.values()[3].name)
         }
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         multistack.setStateChanger(SimpleStateChanger(this))
     }
 

samples/legacy-samples/simple-stack-example-multistack-view/src/main/java/com/zhuinden/simplestackdemomultistack/application/MainActivity.kt

@@ -27,19 +27,12 @@ class MainActivity : AppCompatActivity(), MultistackViewStateChanger.AnimationSt
 
             if (!backstack.goBack()) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
-
     lateinit var multistack: Multistack
 
     private var isAnimating: Boolean = false
@@ -70,6 +63,8 @@ class MainActivity : AppCompatActivity(), MultistackViewStateChanger.AnimationSt
 
         setContentView(R.layout.activity_main)
 
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
+
         multistackViewStateChanger = MultistackViewStateChanger(this, multistack, findViewById(R.id.container), this)
 
         findViewById<View>(R.id.bbn_item1).setOnClickListener {
@@ -88,8 +83,6 @@ class MainActivity : AppCompatActivity(), MultistackViewStateChanger.AnimationSt
             multistack.setSelectedStack(StackType.values()[3].name)
         }
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
-
         multistack.setStateChanger(AsyncStateChanger(this))
     }
 

samples/multistack-samples/simple-stack-example-multistack-nested-fragment/src/main/java/com/zhuinden/simplestackbottomnavfragmentexample/application/MainActivity.kt

@@ -18,28 +18,21 @@ class MainActivity : AppCompatActivity(), SimpleStateChanger.NavigationHandler {
         override fun handleOnBackPressed() {
             if (!Navigator.onBackPressed(this@MainActivity)) {
                 this.remove()
-                onBackPressed()  // this is the only safe way to manually invoke onBackPressed when using onBackPressedDispatcher`
+                onBackPressed() // this is the reliable way to handle back for now
                 this@MainActivity.onBackPressedDispatcher.addCallback(this)
             }
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @Suppress("RedundantModalityModifier", "deprecation")
-    final override fun onBackPressed() { // you cannot use `onBackPressed()` if you use `OnBackPressedDispatcher`
-        super.onBackPressed()
-    }
-
-
     private lateinit var fragmentStateChanger: DefaultFragmentStateChanger
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
+        onBackPressedDispatcher.addCallback(backPressedCallback) // this is the reliable way to handle back for now
 
-        onBackPressedDispatcher.addCallback(backPressedCallback) // this is required for `onBackPressedDispatcher` to work correctly
+        fragmentStateChanger = DefaultFragmentStateChanger(supportFragmentManager, R.id.container)
 
         Navigator.configure()
             .setScopedServices(DefaultServiceProvider())