diff options
author | Allan Wang <me@allanwang.ca> | 2017-07-22 20:27:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-22 20:27:22 -0700 |
commit | 138824065679d3cd88f7f80d48728ffdc777704a (patch) | |
tree | 1b2262da7499f226aede68bb26adec6833263d5d /app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | |
parent | 37a9f9057d7879080b7b982f987bf0b82d0d774c (diff) | |
download | frost-138824065679d3cd88f7f80d48728ffdc777704a.tar.gz frost-138824065679d3cd88f7f80d48728ffdc777704a.tar.bz2 frost-138824065679d3cd88f7f80d48728ffdc777704a.zip |
Test new billing logic (#86)v1.3.5
* Add lint
* Add new libs
* Update libs and add friends tab
* Aggressively hide nonrecent posts
* Update dependencies
* Add php to most recents
* Add full size image downloader
* Fix css cleaner
* Fix notification and circle
* Bring back regex
* Update kau, optimize imports, and remove string ambiguity
* Bring back anjlab iab and move to alpha
* Create initial billing test
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt index c40a705f..a7ca6ce5 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -17,27 +17,23 @@ import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.R import com.pitchedapps.frost.settings.* import com.pitchedapps.frost.utils.* -import com.pitchedapps.frost.utils.iab.* +import com.pitchedapps.frost.utils.iab.FrostBilling +import com.pitchedapps.frost.utils.iab.IABSettings +import com.pitchedapps.frost.utils.iab.IS_FROST_PRO /** * Created by Allan Wang on 2017-06-06. */ -class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListener { +class SettingsActivity : KPrefActivity(), FrostBilling by IABSettings() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (!IAB.handleActivityResult(requestCode, resultCode, data)) { + if (!onActivityResultBilling(requestCode, resultCode, data)) { super.onActivityResult(requestCode, resultCode, data) adapter.notifyDataSetChanged() } } - - override fun receivedBroadcast() { - L.d("IAB broadcast") - adapter.notifyDataSetChanged() - } - override fun kPrefCoreAttributes(): CoreAttributeContract.() -> Unit = { textColor = { Prefs.textColor } accentColor = { Prefs.accentColor } @@ -72,7 +68,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe plainText(R.string.restore_purchases) { descRes = R.string.restore_purchases_desc iicon = GoogleMaterial.Icon.gmd_refresh - onClick = { _, _, _ -> this@SettingsActivity.restorePurchases(); true } + onClick = { _, _, _ -> restorePurchases(false); true } } plainText(R.string.about_frost) { @@ -86,7 +82,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe } fun KPrefItemBase.BaseContract<*>.dependsOnPro() { - onDisabledClick = { _, _, _ -> openPlayProPurchase(0); true } + onDisabledClick = { _, _, _ -> purchasePro(); true } enabler = { IS_FROST_PRO } } @@ -99,6 +95,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe super.onCreate(savedInstanceState) animate = Prefs.animate themeExterior(false) + onCreateBilling() } fun themeExterior(animate: Boolean = true) { @@ -139,7 +136,7 @@ class SettingsActivity : KPrefActivity(), IabBroadcastReceiver.IabBroadcastListe } override fun onDestroy() { - IAB.dispose() + onDestroyBilling() super.onDestroy() } }
\ No newline at end of file |