Add UI for rating app

This commit is contained in:
Moez Bhatti
2018-04-22 23:46:48 -04:00
parent 1b4bc6d4ab
commit d48a759ef8
10 changed files with 239 additions and 5 deletions
@@ -22,6 +22,7 @@ import android.app.Activity
import android.app.ActivityOptions
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.net.Uri
@@ -56,6 +57,7 @@ import manager.NotificationManager
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class Navigator @Inject constructor(private val context: Context, private val notificationManager: NotificationManager) {
@@ -189,6 +191,20 @@ class Navigator @Inject constructor(private val context: Context, private val no
startActivity(intent)
}
fun showRating() {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=${context.packageName}"))
.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY
or Intent.FLAG_ACTIVITY_NEW_DOCUMENT
or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
try {
startActivity(intent)
} catch (e: ActivityNotFoundException) {
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=" + context.packageName)))
}
}
/**
* Launch the Play Store and display the Should I Answer? listing
*/
@@ -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) }
@@ -35,6 +35,7 @@ import manager.KeyManagerImpl
import manager.NotificationManager
import manager.PermissionManager
import manager.PermissionManagerImpl
import manager.RatingManager
import manager.WidgetManager
import manager.WidgetManagerImpl
import mapper.CursorToContact
@@ -45,8 +46,9 @@ import mapper.CursorToMessage
import mapper.CursorToMessageImpl
import mapper.CursorToPart
import mapper.CursorToPartImpl
import mapper.CursorToRecipientImpl
import mapper.CursorToRecipient
import mapper.CursorToRecipientImpl
import mapper.RatingManagerImpl
import repository.ContactRepository
import repository.ContactRepositoryImpl
import repository.ImageRepository
@@ -95,6 +97,9 @@ class AppModule(private var application: Application) {
@Provides
fun providePermissionsManager(manager: PermissionManagerImpl): PermissionManager = manager
@Provides
fun provideRatingManager(manager: RatingManagerImpl): RatingManager = manager
@Provides
fun provideWidgetManager(manager: WidgetManagerImpl): WidgetManager = manager