Merge branch 'incorrect-in-app-purchase-icon-droid-2035'

2 files changed, 0 insertions, 31 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
index b71079be67..87b196e990 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.compose.component
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
@@ -23,7 +22,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -189,22 +187,6 @@ private fun PaymentAvailable(
                                 error("ProductId ${product.productId.value} is not supported")
                             }
                         },
-                    endIcon = {
-                        Image(
-                            painter =
-                                painterResource(
-                                    R.drawable.google_pay_primary_logo_logo_svgrepo_com
-                                ),
-                            contentDescription = null,
-                            modifier =
-                                Modifier.height(Dimens.payIconHeight)
-                                    .background(
-                                        MaterialTheme.colorScheme.onSurface,
-                                        MaterialTheme.shapes.extraLarge,
-                                    )
-                                    .padding(all = Dimens.miniPadding),
-                        )
-                    },
                     onClick = { onPurchaseBillingProductClick(product.productId) },
                     enabled = enabled,
                 )
diff --git a/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml b/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml
deleted file mode 100644
index eff207b6d4..0000000000
--- a/android/lib/resource/src/main/res/drawable/google_pay_primary_logo_logo_svgrepo_com.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="79dp" android:viewportHeight="948" android:viewportWidth="2387.3" android:width="200dp">
-
-    <path android:fillColor="#5F6368" android:pathData="M1129.1,463.2V741h-88.2V54.8h233.8c56.4,-1.2 110.9,20.2 151.4,59.4c41,36.9 64.1,89.7 63.2,144.8c1.2,55.5 -21.9,108.7 -63.2,145.7c-40.9,39 -91.4,58.5 -151.4,58.4L1129.1,463.2L1129.1,463.2zM1129.1,139.3v239.6h147.8c32.8,1 64.4,-11.9 87.2,-35.5c46.3,-45 47.4,-119.1 2.3,-165.4c-0.8,-0.8 -1.5,-1.6 -2.3,-2.3c-22.5,-24.1 -54.3,-37.3 -87.2,-36.4L1129.1,139.3L1129.1,139.3zM1692.5,256.2c65.2,0 116.6,17.4 154.3,52.2c37.7,34.8 56.5,82.6 56.5,143.2V741H1819v-65.2h-3.8c-36.5,53.7 -85.1,80.5 -145.7,80.5c-51.7,0 -95,-15.3 -129.8,-46c-33.8,-28.5 -53,-70.7 -52.2,-115c0,-48.6 18.4,-87.2 55.1,-115.9c36.7,-28.7 85.7,-43.1 147.1,-43.1c52.3,0 95.5,9.6 129.3,28.7v-20.2c0.2,-30.2 -13.2,-58.8 -36.4,-78c-23.3,-21 -53.7,-32.5 -85.1,-32.1c-49.2,0 -88.2,20.8 -116.9,62.3l-77.6,-48.9C1545.6,286.8 1608.8,256.2 1692.5,256.2L1692.5,256.2zM1578.4,597.3c-0.1,22.8 10.8,44.2 29.2,57.5c19.5,15.3 43.7,23.5 68.5,23c37.2,-0.1 72.9,-14.9 99.2,-41.2c29.2,-27.5 43.8,-59.7 43.8,-96.8c-27.5,-21.9 -65.8,-32.9 -115,-32.9c-35.8,0 -65.7,8.6 -89.6,25.9C1590.4,550.4 1578.4,571.7 1578.4,597.3L1578.4,597.3zM2387.3,271.5L2093,948h-91l109.2,-236.7l-193.6,-439.8h95.8l139.9,337.3h1.9l136.1,-337.3L2387.3,271.5z"/>
-
-    <path android:fillColor="#4285F4" android:pathData="M772.8,403.2c0,-26.9 -2.2,-53.7 -6.8,-80.2H394.2v151.8h212.9c-8.8,49 -37.2,92.3 -78.7,119.8v98.6h127.1C729.9,624.7 772.8,523.2 772.8,403.2L772.8,403.2z"/>
-
-    <path android:fillColor="#34A853" android:pathData="M394.2,788.5c106.4,0 196,-34.9 261.3,-95.2l-127.1,-98.6c-35.4,24 -80.9,37.7 -134.2,37.7c-102.8,0 -190.1,-69.3 -221.3,-162.7H42v101.6C108.9,704.5 245.2,788.5 394.2,788.5z"/>
-
-    <path android:fillColor="#FBBC04" android:pathData="M172.9,469.7c-16.5,-48.9 -16.5,-102 0,-150.9V217.2H42c-56,111.4 -56,242.7 0,354.1L172.9,469.7z"/>
-
-    <path android:fillColor="#EA4335" android:pathData="M394.2,156.1c56.2,-0.9 110.5,20.3 151.2,59.1L658,102.7C586.6,35.7 492.1,-1.1 394.2,0C245.2,0 108.9,84.1 42,217.2l130.9,101.6C204.1,225.4 291.4,156.1 394.2,156.1z"/>
-
-</vector>