mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Add collapsing toolbar and upgrade link on Scheduled screen
This commit is contained in:
@@ -33,6 +33,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.collapsing_toolbar.*
|
||||
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
package com.moez.QKSMS.feature.scheduled
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.os.Bundle
|
||||
import androidx.core.view.isVisible
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.QkDialog
|
||||
import com.moez.QKSMS.common.base.QkThemedActivity
|
||||
import com.moez.QKSMS.common.util.FontProvider
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.collapsing_toolbar.*
|
||||
import kotlinx.android.synthetic.main.scheduled_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
|
||||
class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
|
||||
@Inject lateinit var dialog: QkDialog
|
||||
@Inject lateinit var fontProvider: FontProvider
|
||||
@Inject lateinit var messageAdapter: ScheduledMessageAdapter
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
override val messageClickIntent by lazy { messageAdapter.clicks }
|
||||
override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
|
||||
override val upgradeIntent by lazy { upgrade.clicks() }
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
|
||||
|
||||
@@ -29,15 +39,31 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
if (!prefs.systemFont.get()) {
|
||||
fontProvider.getLato { lato ->
|
||||
val typeface = Typeface.create(lato, Typeface.BOLD)
|
||||
collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
}
|
||||
}
|
||||
|
||||
dialog.title = getString(R.string.scheduled_options_title)
|
||||
dialog.adapter.setData(R.array.scheduled_options)
|
||||
|
||||
messageAdapter.emptyView = empty
|
||||
messages.adapter = messageAdapter
|
||||
|
||||
colors.theme().let { theme ->
|
||||
upgrade.setBackgroundTint(theme.theme)
|
||||
upgradeIcon.setTint(theme.textPrimary)
|
||||
upgradeLabel.setTextColor(theme.textPrimary)
|
||||
}
|
||||
}
|
||||
|
||||
override fun render(state: ScheduledState) {
|
||||
messageAdapter.updateData(state.scheduledMessages)
|
||||
|
||||
upgrade.isVisible = !state.upgraded
|
||||
}
|
||||
|
||||
override fun showMessageOptions() {
|
||||
|
||||
@@ -4,5 +4,6 @@ import com.moez.QKSMS.model.ScheduledMessage
|
||||
import io.realm.RealmResults
|
||||
|
||||
data class ScheduledState(
|
||||
val scheduledMessages: RealmResults<ScheduledMessage>? = null
|
||||
val scheduledMessages: RealmResults<ScheduledMessage>? = null,
|
||||
val upgraded: Boolean = false
|
||||
)
|
||||
|
||||
@@ -7,6 +7,7 @@ interface ScheduledView : QkView<ScheduledState> {
|
||||
|
||||
val messageClickIntent: Observable<Long>
|
||||
val messageMenuIntent: Observable<Int>
|
||||
val upgradeIntent: Observable<*>
|
||||
|
||||
fun showMessageOptions()
|
||||
|
||||
|
||||
@@ -1,20 +1,30 @@
|
||||
package com.moez.QKSMS.feature.scheduled
|
||||
|
||||
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.interactor.SendScheduledMessage
|
||||
import com.moez.QKSMS.repository.ScheduledMessageRepository
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import javax.inject.Inject
|
||||
|
||||
class ScheduledViewModel @Inject constructor(
|
||||
billingManager: BillingManager,
|
||||
private val navigator: Navigator,
|
||||
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||
private val sendScheduledMessage: SendScheduledMessage
|
||||
) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
|
||||
scheduledMessages = scheduledMessageRepo.getScheduledMessages()
|
||||
)) {
|
||||
|
||||
init {
|
||||
disposables += billingManager.upgradeStatus
|
||||
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
|
||||
}
|
||||
|
||||
override fun bindView(view: ScheduledView) {
|
||||
super.bindView(view)
|
||||
|
||||
@@ -31,6 +41,10 @@ class ScheduledViewModel @Inject constructor(
|
||||
}
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.upgradeIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user