forked from upstream-mirrors/quik
#1025 - Don't depend on in-app billing for F-Droid users
This commit is contained in:
@@ -21,6 +21,7 @@ package feature.plus
|
||||
import android.graphics.Typeface
|
||||
import android.os.Bundle
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
@@ -41,6 +42,7 @@ class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
|
||||
override val viewModelClass = PlusViewModel::class
|
||||
override val upgradeIntent by lazy { upgrade.clicks() }
|
||||
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
|
||||
override val donateIntent by lazy { donate.clicks() }
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
@@ -82,6 +84,7 @@ class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
|
||||
colors.theme
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color ->
|
||||
donate.setBackgroundTint(color)
|
||||
upgrade.setBackgroundTint(color)
|
||||
thanksIcon.setTint(color)
|
||||
}
|
||||
@@ -92,8 +95,11 @@ 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.upgraded)
|
||||
upgraded.setVisible(state.upgraded)
|
||||
val fdroid = BuildConfig.FLAVOR == "noAnalytics"
|
||||
|
||||
free.setVisible(fdroid)
|
||||
toUpgrade.setVisible(!fdroid && !state.upgraded)
|
||||
upgraded.setVisible(!fdroid && state.upgraded)
|
||||
}
|
||||
|
||||
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
|
||||
|
||||
@@ -18,14 +18,15 @@
|
||||
*/
|
||||
package feature.plus
|
||||
|
||||
import common.base.QkView
|
||||
import common.util.BillingManager
|
||||
import io.reactivex.Observable
|
||||
import common.base.QkView
|
||||
|
||||
interface PlusView : QkView<PlusState> {
|
||||
|
||||
val upgradeIntent: Observable<Unit>
|
||||
val upgradeDonateIntent: Observable<Unit>
|
||||
val donateIntent: Observable<*>
|
||||
|
||||
fun initiatePurchaseFlow(billingManager: BillingManager, sku: String)
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ package feature.plus
|
||||
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import common.util.BillingManager
|
||||
import injection.appComponent
|
||||
@@ -32,6 +33,7 @@ class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
|
||||
|
||||
@Inject lateinit var analyticsManager: AnalyticsManager
|
||||
@Inject lateinit var billingManager: BillingManager
|
||||
@Inject lateinit var navigator: Navigator
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
@@ -59,6 +61,10 @@ class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
|
||||
.doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) }
|
||||
|
||||
view.donateIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showDonation() }
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user