diff --git a/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt b/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt index 3a76ce672f..0b60b687d1 100644 --- a/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt +++ b/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt @@ -5,7 +5,7 @@ import androidx.activity.OnBackPressedCallback import androidx.appcompat.widget.SearchView import androidx.fragment.app.Fragment -class CustomSearchView(context: Context?, fragment: Fragment) : SearchView(context) { +class CustomSearchView(context: Context, fragment: Fragment) : SearchView(context) { /* CustomSearchView uses some variables from SearchView. They are listed below with links to documentation isIconified - https://developer.android.com/reference/android/widget/SearchView#setIconified(boolean) diff --git a/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt b/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt index f656280613..2e720fbd17 100644 --- a/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt +++ b/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt @@ -181,8 +181,9 @@ class ScreenStackFragment : ScreenFragment { private fun updateToolbarMenu(menu: Menu) { menu.clear() if (shouldShowSearchBar()) { - if (searchView == null) { - val newSearchView = CustomSearchView(context, this) + val currentContext = context + if (searchView == null && currentContext != null) { + val newSearchView = CustomSearchView(currentContext, this) searchView = newSearchView onSearchViewCreate?.invoke(newSearchView) }