diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt index 0d12733d..26c3b223 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt @@ -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(), MainView { override val viewModelClass = MainViewModel::class override val queryChangedIntent by lazy { toolbarSearch.textChanges() } + override val queryCancelledIntent: PublishSubject = PublishSubject.create() override val composeIntent by lazy { compose.clicks() } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } override val drawerItemIntent: Observable by lazy { @@ -162,6 +165,10 @@ class MainActivity : QkActivity(), 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(), 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 + } + } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt index 26f10161..6d6c796b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt @@ -7,6 +7,7 @@ import io.reactivex.subjects.Subject interface MainView : QkView { val queryChangedIntent: Observable + val queryCancelledIntent: Observable<*> val composeIntent: Observable val drawerOpenIntent: Observable val drawerItemIntent: Observable diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index 381114b6..beb24130 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -93,6 +93,15 @@ class MainViewModel : QkViewModel(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() } diff --git a/qksms/src/main/res/menu/main.xml b/qksms/src/main/res/menu/main.xml new file mode 100644 index 00000000..e6253bc1 --- /dev/null +++ b/qksms/src/main/res/menu/main.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index ca0505b2..2bdc7fd0 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Skip Continue + Clear Call Archive conversation Remove from archive