add omnibar to omnibar include so it can be hidden

duckduckgo · Sep 13, 2024 · a2bb09f · a2bb09f
1 parent 5ea73cf
commit a2bb09f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -617,7 +617,7 @@ class BrowserTabFragment :
  get() = binding.includeOnboardingDaxDialog
 
  private val browserOmnibar
- get() = binding.browserOmnibar
+ get() = omnibar.browserOmnibar
 
  private val smoothProgressAnimator by lazy { SmoothProgressAnimator(omnibar.pageLoadingIndicator) }
 
@@ -881,6 +881,8 @@ class BrowserTabFragment :
  override fun onActivityCreated(savedInstanceState: Bundle?) {
  super.onActivityCreated(savedInstanceState)
  omnibar = IncludeOmnibarToolbarBinding.bind(binding.rootView)
+ omnibar.browserOmnibar.gone()
+
  webViewContainer = binding.webViewContainer
  configureObservers()
  configureOmnibar()
@@ -2310,6 +2312,7 @@ class BrowserTabFragment :
  browserOmnibar.setOmnibarEventListener(
  object : OmnibarEventListener {
  override fun onEvent(event: OmnibarEvent) {
+ Timber.d("Omnibar: onEvent $event")
  when (event) {
  is onFindInPageInputChanged -> onFindInPageInputChanged(event.query)
  is onItemPressed -> {
@@ -2429,6 +2432,7 @@ class BrowserTabFragment :
  inputText: String,
  focused: Boolean,
  ) {
+ Timber.d("Omnibar: onFocusChange text: $inputText focused $focused")
  viewModel.onOmnibarInputStateChanged(inputText, focused, false)
  viewModel.triggerAutocomplete(inputText, focused, false)
  if (focused) {
@@ -2439,6 +2443,7 @@ class BrowserTabFragment :
  }
 
  override fun onBackKeyPressed() {
+ Timber.d("Omnibar: onBackKeyPressed")
  hideKeyboardImmediately()
  }
  },
@@ -3867,6 +3872,7 @@ class BrowserTabFragment :
  viewModel.autoCompleteSuggestionsGone()
  binding.autoCompleteSuggestionsList.gone()
  } else {
+ Timber.d("Omnibar: show Autocomplete")
  binding.autoCompleteSuggestionsList.show()
  autoCompleteSuggestionsAdapter.updateData(viewState.searchResults.query, viewState.searchResults.suggestions)
  hideFocusedView()

diff --git a/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarView.kt b/app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarView.kt
@@ -268,6 +268,7 @@ class OmnibarView @JvmOverloads constructor(
  binding.omnibarTextInput.replaceTextChangedListener(
  textWatcher = object : TextChangedWatcher() {
  override fun afterTextChanged(editable: Editable) {
+ // does this generate double calls to the bar?
  omnibarEventListener?.onEvent(Omnibar.OmnibarEvent.onUserEnteredText(binding.omnibarTextInput.text.toString()))
  }
  },
@@ -378,7 +379,6 @@ class OmnibarView @JvmOverloads constructor(
  }
 
  private fun renderBrowserMode(viewState: ViewState) {
- Timber.d("Omnibar: renderBrowserMode")
  renderOutline(viewState.hasFocus)
  renderButtons(viewState)
  renderPulseAnimation(viewState)
@@ -634,7 +634,6 @@ class OmnibarView @JvmOverloads constructor(
  }
 
  private fun renderLeadingIconState(iconState: LeadingIconState) {
- Timber.d("Omnibar: iconState $iconState")
  when (iconState) {
  SEARCH -> {
  binding.searchIcon.show()

diff --git a/app/src/main/res/layout/fragment_browser_tab.xml b/app/src/main/res/layout/fragment_browser_tab.xml
@@ -99,25 +99,13 @@
  android:layout_height="wrap_content"
  android:animateLayoutChanges="true">
 
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
- <com.duckduckgo.app.browser.omnibar.OmnibarView
- android:id="@+id/browserOmnibar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize" />
-
  <FrameLayout
  android:id="@+id/webViewContainer"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  app:layout_behavior="@string/appbar_scrolling_view_behavior"
  tools:background="#4F00" />
 
- </LinearLayout>
-
  <include
  android:id="@+id/includeErrorView"
  layout="@layout/include_error_view"

diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -324,4 +324,9 @@
 
  </com.google.android.material.appbar.AppBarLayout>
 
+ <com.duckduckgo.app.browser.omnibar.OmnibarView
+ android:id="@+id/browserOmnibar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize" />
+
 </merge>
diff --git a/app/src/main/res/layout/view_omnibar.xml b/app/src/main/res/layout/view_omnibar.xml
@@ -16,7 +16,7 @@
  ~ limitations under the License.
  -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
@@ -331,4 +331,4 @@
 
  </com.google.android.material.appbar.AppBarLayout>
 
-</FrameLayout>
+</merge>