ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 1807727 - Dismiss SearchDialogFragment on editing cancelled

This commit is contained in:
Alexandru2909 2023-01-03 10:45:26 +02:00 committed by mergify[bot]
parent e4fc184ece
commit 8186c44ef0
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
View File

@ -72,6 +72,7 @@ class SearchDialogController(
private val clearToolbarFocus: () -> Unit,
private val focusToolbar: () -> Unit,
private val clearToolbar: () -> Unit,
private val dismissDialogAndGoBack: () -> Unit,
) : SearchController {
override fun handleUrlCommitted(url: String, fromHomeScreen: Boolean) {
@ -135,6 +136,7 @@ class SearchDialogController(
override fun handleEditingCancelled() {
clearToolbarFocus()
dismissDialogAndGoBack()
}
override fun handleTextChanged(text: String) {

32
app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
View File

@ -212,6 +212,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
clearToolbar = {
inlineAutocompleteEditText.setText("")
},
dismissDialogAndGoBack = ::dismissDialogAndGoBack,
),
)
@ -636,24 +637,29 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
true
}
else -> {
// In case we're displaying search results, we wouldn't have navigated to home, and
// so we don't need to navigate "back to" browser fragment.
// See mirror of this logic in BrowserToolbarController#handleToolbarClick.
if (store.state.searchTerms.isBlank()) {
val args by navArgs<SearchDialogFragmentArgs>()
args.sessionId?.let {
findNavController().navigate(
SearchDialogFragmentDirections.actionGlobalBrowser(null),
)
}
}
view?.hideKeyboard()
dismissAllowingStateLoss()
dismissDialogAndGoBack()
true
}
}
}
private fun dismissDialogAndGoBack() {
// In case we're displaying search results, we wouldn't have navigated to home, and
// so we don't need to navigate "back to" browser fragment.
// See mirror of this logic in BrowserToolbarController#handleToolbarClick.
if (store.state.searchTerms.isBlank()) {
val args by navArgs<SearchDialogFragmentArgs>()
args.sessionId?.let {
findNavController().navigate(
SearchDialogFragmentDirections.actionGlobalBrowser(null),
)
}
}
view?.hideKeyboard()
dismissAllowingStateLoss()
}
private fun historyStorageProvider(): HistoryStorage? {
return if (requireContext().settings().shouldShowHistorySuggestions) {
requireComponents.core.historyStorage

7
app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
View File

@ -223,13 +223,18 @@ class SearchDialogControllerTest {
@Test
fun handleEditingCancelled() = runTest {
var clearToolbarFocusInvoked = false
var dismissAndGoBack = false
createController(
clearToolbarFocus = {
clearToolbarFocusInvoked = true
},
dismissDialogAndGoBack = {
dismissAndGoBack = true
},
).handleEditingCancelled()
assertTrue(clearToolbarFocusInvoked)
assertTrue(dismissAndGoBack)
}
@Test
@ -552,6 +557,7 @@ class SearchDialogControllerTest {
focusToolbar: () -> Unit = { },
clearToolbar: () -> Unit = { },
dismissDialog: () -> Unit = { },
dismissDialogAndGoBack: () -> Unit = { },
): SearchDialogController {
return SearchDialogController(
activity = activity,
@ -564,6 +570,7 @@ class SearchDialogControllerTest {
clearToolbarFocus = clearToolbarFocus,
focusToolbar = focusToolbar,
clearToolbar = clearToolbar,
dismissDialogAndGoBack = dismissDialogAndGoBack,
)
}
}