parent
33b83fb0e3
commit
9d18bbad12
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue