1
0
Fork 0

Closes #847: Implement onCancelEditing to handle keyboard backPress (#929)

master
Sawyer Blatz 2019-03-13 11:12:58 -07:00 committed by GitHub
parent 33b83fb0e3
commit 9d18bbad12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

View File

@ -67,6 +67,7 @@ sealed class SearchAction : Action {
data class TextChanged(val query: String) : SearchAction()
object ToolbarTapped : SearchAction()
data class ToolbarMenuItemTapped(val item: ToolbarMenu.Item) : SearchAction()
object EditingCanceled : SearchAction()
}
sealed class SearchChange : Change {

View File

@ -55,7 +55,8 @@ class ToolbarUIView(
setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
override fun onCancelEditing(): Boolean {
return true
actionEmitter.onNext(SearchAction.EditingCanceled)
return false
}
override fun onTextChanged(text: String) {
url = text

View File

@ -79,6 +79,7 @@ class SearchFragment : Fragment() {
override fun onStart() {
super.onStart()
getAutoDisposeObservable<SearchAction>()
.subscribe {
when (it) {
@ -91,6 +92,9 @@ class SearchFragment : Fragment() {
is SearchAction.TextChanged -> {
getManagedEmitter<AwesomeBarChange>().onNext(AwesomeBarChange.UpdateQuery(it.query))
}
is SearchAction.EditingCanceled -> {
activity?.onBackPressed()
}
}
}