Fix not being able to back out of search activities

This commit is contained in:
Jays2Kings 2022-05-21 14:04:15 -04:00
parent 07419a17a9
commit 3abbca2bdd

View file

@ -395,10 +395,12 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
binding.appBar.y = 0f
binding.appBar.updateAppBarAfterY(controller?.mainRecyclerView)
}
(controller as? BaseController<*>)?.onActionViewExpand(item)
(controller as? SettingsController)?.onActionViewExpand(item)
binding.searchToolbar.menu.forEach { it.isVisible = false }
lifecycleScope.launchUI { reEnableBackPressedCallBack() }
lifecycleScope.launchUI {
(controller as? BaseController<*>)?.onActionViewExpand(item)
(controller as? SettingsController)?.onActionViewExpand(item)
reEnableBackPressedCallBack()
}
return true
}
@ -407,9 +409,11 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
binding.appBar.compactSearchMode = false
controller?.mainRecyclerView?.requestApplyInsets()
setupSearchTBMenu(binding.toolbar.menu, true)
(controller as? BaseController<*>)?.onActionViewCollapse(item)
(controller as? SettingsController)?.onActionViewCollapse(item)
lifecycleScope.launchUI { reEnableBackPressedCallBack() }
lifecycleScope.launchUI {
(controller as? BaseController<*>)?.onActionViewCollapse(item)
(controller as? SettingsController)?.onActionViewCollapse(item)
reEnableBackPressedCallBack()
}
return true
}
},