Replace custom 'OpenInNew' icon with vector resource

irfano · irfano · commit a1e542ea5d20 · 2025-12-10T15:27:03.000+03:00
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/icons/OpenInNew.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/icons/OpenInNew.kt
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/PrivacySettingsPoliciesScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/PrivacySettingsPoliciesScreen.kt
@@ -8,10 +8,12 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
-import com.woocommerce.android.ui.icons.OpenInNew
 
 @Composable
 fun PrivacySettingsPolicesScreen(
@@ -32,7 +34,7 @@ fun PrivacySettingsPolicesScreen(
                     onClick = onPrivacyPolicyClicked
                 ) {
                     Icon(
-                        imageVector = OpenInNew,
+                        imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),
                         contentDescription = stringResource(id = R.string.settings_privacy_policy)
                     )
                 }
@@ -47,11 +49,20 @@ fun PrivacySettingsPolicesScreen(
                     onClick = onCookiePolicyClicked
                 ) {
                     Icon(
-                        imageVector = OpenInNew,
+                        imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),
                         contentDescription = stringResource(id = R.string.settings_privacy_cookies_polices)
                     )
                 }
             }
         }
     }
 }
+
+@Preview
+@Composable
+fun PrivacySettingsPolicesScreenPreview() {
+    PrivacySettingsPolicesScreen(
+        onPrivacyPolicyClicked = {},
+        onCookiePolicyClicked = {}
+    )
+}
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/PrivacySettingsScreen.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/PrivacySettingsScreen.kt
@@ -30,15 +30,16 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground
-import com.woocommerce.android.ui.icons.OpenInNew
 
 @Composable
 fun PrivacySettingsScreen(
@@ -126,7 +127,7 @@ fun PrivacySettingsScreen(
                             onClick = onAdvertisingOptionsClicked
                         ) {
                             Icon(
-                                imageVector = OpenInNew,
+                                imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),
                                 contentDescription = stringResource(id = R.string.settings_web_options)
                             )
                         }
@@ -141,7 +142,7 @@ fun PrivacySettingsScreen(
                             onClick = onUsageTrackerClicked,
                         ) {
                             Icon(
-                                imageVector = OpenInNew,
+                                imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),
                                 contentDescription = stringResource(id = R.string.settings_usage_tracking)
                             )
                         }

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@ import androidx.compose.material.MaterialTheme`
`8`	`8`	`import androidx.compose.material.Scaffold`
`9`	`9`	`import androidx.compose.runtime.Composable`
`10`	`10`	`import androidx.compose.ui.Modifier`
	`11`	`+import androidx.compose.ui.graphics.vector.ImageVector`
`11`	`12`	`import androidx.compose.ui.res.stringResource`
	`13`	`+import androidx.compose.ui.res.vectorResource`
	`14`	`+import androidx.compose.ui.tooling.preview.Preview`
`12`	`15`	`import androidx.compose.ui.unit.dp`
`13`	`16`	`import com.woocommerce.android.R`
`14`		`-import com.woocommerce.android.ui.icons.OpenInNew`
`15`	`17`
`16`	`18`	`@Composable`
`17`	`19`	`fun PrivacySettingsPolicesScreen(`
`@@ -32,7 +34,7 @@ fun PrivacySettingsPolicesScreen(`
`32`	`34`	`onClick = onPrivacyPolicyClicked`
`33`	`35`	`) {`
`34`	`36`	`Icon(`
`35`		`- imageVector = OpenInNew,`
	`37`	`+ imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),`
`36`	`38`	`contentDescription = stringResource(id = R.string.settings_privacy_policy)`
`37`	`39`	`)`
`38`	`40`	`}`
`@@ -47,11 +49,20 @@ fun PrivacySettingsPolicesScreen(`
`47`	`49`	`onClick = onCookiePolicyClicked`
`48`	`50`	`) {`
`49`	`51`	`Icon(`
`50`		`- imageVector = OpenInNew,`
	`52`	`+ imageVector = ImageVector.vectorResource(R.drawable.ic_open_in_new_24dp),`
`51`	`53`	`contentDescription = stringResource(id = R.string.settings_privacy_cookies_polices)`
`52`	`54`	`)`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`}`
	`60`	`+`
	`61`	`+@Preview`
	`62`	`+@Composable`
	`63`	`+fun PrivacySettingsPolicesScreenPreview() {`
	`64`	`+ PrivacySettingsPolicesScreen(`
	`65`	`+ onPrivacyPolicyClicked = {},`
	`66`	`+ onCookiePolicyClicked = {}`
	`67`	`+ )`
	`68`	`+}`