diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index c2594f81..3768e573 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -150,6 +150,11 @@ class Navigator @Inject constructor(private val context: Context, private val no startActivityExternal(intent) } + fun showDonation() { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://bit.ly/QKSMSDonation")) + startActivity(intent) + } + /** * Launch the Play Store and display the Should I Answer? listing */ diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt index bb4d6c1a..dd16fa42 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -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(), 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(), PlusView { colors.theme .autoDisposable(scope()) .subscribe { color -> + donate.setBackgroundTint(color) upgrade.setBackgroundTint(color) thanksIcon.setTint(color) } @@ -92,8 +95,11 @@ class PlusActivity : QkThemedActivity(), 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) { diff --git a/presentation/src/main/java/feature/plus/PlusView.kt b/presentation/src/main/java/feature/plus/PlusView.kt index f2c23a1c..7267ea5c 100644 --- a/presentation/src/main/java/feature/plus/PlusView.kt +++ b/presentation/src/main/java/feature/plus/PlusView.kt @@ -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 { val upgradeIntent: Observable val upgradeDonateIntent: Observable + val donateIntent: Observable<*> fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/feature/plus/PlusViewModel.kt index adafc964..b40b6109 100644 --- a/presentation/src/main/java/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/feature/plus/PlusViewModel.kt @@ -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(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(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() } } } \ No newline at end of file