Skip to content

Delay adding FocusedView until it's necessary #4772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2024
Merged

Delay adding FocusedView until it's necessary #4772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ae4ad
Delay adding FocusedView until it's necessary
malmstein Jul 17, 2024
b29042e
changing order for better visual ux
malmstein Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,6 @@ class BrowserTabFragment :
configureOmnibarTextInput()
configureFindInPage()
configureAutoComplete()
configureFocusedView()
configureNewTab()
initPrivacyProtectionsPopup()

Expand Down Expand Up @@ -2128,18 +2127,6 @@ class BrowserTabFragment :
binding.autoCompleteSuggestionsList.adapter = autoCompleteSuggestionsAdapter
}

private fun configureFocusedView() {
focusedViewProvider.provideFocusedViewVersion().onEach { focusedView ->
binding.focusedViewContainerLayout.addView(
focusedView.getView(requireContext()),
LayoutParams(
LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT,
),
)
}.launchIn(lifecycleScope)
}

private fun configureNewTab() {
newBrowserTab.newTabLayout.setOnScrollChangeListener { v, scrollX, scrollY, oldScrollX, oldScrollY ->
if (omnibar.omniBarContainer.isPressed) {
Expand Down Expand Up @@ -3563,20 +3550,43 @@ class BrowserTabFragment :
// viewState.showFavourites needs to be moved to FocusedViewModel
if (viewState.showSuggestions || viewState.showFavorites) {
if (viewState.favorites.isNotEmpty() && viewState.showFavorites) {
showFocusedView()
binding.autoCompleteSuggestionsList.gone()
binding.focusedViewContainerLayout.show()
} else {
binding.autoCompleteSuggestionsList.show()
binding.focusedViewContainerLayout.gone()
autoCompleteSuggestionsAdapter.updateData(viewState.searchResults.query, viewState.searchResults.suggestions)
hideFocusedView()
}
} else {
binding.autoCompleteSuggestionsList.gone()
binding.focusedViewContainerLayout.gone()
hideFocusedView()
}
}
}

private fun showFocusedView() {
binding.focusedViewContainerLayout.show()
configureFocusedView()
}

private fun configureFocusedView() {
if (binding.focusedViewContainerLayout.childCount == 0) {
focusedViewProvider.provideFocusedViewVersion().onEach { focusedView ->
binding.focusedViewContainerLayout.addView(
focusedView.getView(requireContext()),
LayoutParams(
LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT,
),
)
}.launchIn(lifecycleScope)
}
}

private fun hideFocusedView() {
binding.focusedViewContainerLayout.gone()
}

fun renderOmnibar(viewState: OmnibarViewState) {
renderIfChanged(viewState, lastSeenOmnibarViewState) {
lastSeenOmnibarViewState = viewState
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_browser_tab.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
android:id="@+id/focusedViewContainerLayout"
android:clipToPadding="false"
android:elevation="4dp"
android:background="?attr/daxColorSurface"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
Expand Down