forked from upstream-mirrors/quik
Revert "Implement ViewBinding"
This reverts commit 37d8c45379.
# Conflicts:
# build.gradle
# presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
# presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
# presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
# presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
# presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
# presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
# presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
# presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
This commit is contained in:
@@ -24,6 +24,7 @@ import androidx.core.view.children
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.jakewharton.rxbinding2.view.enabled
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkThemedActivity
|
||||
@@ -32,12 +33,14 @@ import com.moez.QKSMS.common.util.extensions.resolveThemeColor
|
||||
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 com.moez.QKSMS.common.util.extensions.viewBinding
|
||||
import com.moez.QKSMS.common.widget.PreferenceView
|
||||
import com.moez.QKSMS.databinding.QksmsPlusActivityBinding
|
||||
import com.moez.QKSMS.feature.plus.experiment.UpgradeButtonExperiment
|
||||
import com.moez.QKSMS.manager.BillingManager
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.Observable
|
||||
import kotlinx.android.synthetic.main.collapsing_toolbar.*
|
||||
import kotlinx.android.synthetic.main.preference_view.view.*
|
||||
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class PlusActivity : QkThemedActivity(), PlusView {
|
||||
@@ -46,68 +49,67 @@ class PlusActivity : QkThemedActivity(), PlusView {
|
||||
@Inject lateinit var upgradeButtonExperiment: UpgradeButtonExperiment
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
private val binding by viewBinding(QksmsPlusActivityBinding::inflate)
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
|
||||
|
||||
override val upgradeIntent by lazy { binding.upgrade.clicks() }
|
||||
override val upgradeDonateIntent by lazy { binding.upgradeDonate.clicks() }
|
||||
override val donateIntent by lazy { binding.donate.clicks() }
|
||||
override val themeClicks by lazy { binding.themes.clicks() }
|
||||
override val scheduleClicks by lazy { binding.schedule.clicks() }
|
||||
override val backupClicks by lazy { binding.backup.clicks() }
|
||||
override val delayedClicks by lazy { binding.delayed.clicks() }
|
||||
override val nightClicks by lazy { binding.night.clicks() }
|
||||
override val upgradeIntent by lazy { upgrade.clicks() }
|
||||
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
|
||||
override val donateIntent by lazy { donate.clicks() }
|
||||
override val themeClicks by lazy { themes.clicks() }
|
||||
override val scheduleClicks by lazy { schedule.clicks() }
|
||||
override val backupClicks by lazy { backup.clicks() }
|
||||
override val delayedClicks by lazy { delayed.clicks() }
|
||||
override val nightClicks by lazy { night.clicks() }
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(binding.root)
|
||||
setContentView(R.layout.qksms_plus_activity)
|
||||
setTitle(R.string.title_qksms_plus)
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
binding.free.setVisible(false)
|
||||
free.setVisible(false)
|
||||
|
||||
if (!prefs.systemFont.get()) {
|
||||
fontProvider.getLato { lato ->
|
||||
val typeface = Typeface.create(lato, Typeface.BOLD)
|
||||
binding.appBarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
binding.appBarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
collapsingToolbar.setCollapsedTitleTypeface(typeface)
|
||||
collapsingToolbar.setExpandedTitleTypeface(typeface)
|
||||
}
|
||||
}
|
||||
|
||||
// Make the list titles bold
|
||||
binding.linearLayout.children
|
||||
.mapNotNull { view -> view as? PreferenceView }
|
||||
.map { preferenceView -> preferenceView.binding.titleView }
|
||||
linearLayout.children
|
||||
.mapNotNull { it as? PreferenceView }
|
||||
.map { it.titleView }
|
||||
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
|
||||
|
||||
val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary)
|
||||
binding.appBarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
|
||||
binding.appBarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary)
|
||||
collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
|
||||
collapsingToolbar.setExpandedTitleColor(textPrimary)
|
||||
|
||||
val theme = colors.theme().theme
|
||||
binding.donate.setBackgroundTint(theme)
|
||||
binding.upgrade.setBackgroundTint(theme)
|
||||
binding.thanksIcon.setTint(theme)
|
||||
donate.setBackgroundTint(theme)
|
||||
upgrade.setBackgroundTint(theme)
|
||||
thanksIcon.setTint(theme)
|
||||
}
|
||||
|
||||
override fun render(state: PlusState) {
|
||||
binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
|
||||
binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
|
||||
binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
|
||||
description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
|
||||
upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
|
||||
upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
|
||||
|
||||
val fdroid = BuildConfig.FLAVOR == "noAnalytics"
|
||||
|
||||
binding.free.setVisible(fdroid)
|
||||
binding.toUpgrade.setVisible(!fdroid && !state.upgraded)
|
||||
binding.upgraded.setVisible(!fdroid && state.upgraded)
|
||||
free.setVisible(fdroid)
|
||||
toUpgrade.setVisible(!fdroid && !state.upgraded)
|
||||
upgraded.setVisible(!fdroid && state.upgraded)
|
||||
|
||||
binding.themes.isEnabled = state.upgraded
|
||||
binding.schedule.isEnabled = state.upgraded
|
||||
binding.backup.isEnabled = state.upgraded
|
||||
binding.delayed.isEnabled = state.upgraded
|
||||
binding.night.isEnabled = state.upgraded
|
||||
themes.isEnabled = state.upgraded
|
||||
schedule.isEnabled = state.upgraded
|
||||
backup.isEnabled = state.upgraded
|
||||
delayed.isEnabled = state.upgraded
|
||||
night.isEnabled = state.upgraded
|
||||
}
|
||||
|
||||
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
|
||||
|
||||
Reference in New Issue
Block a user