Skip to content

Commit 33e2e2a

Browse files
committed
Hide or show the navigation bar when activity is created
1 parent 8c95cc4 commit 33e2e2a

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import androidx.recyclerview.widget.RecyclerView
3939
import androidx.recyclerview.widget.RecyclerView.OnScrollListener
4040
import com.duckduckgo.anvil.annotations.InjectWith
4141
import com.duckduckgo.app.browser.R
42+
import com.duckduckgo.app.browser.api.OmnibarRepository
4243
import com.duckduckgo.app.browser.databinding.ActivityTabSwitcherBinding
4344
import com.duckduckgo.app.browser.databinding.PopupTabsMenuBinding
4445
import com.duckduckgo.app.browser.favicon.FaviconManager
@@ -165,6 +166,9 @@ class TabSwitcherActivity :
165166
@Inject
166167
lateinit var onboardingExperimentFireAnimationHelper: OnboardingExperimentFireAnimationHelper
167168

169+
@Inject
170+
lateinit var omnibarRepository: OmnibarRepository
171+
168172
private val viewModel: TabSwitcherViewModel by bindViewModel()
169173

170174
private val tabsAdapter: TabSwitcherAdapter by lazy {
@@ -253,21 +257,26 @@ class TabSwitcherActivity :
253257
}
254258

255259
private fun configureNavigationBar() {
256-
binding.navigationBar.browserNavigationBarObserver =
257-
object : BrowserNavigationBarObserver {
258-
override fun onMenuButtonClicked() {
259-
showPopupMenu(binding.navigationBar.popupMenuAnchor.id)
260-
}
260+
if (omnibarRepository.omnibarType == OmnibarType.SPLIT) {
261+
binding.navigationBar.browserNavigationBarObserver =
262+
object : BrowserNavigationBarObserver {
263+
override fun onMenuButtonClicked() {
264+
showPopupMenu(binding.navigationBar.popupMenuAnchor.id)
265+
}
261266

262-
override fun onNewTabButtonClicked() {
263-
viewModel.onNewTabRequested()
264-
}
267+
override fun onNewTabButtonClicked() {
268+
viewModel.onNewTabRequested()
269+
}
265270

266-
override fun onFireButtonClicked() {
267-
viewModel.onFireButtonTapped()
271+
override fun onFireButtonClicked() {
272+
viewModel.onFireButtonTapped()
273+
}
268274
}
269-
}
270-
binding.navigationBar.setViewMode(BrowserNavigationBarView.ViewMode.TabManager)
275+
binding.navigationBar.setViewMode(BrowserNavigationBarView.ViewMode.TabManager)
276+
binding.navigationBar.show()
277+
} else {
278+
binding.navigationBar.gone()
279+
}
271280
}
272281

273282
override fun onSaveInstanceState(outState: Bundle) {

app/src/main/res/layout/activity_tab_switcher.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272

7373
<com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarView
7474
android:id="@+id/navigationBar"
75+
android:visibility="gone"
7576
android:layout_width="match_parent"
7677
android:layout_height="wrap_content" />
7778

0 commit comments

Comments
 (0)