fix ActivityUtils.overrideActivityTransition() to be able to be calle…

…d from Activity.onCreate()
cbeyls · May 3, 2024 · 688ec12 · 688ec12
1 parent 6896ce7
commit 688ec12
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 23 deletions.
diff --git a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.kt b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.kt
@@ -40,6 +40,12 @@ class SearchResultActivity : AppCompatActivity(R.layout.search_result) {
             R.anim.fade_in,
             R.anim.fade_out
         )
+        ActivityUtils.overrideActivityTransition(
+            this,
+            ActivityUtils.OVERRIDE_TRANSITION_CLOSE,
+            R.anim.fade_in,
+            R.anim.fade_out
+        )
         setSupportActionBar(findViewById(R.id.toolbar))
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -97,16 +103,6 @@ class SearchResultActivity : AppCompatActivity(R.layout.search_result) {
         return true
     }
 
-    override fun finish() {
-        super.finish()
-        ActivityUtils.overrideActivityTransition(
-            this,
-            ActivityUtils.OVERRIDE_TRANSITION_CLOSE,
-            R.anim.fade_in,
-            R.anim.fade_out
-        )
-    }
-
     private val EditText.textChangeEvents: Flow<CharSequence?>
         get() = callbackFlow {
             val textWatcher = doOnTextChanged { text, _, _, _ -> trySend(text) }

diff --git a/app/src/main/java/be/digitalia/fosdem/activities/SettingsActivity.kt b/app/src/main/java/be/digitalia/fosdem/activities/SettingsActivity.kt
@@ -18,6 +18,12 @@ class SettingsActivity : SimpleToolbarActivity() {
             R.anim.slide_in_right,
             R.anim.partial_zoom_out
         )
+        ActivityUtils.overrideActivityTransition(
+            this,
+            ActivityUtils.OVERRIDE_TRANSITION_CLOSE,
+            R.anim.partial_zoom_in,
+            R.anim.slide_out_right
+        )
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
@@ -30,14 +36,4 @@ class SettingsActivity : SimpleToolbarActivity() {
         onBackPressedDispatcher.onBackPressed()
         return true
     }
-
-    override fun finish() {
-        super.finish()
-        ActivityUtils.overrideActivityTransition(
-            this,
-            ActivityUtils.OVERRIDE_TRANSITION_CLOSE,
-            R.anim.partial_zoom_in,
-            R.anim.slide_out_right
-        )
-    }
 }
diff --git a/app/src/main/java/be/digitalia/fosdem/utils/ActivityUtils.kt b/app/src/main/java/be/digitalia/fosdem/utils/ActivityUtils.kt
@@ -1,24 +1,37 @@
 package be.digitalia.fosdem.utils
 
-import android.app.Activity
 import android.os.Build
+import androidx.activity.ComponentActivity
 import androidx.annotation.AnimRes
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 
 object ActivityUtils {
     const val OVERRIDE_TRANSITION_OPEN = 0
     const val OVERRIDE_TRANSITION_CLOSE = 1
 
+    /**
+     * Call this method in Activity.onCreate() to configure the open or close transitions.
+     */
     @Suppress("DEPRECATION")
     fun overrideActivityTransition(
-        activity: Activity,
+        activity: ComponentActivity,
         overrideType: Int,
         @AnimRes enterAnim: Int,
         @AnimRes exitAnim: Int
     ) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             activity.overrideActivityTransition(overrideType, enterAnim, exitAnim)
         } else {
-            activity.overridePendingTransition(enterAnim, exitAnim)
+            if (overrideType == OVERRIDE_TRANSITION_OPEN) {
+                activity.overridePendingTransition(enterAnim, exitAnim)
+            } else {
+                activity.lifecycle.addObserver(LifecycleEventObserver { _, event ->
+                    if (event == Lifecycle.Event.ON_PAUSE && activity.isFinishing) {
+                        activity.overridePendingTransition(enterAnim, exitAnim)
+                    }
+                })
+            }
         }
     }
 }