diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt index 028f9edf..4bfff87b 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -42,16 +42,21 @@ class PlusActivity : QkThemedActivity(), PlusView { override val upgradeIntent by lazy { upgrade.clicks() } override val upgradeDonateIntent by lazy { upgradeDonate.clicks() } - override fun onCreate(savedInstanceState: Bundle?) { + init { appComponent.inject(this) + } + + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.qksms_plus_activity) setTitle(R.string.title_qksms_plus) showBackButton(true) viewModel.bindView(this) - fontProvider.getLato { - val typeface = Typeface.create(it, Typeface.BOLD) + free.setVisible(false) + + fontProvider.getLato { lato -> + val typeface = Typeface.create(lato, Typeface.BOLD) collapsingToolbar.setCollapsedTitleTypeface(typeface) collapsingToolbar.setExpandedTitleTypeface(typeface) } @@ -71,7 +76,7 @@ class PlusActivity : QkThemedActivity(), PlusView { .autoDisposable(scope()) .subscribe { color -> upgradeDonate.setBackgroundTint(color) - thanks.setBackgroundTint(color) + upgraded.setBackgroundTint(color) } colors.theme @@ -87,9 +92,8 @@ 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) - upgrade.setVisible(state.currentPlan == BillingManager.UpgradeStatus.REGULAR) - upgradeDonate.setVisible(state.currentPlan == BillingManager.UpgradeStatus.REGULAR) - thanks.setVisible(state.currentPlan != BillingManager.UpgradeStatus.REGULAR) + toUpgrade.setVisible(state.currentPlan == BillingManager.UpgradeStatus.REGULAR) + upgraded.setVisible(state.currentPlan == BillingManager.UpgradeStatus.UPGRADED) } override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) { diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index b3745342..533c9451 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -57,31 +57,58 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_marginBottom="32dp" + android:layout_marginEnd="32dp" + android:layout_marginStart="32dp" + android:orientation="vertical"> - + + + + + + + + + @@ -92,7 +119,8 @@ android:layout_height="24dp" android:src="@drawable/ic_favorite_black_24dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:tint="@color/tools_theme" /> - + - + + + + + Unlock + donate for %1$s %2$s Thank you for supporting QKSMS! You now have access to all QKSMS+ features + QKSMS+ is free for F-Droid users! If you\'d like to support development, feel free to make a donation. + Donate via PayPal Coming soon Premium themes Unlock beautiful theme colors not available on the Material Design palette