Make nav drawer scrollable, improve banner for QKSMS+

This commit is contained in:
Moez Bhatti
2018-07-18 14:41:06 -04:00
parent cb1ba7f8c3
commit 08dbd7d72a
7 changed files with 313 additions and 200 deletions
@@ -28,6 +28,7 @@ import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.core.app.ActivityCompat
import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.ItemTouchHelper
@@ -87,6 +88,7 @@ class MainActivity : QkThemedActivity(), MainView {
help.clicks().map { DrawerItem.HELP }))
}
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
override val plusBannerIntent by lazy { plusBanner.clicks() }
override val dismissRatingIntent by lazy { rateDismiss.clicks() }
override val rateIntent by lazy { rateOkay.clicks() }
override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges }
@@ -140,6 +142,7 @@ class MainActivity : QkThemedActivity(), MainView {
// Miscellaneous views
syncingProgress.indeterminateTintList = ColorStateList.valueOf(theme.theme)
itemTouchCallback.color = theme.theme
plusIcon.setTint(theme.theme)
rateIcon.setTint(theme.theme)
compose.setBackgroundTint(theme.theme)
}
@@ -185,6 +188,8 @@ class MainActivity : QkThemedActivity(), MainView {
toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0
toolbar.menu.findItem(R.id.delete)?.isVisible = selectedConversations != 0
plus.isVisible = state.upgraded
plusBanner.isVisible = !state.upgraded
rateLayout.setVisible(state.showRating)
compose.setVisible(state.page is Inbox || state.page is Archived)
@@ -27,6 +27,7 @@ data class MainState(
val hasError: Boolean = false,
val page: MainPage = Inbox(),
val drawerOpen: Boolean = false,
val upgraded: Boolean = true,
val showRating: Boolean = false,
val syncing: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle(),
val defaultSms: Boolean = false,
@@ -30,6 +30,7 @@ interface MainView : QkView<MainState> {
val homeIntent: Observable<*>
val drawerItemIntent: Observable<DrawerItem>
val optionsItemIntent: Observable<Int>
val plusBannerIntent: Observable<*>
val dismissRatingIntent: Observable<*>
val rateIntent: Observable<*>
val conversationsSelectedIntent: Observable<List<Long>>
@@ -22,6 +22,7 @@ import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.androidxcompat.scope
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.common.util.BillingManager
import com.moez.QKSMS.extensions.removeAccents
import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkAllSeen
@@ -49,7 +50,10 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject
class MainViewModel @Inject constructor(
private val markAllSeen: MarkAllSeen,
billingManager: BillingManager,
markAllSeen: MarkAllSeen,
migratePreferences: MigratePreferences,
syncRepository: SyncRepository,
private val conversationRepo: ConversationRepository,
private val deleteConversations: DeleteConversations,
private val markRead: MarkRead,
@@ -57,12 +61,10 @@ class MainViewModel @Inject constructor(
private val markArchived: MarkArchived,
private val markUnarchived: MarkUnarchived,
private val markBlocked: MarkBlocked,
private val migratePreferences: MigratePreferences,
private val navigator: Navigator,
private val permissionManager: PermissionManager,
private val ratingManager: RatingManager,
private val syncMessages: SyncMessages,
private val syncRepository: SyncRepository
private val syncMessages: SyncMessages
) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
init {
@@ -78,6 +80,9 @@ class MainViewModel @Inject constructor(
.distinctUntilChanged()
.subscribe { syncing -> newState { copy(syncing = syncing) } }
// Update the upgraded status
disposables += billingManager.upgradeStatus
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
// Show the rating UI
disposables += ratingManager.shouldShowRating
@@ -231,6 +236,13 @@ class MainViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.plusBannerIntent
.autoDisposable(view.scope())
.subscribe {
newState { copy(drawerOpen = false) }
navigator.showQksmsPlusActivity("main_banner")
}
view.rateIntent
.autoDisposable(view.scope())
.subscribe {