From a2c63c59c5910cb5df180dbda4d681079cba2959 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Fri, 20 Oct 2023 17:38:33 +0200 Subject: [PATCH] Hide buy on playstore, margins on captcha button --- .../fragment/mainactivity/main/BuyFragment.kt | 10 +++++++--- .../mainactivity/main/SourceDetailFragment.kt | 12 ++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt index 5eecc4a5..db93fce9 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/BuyFragment.kt @@ -10,6 +10,7 @@ import android.widget.TextView import androidx.lifecycle.lifecycleScope import com.futo.futopay.PaymentConfigurations import com.futo.futopay.PaymentManager +import com.futo.platformplayer.BuildConfig import com.futo.platformplayer.R import com.futo.platformplayer.UIDialogs import com.futo.platformplayer.logging.Logger @@ -68,9 +69,12 @@ class BuyFragment : MainFragment() { } } - _buttonBuy.setOnClickListener { - buy(); - } + if(!BuildConfig.IS_PLAYSTORE_BUILD) + _buttonBuy.setOnClickListener { + buy(); + } + else + _buttonBuy.visibility = View.GONE; _buttonPaid.setOnClickListener { paid(); } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt index 50fbe05d..8c9604aa 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt @@ -263,10 +263,18 @@ class SourceDetailFragment : MainFragment() { BigButtonGroup(c, "Management", BigButton(c, "Uninstall", "Removes the plugin from the app", R.drawable.ic_block) { uninstallSource(); - }.withBackground(R.drawable.background_big_button_red), + }.withBackground(R.drawable.background_big_button_red).apply { + this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { + setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0); + }; + }, if(clientIfExists?.captchaEncrypted != null) - BigButton(c, "Delete Captcha", "Deletes captcha for this plugin", R.drawable.ic_block) { + BigButton(c, "Delete Captcha", "Deletes stored captcha answer for this plugin", R.drawable.ic_block) { clientIfExists?.updateCaptcha(null); + }.apply { + this.layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { + setMargins(0, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics).toInt(), 0, 0); + }; }.withBackground(R.drawable.background_big_button_red) else null )