blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #655 - Show/Hide toolbar in onResume

master
Emily Kager 2019-02-25 11:37:20 -08:00 committed by Emily Kager
parent dddbb374e9
commit 5b8d40e6e0
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -102,8 +102,6 @@ class BrowserFragment : Fragment(), BackHandler {
sessionId = BrowserFragmentArgs.fromBundle(arguments!!).sessionId
(activity as AppCompatActivity).supportActionBar?.hide()
val sessionManager = requireComponents.core.sessionManager
contextMenuFeature.set(
@ -169,6 +167,11 @@ class BrowserFragment : Fragment(), BackHandler {
view = view)
}
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.hide()
}
override fun onStart() {
super.onStart()
getAutoDisposeObservable<SearchAction>()

6
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -62,7 +62,6 @@ class HomeFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
(activity as AppCompatActivity).supportActionBar?.hide()
setupHomeMenu()
val searchIcon = requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext()).let {
@ -122,6 +121,11 @@ class HomeFragment : Fragment() {
}
}
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.hide()
}
override fun onStart() {
super.onStart()
if (isAdded) {

4
app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt
View File

@ -30,6 +30,10 @@ class LibraryFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setHasOptionsMenu(true)
}
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.show()
}

4
app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
View File

@ -51,6 +51,10 @@ class HistoryFragment : Fragment(), CoroutineScope, BackHandler {
job = Job()
setHasOptionsMenu(true)
}
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.show()
}

7
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -66,8 +66,6 @@ class SearchFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
(activity as AppCompatActivity).supportActionBar?.hide()
layoutComponents(view.search_layout)
lifecycle.addObserver((toolbarComponent.uiView as ToolbarUIView).toolbarIntegration)
@ -75,6 +73,11 @@ class SearchFragment : Fragment() {
view.toolbar_wrapper.clipToOutline = false
}
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.hide()
}
override fun onStart() {
super.onStart()
getAutoDisposeObservable<SearchAction>()

2
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -40,7 +40,6 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
job = Job()
(activity as AppCompatActivity).supportActionBar?.show()
}
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@ -50,6 +49,7 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope {
override fun onResume() {
super.onResume()
(activity as AppCompatActivity).supportActionBar?.show()
generateWordmark()
setupPreferences()
}