forked from upstream-mirrors/quik
Merge branch 'master' of https://github.com/moezbhatti/qksms3
This commit is contained in:
@@ -46,11 +46,14 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
|
||||
override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
|
||||
override val composeIntent by lazy { compose.clicks() }
|
||||
override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) }
|
||||
override val inboxIntent by lazy { inbox.clicks() }
|
||||
override val archivedIntent by lazy { archived.clicks() }
|
||||
override val scheduledIntent by lazy { scheduled.clicks() }
|
||||
override val blockedIntent by lazy { blocked.clicks() }
|
||||
override val settingsIntent by lazy { settings.clicks() }
|
||||
override val drawerItemIntent: Observable<DrawerItem> by lazy {
|
||||
Observable.merge(listOf(
|
||||
inbox.clicks().map { DrawerItem.INBOX },
|
||||
archived.clicks().map { DrawerItem.ARCHIVED },
|
||||
scheduled.clicks().map { DrawerItem.SCHEDULED },
|
||||
blocked.clicks().map { DrawerItem.BLOCKED },
|
||||
settings.clicks().map { DrawerItem.SETTINGS }))
|
||||
}
|
||||
override val deleteConversationIntent: Subject<Long> = PublishSubject.create()
|
||||
override val archiveConversationIntent: Observable<Long> by lazy {
|
||||
itemTouchCallback.swipes
|
||||
|
||||
@@ -9,12 +9,10 @@ interface MainView : QkView<MainState> {
|
||||
val queryChangedIntent: Observable<CharSequence>
|
||||
val composeIntent: Observable<Unit>
|
||||
val drawerOpenIntent: Observable<Boolean>
|
||||
val inboxIntent: Observable<Unit>
|
||||
val archivedIntent: Observable<Unit>
|
||||
val scheduledIntent: Observable<Unit>
|
||||
val blockedIntent: Observable<Unit>
|
||||
val settingsIntent: Observable<Unit>
|
||||
val drawerItemIntent: Observable<DrawerItem>
|
||||
val deleteConversationIntent: Subject<Long>
|
||||
val archiveConversationIntent: Observable<Long>
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
enum class DrawerItem { INBOX, ARCHIVED, SCHEDULED, BLOCKED, SETTINGS }
|
||||
@@ -65,35 +65,26 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
newState { it.copy(page = Inbox(filteredConversations)) }
|
||||
}
|
||||
|
||||
intents += view.composeIntent.subscribe {
|
||||
navigator.showCompose()
|
||||
newState { it.copy(drawerOpen = false) }
|
||||
}
|
||||
intents += view.composeIntent
|
||||
.subscribe { navigator.showCompose() }
|
||||
|
||||
intents += view.drawerOpenIntent.filter { it }.subscribe {
|
||||
newState { it.copy(drawerOpen = true) }
|
||||
}
|
||||
intents += view.drawerOpenIntent
|
||||
.filter { it }
|
||||
.subscribe { newState { it.copy(drawerOpen = true) } }
|
||||
|
||||
intents += view.inboxIntent.subscribe {
|
||||
newState { it.copy(page = Inbox(conversations), drawerOpen = false) }
|
||||
}
|
||||
|
||||
intents += view.archivedIntent.subscribe {
|
||||
newState { it.copy(page = Archived(messageRepo.getConversations(true)), drawerOpen = false) }
|
||||
}
|
||||
|
||||
intents += view.scheduledIntent.subscribe {
|
||||
newState { it.copy(page = Scheduled(), drawerOpen = false) }
|
||||
}
|
||||
|
||||
intents += view.blockedIntent.subscribe {
|
||||
newState { it.copy(page = Blocked(), drawerOpen = false) }
|
||||
}
|
||||
|
||||
intents += view.settingsIntent.subscribe {
|
||||
navigator.showSettings()
|
||||
newState { it.copy(drawerOpen = false) }
|
||||
}
|
||||
intents += view.drawerItemIntent
|
||||
.doOnNext { newState { it.copy(drawerOpen = false) } }
|
||||
.doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() }
|
||||
.distinctUntilChanged()
|
||||
.doOnNext {
|
||||
when (it) {
|
||||
DrawerItem.INBOX -> newState { it.copy(page = Inbox(conversations)) }
|
||||
DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(messageRepo.getConversations(true))) }
|
||||
DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) }
|
||||
DrawerItem.BLOCKED -> newState { it.copy(page = Blocked()) }
|
||||
}
|
||||
}
|
||||
.subscribe()
|
||||
|
||||
intents += view.deleteConversationIntent
|
||||
.subscribe { threadId -> deleteConversation.execute(threadId) }
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
<string name="app_name">QKSMS</string>
|
||||
|
||||
<string name="title_archived">Archived</string>
|
||||
<string name="title_scheduled">Scheduled</string>
|
||||
<string name="title_blocked">Blocked</string>
|
||||
<string name="title_settings">Settings</string>
|
||||
<string name="title_conversations">Search inbox…</string>
|
||||
<string name="title_compose">Type a name or number</string>
|
||||
|
||||
Reference in New Issue
Block a user