refactor: share hw wallet icon

Author: ovitrif

app/src/main/java/to/bitkit/ui/components/HwWalletComponents.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -14,6 +15,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
+import to.bitkit.models.TransportType
+import to.bitkit.ui.theme.Colors
 
 // Device illustration proportions, taken from the Figma hardware wallet frames.
 private const val HW_DEVICE_IMAGE_SIZE_RATIO = 256f / 375f
@@ -35,6 +38,26 @@ fun HwDeviceIllustrations(modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+fun HwWalletConnectionIcon(
+    transportType: TransportType,
+    isConnected: Boolean,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
+    Icon(
+        painter = painterResource(
+            id = when (transportType) {
+                TransportType.BLUETOOTH -> R.drawable.ic_bluetooth_connected
+                TransportType.USB -> R.drawable.ic_usb_connected
+            }
+        ),
+        contentDescription = contentDescription,
+        tint = if (isConnected) Colors.Green else Colors.Gray1,
+        modifier = modifier
+    )
+}
+
 @Composable
 private fun BoxWithConstraintsScope.TrezorImage(
     imageSize: Dp,

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -137,6 +137,7 @@ import to.bitkit.ui.components.FillHeight
 import to.bitkit.ui.components.FillWidth
 import to.bitkit.ui.components.Headline24
 import to.bitkit.ui.components.HorizontalSpacer
+import to.bitkit.ui.components.HwWalletConnectionIcon
 import to.bitkit.ui.components.PubkyImage
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.StatusBarSpacer
@@ -779,15 +780,9 @@ private fun RowScope.HwDeviceCell(
             .testTag("ActivityHardware")
     ) {
         HorizontalSpacer(4.dp)
-        Icon(
-            painter = painterResource(
-                id = when (wallet.transportType) {
-                    TransportType.BLUETOOTH -> R.drawable.ic_bluetooth_connected
-                    TransportType.USB -> R.drawable.ic_usb_connected
-                }
-            ),
-            contentDescription = null,
-            tint = if (wallet.isConnected) Colors.Green else Colors.Gray1,
+        HwWalletConnectionIcon(
+            transportType = wallet.transportType,
+            isConnected = wallet.isConnected,
             modifier = Modifier.size(16.dp)
         )
     }

app/src/main/java/to/bitkit/ui/settings/general/HardwareWalletsSettingsScreen.kt

@@ -40,6 +40,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.HorizontalSpacer
 import to.bitkit.ui.components.HwDeviceIllustrations
+import to.bitkit.ui.components.HwWalletConnectionIcon
 import to.bitkit.ui.components.MoneySSB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
@@ -237,15 +238,10 @@ private fun HwConnectionBadge(
             .clip(CircleShape)
             .background(if (isConnected) Colors.Green16 else Colors.White16)
     ) {
-        Icon(
-            painter = painterResource(
-                id = when (transportType) {
-                    TransportType.BLUETOOTH -> R.drawable.ic_bluetooth_connected
-                    TransportType.USB -> R.drawable.ic_usb_connected
-                }
-            ),
+        HwWalletConnectionIcon(
+            transportType = transportType,
+            isConnected = isConnected,
             contentDescription = contentDescription,
-            tint = if (isConnected) Colors.Green else Colors.White64,
             modifier = Modifier.size(16.dp)
         )
     }