1 files changed, 2 insertions, 28 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 8d4e521f..97d82884 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -11,25 +11,20 @@ import android.view.MenuItem
 import ca.allanwang.kau.kpref.activity.CoreAttributeContract
 import ca.allanwang.kau.kpref.activity.KPrefActivity
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
-import ca.allanwang.kau.kpref.activity.items.KPrefItemBase
 import ca.allanwang.kau.ui.views.RippleCanvas
 import ca.allanwang.kau.utils.*
 import com.mikepenz.community_material_typeface_library.CommunityMaterial
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
-import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.enums.Support
 import com.pitchedapps.frost.settings.*
 import com.pitchedapps.frost.utils.*
-import com.pitchedapps.frost.utils.iab.FrostBilling
-import com.pitchedapps.frost.utils.iab.IS_FROST_PRO
-import com.pitchedapps.frost.utils.iab.IabSettings
 
 
 /**
  * Created by Allan Wang on 2017-06-06.
  */
-class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
+class SettingsActivity : KPrefActivity() {
 
     var resultFlag = Activity.RESULT_CANCELED
 
@@ -56,8 +51,6 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
                 return
             }
         }
-        if (!onActivityResultBilling(requestCode, resultCode, data))
-            super.onActivityResult(requestCode, resultCode, data)
         reloadList()
     }
 
@@ -125,12 +118,7 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
             iicon = CommunityMaterial.Icon.cmd_flask_outline
         }
 
-        plainText(R.string.get_pro) {
-            descRes = R.string.get_pro_desc
-            iicon = GoogleMaterial.Icon.gmd_star
-            visible = { !IS_FROST_PRO }
-            onClick = { restorePurchases() }
-        }
+        // todo add donation?
 
         plainText(R.string.about_frost) {
             descRes = R.string.about_frost_desc
@@ -159,14 +147,6 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
             visible = { Prefs.debugSettings }
         }
 
-        if (BuildConfig.DEBUG) {
-            checkbox(R.string.custom_pro, { Prefs.debugPro }, { Prefs.debugPro = it })
-        }
-    }
-
-    fun KPrefItemBase.BaseContract<*>.dependsOnPro() {
-        onDisabledClick = { purchasePro() }
-        enabler = { IS_FROST_PRO }
     }
 
     fun shouldRestartMain() {
@@ -179,7 +159,6 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
         super.onCreate(savedInstanceState)
         animate = Prefs.animate
         themeExterior(false)
-        onCreateBilling()
     }
 
     fun themeExterior(animate: Boolean = true) {
@@ -222,9 +201,4 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() {
     fun setFrostResult(flag: Int) {
         resultFlag = resultFlag or flag
     }
-
-    override fun onDestroy() {
-        onDestroyBilling()
-        super.onDestroy()
-    }
 }
\ No newline at end of file