Add option to clear conversation query

This commit is contained in:
Moez Bhatti
2017-12-25 22:14:47 -05:00
parent c3e6d9f356
commit e56d754379
5 changed files with 44 additions and 0 deletions
@@ -12,6 +12,8 @@ import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.helper.ItemTouchHelper
import android.view.Gravity
import android.view.Menu
import android.view.MenuItem
import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
@@ -42,6 +44,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
override val viewModelClass = MainViewModel::class
override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
override val queryCancelledIntent: PublishSubject<Unit> = PublishSubject.create()
override val composeIntent by lazy { compose.clicks() }
override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) }
override val drawerItemIntent: Observable<DrawerItem> by lazy {
@@ -162,6 +165,10 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
toolbarSearch.isEnabled = state.page is Inbox
toolbarSearch.textSize = if (state.page is Inbox) 16f else 20f
toolbar.menu.findItem(R.id.clear)?.run {
isVisible = state.page is Inbox && state.page.query.isNotEmpty()
}
syncing.setVisible(state.syncing)
recyclerView.setVisible(!state.syncing)
@@ -218,4 +225,18 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
else if (!conversationMenuDialog.isShowing && menuItemAdapter.data.isNotEmpty()) conversationMenuDialog.show()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.main, menu)
return super.onCreateOptionsMenu(menu)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.clear -> queryCancelledIntent.onNext(Unit)
else -> return super.onOptionsItemSelected(item)
}
return true
}
}
@@ -7,6 +7,7 @@ import io.reactivex.subjects.Subject
interface MainView : QkView<MainState> {
val queryChangedIntent: Observable<CharSequence>
val queryCancelledIntent: Observable<*>
val composeIntent: Observable<Unit>
val drawerOpenIntent: Observable<Boolean>
val drawerItemIntent: Observable<DrawerItem>
@@ -93,6 +93,15 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
})
.subscribe()
intents += view.queryCancelledIntent
.withLatestFrom(state, { _, state ->
if (state.page is Inbox) {
val page = state.page.copy(query = "")
newState { it.copy(page = page) }
}
})
.subscribe()
intents += view.composeIntent
.subscribe { navigator.showCompose() }
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/clear"
android:icon="@drawable/ic_cancel_black_24dp"
android:title="@string/menu_clear"
android:visible="false"
app:showAsAction="always" />
</menu>
+1
View File
@@ -14,6 +14,7 @@
<string name="setup_skip">Skip</string>
<string name="setup_next">Continue</string>
<string name="menu_clear">Clear</string>
<string name="menu_call">Call</string>
<string name="menu_archive">Archive conversation</string>
<string name="menu_unarchive">Remove from archive</string>