mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 11:58:52 +01:00
Fix inability to show archived, press back, then show archived again
This commit is contained in:
@@ -86,17 +86,18 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
.doOnNext { dismissKeyboard() }
|
||||
}
|
||||
override val homeIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val drawerItemIntent: Observable<DrawerItem> by lazy {
|
||||
override val navigationIntent: Observable<NavItem> by lazy {
|
||||
Observable.merge(listOf(
|
||||
inbox.clicks().map { DrawerItem.INBOX },
|
||||
archived.clicks().map { DrawerItem.ARCHIVED },
|
||||
backup.clicks().map { DrawerItem.BACKUP },
|
||||
scheduled.clicks().map { DrawerItem.SCHEDULED },
|
||||
blocking.clicks().map { DrawerItem.BLOCKING },
|
||||
settings.clicks().map { DrawerItem.SETTINGS },
|
||||
plus.clicks().map { DrawerItem.PLUS },
|
||||
help.clicks().map { DrawerItem.HELP },
|
||||
invite.clicks().map { DrawerItem.INVITE }))
|
||||
backPressedSubject,
|
||||
inbox.clicks().map { NavItem.INBOX },
|
||||
archived.clicks().map { NavItem.ARCHIVED },
|
||||
backup.clicks().map { NavItem.BACKUP },
|
||||
scheduled.clicks().map { NavItem.SCHEDULED },
|
||||
blocking.clicks().map { NavItem.BLOCKING },
|
||||
settings.clicks().map { NavItem.SETTINGS },
|
||||
plus.clicks().map { NavItem.PLUS },
|
||||
help.clicks().map { NavItem.HELP },
|
||||
invite.clicks().map { NavItem.INVITE }))
|
||||
}
|
||||
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
|
||||
override val plusBannerIntent by lazy { plusBanner.clicks() }
|
||||
@@ -108,7 +109,6 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
override val changelogMoreIntent by lazy { changelog.moreClicks }
|
||||
override val undoArchiveIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val snackbarButtonIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] }
|
||||
private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.main_drawer_open_cd, 0) }
|
||||
@@ -117,6 +117,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
private val changelog by lazy { ChangelogDialog(this) }
|
||||
private val snackbar by lazy { findViewById<View>(R.id.snackbar) }
|
||||
private val syncing by lazy { findViewById<View>(R.id.syncing) }
|
||||
private val backPressedSubject: Subject<NavItem> = PublishSubject.create()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
@@ -364,7 +365,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
}
|
||||
|
||||
override fun onBackPressed() {
|
||||
backPressedIntent.onNext(Unit)
|
||||
backPressedSubject.onNext(NavItem.BACK)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ interface MainView : QkView<MainState> {
|
||||
val composeIntent: Observable<Unit>
|
||||
val drawerOpenIntent: Observable<Boolean>
|
||||
val homeIntent: Observable<*>
|
||||
val drawerItemIntent: Observable<DrawerItem>
|
||||
val navigationIntent: Observable<NavItem>
|
||||
val optionsItemIntent: Observable<Int>
|
||||
val plusBannerIntent: Observable<*>
|
||||
val dismissRatingIntent: Observable<*>
|
||||
@@ -39,7 +39,6 @@ interface MainView : QkView<MainState> {
|
||||
val changelogMoreIntent: Observable<*>
|
||||
val undoArchiveIntent: Observable<Unit>
|
||||
val snackbarButtonIntent: Observable<Unit>
|
||||
val backPressedIntent: Observable<Unit>
|
||||
|
||||
fun requestPermissions()
|
||||
fun clearSearch()
|
||||
@@ -50,4 +49,4 @@ interface MainView : QkView<MainState> {
|
||||
|
||||
}
|
||||
|
||||
enum class DrawerItem { INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
|
||||
enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, SETTINGS, PLUS, HELP, INVITE }
|
||||
|
||||
@@ -196,22 +196,37 @@ class MainViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { open -> newState { copy(drawerOpen = open) } }
|
||||
|
||||
view.drawerItemIntent
|
||||
.doOnNext { newState { copy(drawerOpen = false) } }
|
||||
.doOnNext { if (it == DrawerItem.BACKUP) navigator.showBackup() }
|
||||
.doOnNext { if (it == DrawerItem.SCHEDULED) navigator.showScheduled() }
|
||||
.doOnNext { if (it == DrawerItem.BLOCKING) navigator.showBlockedConversations() }
|
||||
.doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() }
|
||||
.doOnNext { if (it == DrawerItem.PLUS) navigator.showQksmsPlusActivity("main_menu") }
|
||||
.doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() }
|
||||
.doOnNext { if (it == DrawerItem.INVITE) navigator.showInvite() }
|
||||
view.navigationIntent
|
||||
.withLatestFrom(state) { drawerItem, state ->
|
||||
newState { copy(drawerOpen = false) }
|
||||
when (drawerItem) {
|
||||
NavItem.BACK -> when {
|
||||
state.drawerOpen -> Unit
|
||||
state.page is Searching -> view.clearSearch()
|
||||
state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
|
||||
state.page is Archived && state.page.selected > 0 -> view.clearSelection()
|
||||
state.page !is Inbox -> {
|
||||
newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
}
|
||||
else -> newState { copy(hasError = true) }
|
||||
}
|
||||
NavItem.BACKUP -> navigator.showBackup()
|
||||
NavItem.SCHEDULED -> navigator.showScheduled()
|
||||
NavItem.BLOCKING -> navigator.showBlockedConversations()
|
||||
NavItem.SETTINGS -> navigator.showSettings()
|
||||
NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
|
||||
NavItem.HELP -> navigator.showSupport()
|
||||
NavItem.INVITE -> navigator.showInvite()
|
||||
else -> Unit
|
||||
}
|
||||
drawerItem
|
||||
}
|
||||
.distinctUntilChanged()
|
||||
.doOnNext {
|
||||
when (it) {
|
||||
DrawerItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
|
||||
else -> {
|
||||
} // Do nothing
|
||||
.doOnNext { drawerItem ->
|
||||
when (drawerItem) {
|
||||
NavItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
NavItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
@@ -370,25 +385,6 @@ class MainViewModel @Inject constructor(
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.backPressedIntent
|
||||
.withLatestFrom(state) { _, state ->
|
||||
when {
|
||||
state.drawerOpen -> newState { copy(drawerOpen = false) }
|
||||
|
||||
state.page is Searching -> view.clearSearch()
|
||||
|
||||
state.page is Inbox && state.page.selected > 0 -> view.clearSelection()
|
||||
|
||||
state.page is Archived && state.page.selected > 0 -> view.clearSelection()
|
||||
|
||||
state.page !is Inbox -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
|
||||
|
||||
else -> newState { copy(hasError = true) }
|
||||
}
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user