Simplify usage of BillingManager

This commit is contained in:
Moez Bhatti
2018-04-16 18:44:52 -04:00
parent 29c0885131
commit 38891c04bf
6 changed files with 22 additions and 40 deletions
@@ -92,8 +92,8 @@ class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
upgrade.text = getString(R.string.qksms_plus_upgrade, state.upgradePrice, state.currency)
upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
toUpgrade.setVisible(state.currentPlan == BillingManager.UpgradeStatus.REGULAR)
upgraded.setVisible(state.currentPlan == BillingManager.UpgradeStatus.UPGRADED)
toUpgrade.setVisible(!state.upgraded)
upgraded.setVisible(state.upgraded)
}
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
@@ -18,10 +18,8 @@
*/
package feature.plus
import common.util.BillingManager
data class PlusState(
val currentPlan: BillingManager.UpgradeStatus = BillingManager.UpgradeStatus.REGULAR,
val upgraded: Boolean = false,
val upgradePrice: String = "",
val upgradeDonatePrice: String = "",
val currency: String = ""
@@ -36,10 +36,8 @@ class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
init {
appComponent.inject(this)
disposables += billingManager.plusStatus
.subscribe { plan ->
newState { it.copy(currentPlan = plan) }
}
disposables += billingManager.upgradeStatus
.subscribe { upgraded -> newState { it.copy(upgraded = upgraded) } }
disposables += billingManager.products
.subscribe { products ->