forked from upstream-mirrors/quik
Add UI for rating app
This commit is contained in:
@@ -81,6 +81,8 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
plus.clicks().map { DrawerItem.PLUS },
|
||||
help.clicks().map { DrawerItem.HELP }))
|
||||
}
|
||||
override val dismissRatingIntent by lazy { rateDismiss.clicks() }
|
||||
override val rateIntent by lazy { rateOkay.clicks() }
|
||||
override val conversationClickIntent by lazy { conversationsAdapter.clicks }
|
||||
override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks }
|
||||
override val conversationMenuItemIntent by lazy { dialog.adapter.menuItemClicks }
|
||||
@@ -137,6 +139,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
colors.theme
|
||||
.doOnNext { color -> syncingProgress.indeterminateTintList = ColorStateList.valueOf(color) }
|
||||
.doOnNext { color -> itemTouchCallback.color = color }
|
||||
.doOnNext { color -> rateIcon.setTint(color) }
|
||||
.doOnNext { color -> compose.setBackgroundTint(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
@@ -172,6 +175,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
.doOnNext { color -> inbox.background = rowBackground(color) }
|
||||
.doOnNext { color -> archived.background = rowBackground(color) }
|
||||
.doOnNext { color -> scheduled.background = rowBackground(color) }
|
||||
.doOnNext { color -> rateLayout.setBackgroundTint(color) }
|
||||
.autoDisposable(scope())
|
||||
.subscribe()
|
||||
|
||||
@@ -189,6 +193,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
|
||||
syncing.setVisible(state.syncing)
|
||||
synced.setVisible(!state.syncing)
|
||||
rateLayout.setVisible(state.showRating)
|
||||
|
||||
when (state.page) {
|
||||
is Inbox -> {
|
||||
|
||||
@@ -24,7 +24,8 @@ import model.Conversation
|
||||
data class MainState(
|
||||
val page: MainPage = Inbox(),
|
||||
val drawerOpen: Boolean = false,
|
||||
val syncing: Boolean = false
|
||||
val syncing: Boolean = false,
|
||||
val showRating: Boolean = false
|
||||
)
|
||||
|
||||
sealed class MainPage
|
||||
|
||||
@@ -29,6 +29,8 @@ interface MainView : QkView<MainState> {
|
||||
val composeIntent: Observable<Unit>
|
||||
val drawerOpenIntent: Observable<Boolean>
|
||||
val drawerItemIntent: Observable<DrawerItem>
|
||||
val dismissRatingIntent: Observable<*>
|
||||
val rateIntent: Observable<*>
|
||||
val conversationClickIntent: Observable<Long>
|
||||
val conversationLongClickIntent: Observable<Long>
|
||||
val conversationMenuItemIntent: Observable<Int>
|
||||
|
||||
@@ -42,6 +42,7 @@ import io.reactivex.Observable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import io.realm.Realm
|
||||
import manager.RatingManager
|
||||
import model.SyncLog
|
||||
import repository.MessageRepository
|
||||
import util.Preferences
|
||||
@@ -52,7 +53,6 @@ import javax.inject.Inject
|
||||
class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var conversationFilter: ConversationFilter
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@Inject lateinit var markAllSeen: MarkAllSeen
|
||||
@@ -61,8 +61,10 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
@Inject lateinit var markUnarchived: MarkUnarchived
|
||||
@Inject lateinit var markBlocked: MarkBlocked
|
||||
@Inject lateinit var migratePreferences: MigratePreferences
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var partialSync: PartialSync
|
||||
@Inject lateinit var prefs: Preferences
|
||||
@Inject lateinit var ratingManager: RatingManager
|
||||
|
||||
private val menuArchive by lazy { MenuItem(context.getString(R.string.inbox_menu_archive), 0) }
|
||||
private val menuUnarchive by lazy { MenuItem(context.getString(R.string.inbox_menu_unarchive), 1) }
|
||||
@@ -95,6 +97,9 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
.distinctUntilChanged()
|
||||
.subscribe { syncing -> newState { it.copy(syncing = syncing) } }
|
||||
|
||||
disposables += ratingManager.shouldShowRating
|
||||
.subscribe { show -> newState { it.copy(showRating = show) } }
|
||||
|
||||
// Migrate the preferences from 2.7.3 if necessary
|
||||
migratePreferences.execute(Unit)
|
||||
|
||||
@@ -110,6 +115,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
navigator.showSetupActivity()
|
||||
}
|
||||
|
||||
ratingManager.addSession()
|
||||
markAllSeen.execute(Unit)
|
||||
}
|
||||
|
||||
@@ -162,6 +168,17 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.rateIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
navigator.showRating()
|
||||
ratingManager.rate()
|
||||
}
|
||||
|
||||
view.dismissRatingIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { ratingManager.dismiss() }
|
||||
|
||||
view.conversationClickIntent
|
||||
.doOnNext { view.clearSearch() }
|
||||
.doOnNext { threadId -> navigator.showConversation(threadId) }
|
||||
|
||||
Reference in New Issue
Block a user