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 6fca4178..44c2ca2d 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.futopay.formatMoney import com.futo.platformplayer.BuildConfig import com.futo.platformplayer.R import com.futo.platformplayer.UIDialogs @@ -94,9 +95,8 @@ class BuyFragment : MainFragment() { if(currency != null && prices.containsKey(currency.id)) { val price = prices[currency.id]!!; - val priceDecimal = (price.toDouble() / 100); withContext(Dispatchers.Main) { - _buttonBuyText.text = currency.symbol + String.format("%.2f", priceDecimal) + context.getString(R.string.plus_tax); + _buttonBuyText.text = formatMoney(country.id, currency.id, price) + context.getString(R.string.plus_tax); } } } diff --git a/app/src/stable/assets/sources/bilibili b/app/src/stable/assets/sources/bilibili index 5809463f..9dedbca4 160000 --- a/app/src/stable/assets/sources/bilibili +++ b/app/src/stable/assets/sources/bilibili @@ -1 +1 @@ -Subproject commit 5809463f3dc2fd81fb92740ede467e271b5ca0c3 +Subproject commit 9dedbca4f27cfca2e2a146d6edb6a9bae7541d67 diff --git a/app/src/stable/assets/sources/nebula b/app/src/stable/assets/sources/nebula index ed6e7fe3..9e6dcf09 160000 --- a/app/src/stable/assets/sources/nebula +++ b/app/src/stable/assets/sources/nebula @@ -1 +1 @@ -Subproject commit ed6e7fe340f2b90c3f9ad35993c5b0bf89593c29 +Subproject commit 9e6dcf093538511eac56dc44a32b99139f1f1005 diff --git a/app/src/stable/assets/sources/odysee b/app/src/stable/assets/sources/odysee index b8ceab3e..59774ac0 160000 --- a/app/src/stable/assets/sources/odysee +++ b/app/src/stable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit b8ceab3e572be982171ceac09be7a7ad7878b8e8 +Subproject commit 59774ac08406e29f1408cb461caa5b79c805c6e1 diff --git a/app/src/stable/assets/sources/spotify b/app/src/stable/assets/sources/spotify index b94d5a50..1ccd471c 160000 --- a/app/src/stable/assets/sources/spotify +++ b/app/src/stable/assets/sources/spotify @@ -1 +1 @@ -Subproject commit b94d5a5091ae0929d82c703868616158607a4436 +Subproject commit 1ccd471cf4a6ef505983bc6ff4dd300624933fdd diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index 95ae01d5..41e91634 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 95ae01d5358328583fc3a3b59a2a0ca9d06301d2 +Subproject commit 41e91634965b0236c4e5ed9044da301dd3fd8c97 diff --git a/app/src/unstable/assets/sources/bilibili b/app/src/unstable/assets/sources/bilibili index 5809463f..9dedbca4 160000 --- a/app/src/unstable/assets/sources/bilibili +++ b/app/src/unstable/assets/sources/bilibili @@ -1 +1 @@ -Subproject commit 5809463f3dc2fd81fb92740ede467e271b5ca0c3 +Subproject commit 9dedbca4f27cfca2e2a146d6edb6a9bae7541d67 diff --git a/app/src/unstable/assets/sources/nebula b/app/src/unstable/assets/sources/nebula index ed6e7fe3..9e6dcf09 160000 --- a/app/src/unstable/assets/sources/nebula +++ b/app/src/unstable/assets/sources/nebula @@ -1 +1 @@ -Subproject commit ed6e7fe340f2b90c3f9ad35993c5b0bf89593c29 +Subproject commit 9e6dcf093538511eac56dc44a32b99139f1f1005 diff --git a/app/src/unstable/assets/sources/odysee b/app/src/unstable/assets/sources/odysee index b8ceab3e..59774ac0 160000 --- a/app/src/unstable/assets/sources/odysee +++ b/app/src/unstable/assets/sources/odysee @@ -1 +1 @@ -Subproject commit b8ceab3e572be982171ceac09be7a7ad7878b8e8 +Subproject commit 59774ac08406e29f1408cb461caa5b79c805c6e1 diff --git a/app/src/unstable/assets/sources/spotify b/app/src/unstable/assets/sources/spotify index b94d5a50..1ccd471c 160000 --- a/app/src/unstable/assets/sources/spotify +++ b/app/src/unstable/assets/sources/spotify @@ -1 +1 @@ -Subproject commit b94d5a5091ae0929d82c703868616158607a4436 +Subproject commit 1ccd471cf4a6ef505983bc6ff4dd300624933fdd diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 95ae01d5..41e91634 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 95ae01d5358328583fc3a3b59a2a0ca9d06301d2 +Subproject commit 41e91634965b0236c4e5ed9044da301dd3fd8c97 diff --git a/dep/futopay b/dep/futopay index c8992e6a..c3f532c6 160000 --- a/dep/futopay +++ b/dep/futopay @@ -1 +1 @@ -Subproject commit c8992e6a0ef462d11dfaf716ebe1caf46c926611 +Subproject commit c3f532c660527ae579c1dff0d2f9f4d8ea4d3173