Skip to content

fix(customrow): only attach BottomTabs custom row to NavigationActivity #8336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yoavpagir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(customrow): only attach BottomTabs custom row to NavigationActivity #8336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions android/src/main/java/com/reactnativenavigation/customrow/BottomTabsCustomRowAttacher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.view.ViewGroup
import android.view.ViewTreeObserver
import android.view.WindowInsets
import android.widget.FrameLayout
import com.reactnativenavigation.NavigationActivity
import com.reactnativenavigation.views.bottomtabs.BottomTabs

/**
Expand Down Expand Up @@ -77,6 +78,13 @@ internal object BottomTabsCustomRowAttacher : Application.ActivityLifecycleCallb
}

private fun ensureLayoutObserver(activity: Activity) {
// BottomTabs only ever live inside RNN's own NavigationActivity (an
// AppCompatActivity). Touching any other activity — e.g. a third-party
// relay such as AppAuth's RedirectUriReceiverActivity, whose theme is not
// a Theme.AppCompat descendant — forces AppCompat sub-decor inflation and
// crashes with "You need to use a Theme.AppCompat theme". Guard here so the
// global lifecycle observer never operates on foreign activities.
if (activity !is NavigationActivity) return
val decor = activity.window?.decorView as? ViewGroup ?: return
if (decor.getTag(TAG_OBSERVING) == true) return
decor.setTag(TAG_OBSERVING, true)
Expand All @@ -90,6 +98,7 @@ internal object BottomTabsCustomRowAttacher : Application.ActivityLifecycleCallb
}

private fun tryAttach(activity: Activity) {
if (activity !is NavigationActivity) return
val scanRoot = activity.window?.decorView as? ViewGroup
?: activity.findViewById<View>(android.R.id.content) as? ViewGroup
?: return
Expand Down