Update impl

Author: t0maboro

android/src/main/java/com/swmansion/rnscreens/ScreenModalFragment.kt

@@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewParent
 import android.view.WindowManager
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.UIManagerHelper
@@ -187,7 +186,7 @@ class ScreenModalFragment :
 
     override fun removeToolbar(): Unit = throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
 
-    override fun setToolbar(toolbar: Toolbar): Unit =
+    override fun setToolbar(toolbar: CustomToolbar): Unit =
         throw IllegalStateException("[RNScreens] Modal screens on Android do not support header right now")
 
     override fun setToolbarShadowHidden(hidden: Boolean): Unit =

android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt

@@ -14,7 +14,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.Animation
 import android.widget.LinearLayout
-import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -59,7 +58,7 @@ class ScreenStackFragment :
     private var isToolbarShadowHidden = false
     private var isToolbarTranslucent = false
 
-    private var ownedActionBar: ActionBar? = null
+    private var lastActiveHeaderConfig: ScreenStackHeaderConfig? = null
 
     private lateinit var sheetTransitionCoordinator: BottomSheetTransitionCoordinator
 
@@ -107,7 +106,8 @@ class ScreenStackFragment :
         toolbar = null
     }
 
-    override fun setToolbar(toolbar: Toolbar) {
+    override fun setToolbar(toolbar: CustomToolbar) {
+        lastActiveHeaderConfig = toolbar.config
         appBarLayout?.addView(toolbar)
         toolbar.layoutParams =
             AppBarLayout
@@ -305,10 +305,6 @@ class ScreenStackFragment :
         super.onViewCreated(view, savedInstanceState)
     }
 
-    internal fun onActionBarSet(actionBar: ActionBar) {
-        ownedActionBar = actionBar
-    }
-
     override fun onDestroyView() {
         // ScreenStackHeaderConfig.onUpdate() calls activity.setSupportActionBar(toolbar) each time
         // the top screen updates. AppCompatDelegateImpl stores the resulting ToolbarActionBar in
@@ -323,16 +319,8 @@ class ScreenStackFragment :
         // - DebugMenuToolbar.config
         // - ScreenStackHeaderConfig.mParent
         // - Screen.fragment
-        if (isRemoving) {
-            ownedActionBar?.let { owned ->
-                (activity as? AppCompatActivity)?.let { appCompat ->
-                    if (appCompat.supportActionBar === owned) {
-                        appCompat.setSupportActionBar(null)
-                    }
-                }
-            }
-            ownedActionBar = null
-        }
+        lastActiveHeaderConfig?.clearActionBarIfOwned(activity as? AppCompatActivity)
+        lastActiveHeaderConfig = null
         super.onDestroyView()
     }
 

android/src/main/java/com/swmansion/rnscreens/ScreenStackFragmentWrapper.kt

@@ -6,7 +6,7 @@ interface ScreenStackFragmentWrapper : ScreenFragmentWrapper {
     // Toolbar management
     fun removeToolbar()
 
-    fun setToolbar(toolbar: Toolbar)
+    fun setToolbar(toolbar: CustomToolbar)
 
     fun setToolbarShadowHidden(hidden: Boolean)
 

android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -9,6 +9,7 @@ import android.view.Gravity
 import android.view.View.OnClickListener
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.app.ActionBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
@@ -58,6 +59,7 @@ class ScreenStackHeaderConfig(
     private var isBackButtonHidden = false
     private var isShadowHidden = false
     private var isDestroyed = false
+    private var actionBar: ActionBar? = null
     private var backButtonInCustomView = false
     private var tintColor = 0
     private var isAttachedToWindow = false
@@ -113,6 +115,17 @@ class ScreenStackHeaderConfig(
         isDestroyed = true
     }
 
+    internal fun clearActionBarIfOwned(activity: AppCompatActivity?) {
+        actionBar?.let { ownedActionBar ->
+            activity?.let { appCompat ->
+                if (appCompat.supportActionBar === ownedActionBar) {
+                    appCompat.setSupportActionBar(null)
+                }
+            }
+        }
+        actionBar = null
+    }
+
     /**
      * Native toolbar should notify the header config component that it has completed its layout.
      */
@@ -243,17 +256,16 @@ class ScreenStackHeaderConfig(
 
         activity.setSupportActionBar(toolbar)
         // non-null toolbar is set in the line above and it is used here
-        val actionBar = requireNotNull(activity.supportActionBar)
-        // notify the fragment so it can clear this action bar reference when being removed.
-        screenFragment?.onActionBarSet(actionBar)
+        val newActionBar = requireNotNull(activity.supportActionBar)
+        actionBar = newActionBar
 
         // hide back button
-        actionBar.setDisplayHomeAsUpEnabled(
+        newActionBar.setDisplayHomeAsUpEnabled(
             screenFragment?.canNavigateBack() == true && !isBackButtonHidden,
         )
 
         // title
-        actionBar.title = title
+        newActionBar.title = title
         if (TextUtils.isEmpty(title)) {
             isTitleEmpty = true
         }
@@ -327,7 +339,7 @@ class ScreenStackHeaderConfig(
                         ?: throw JSApplicationIllegalArgumentException(
                             "Back button header config view should have Image as first child",
                         )
-                actionBar.setHomeAsUpIndicator(firstChild.drawable)
+                newActionBar.setHomeAsUpIndicator(firstChild.drawable)
                 i++
                 continue
             }