Migration to AGP 2.12-1 and some other improvements

Author: philips77

scanner-ble/src/main/java/no/nordicsemi/android/common/scanner/view/ScannerView.kt

@@ -38,22 +38,19 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.only
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Text
@@ -65,7 +62,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.painter.Painter
@@ -227,7 +223,7 @@ internal fun DeviceListItem(
         ?: R.drawable.outline_bluetooth_24,
 ) {
     DeviceListItem(
-        peripheralIcon = peripheralIcon?.let { painterResource(it) },
+        iconPainter = peripheralIcon?.let { painterResource(it) },
         title = result.advertisingData.name ?: result.peripheral.name
         ?: stringResource(R.string.no_name),
         subtitle = result.peripheral.address,
@@ -241,51 +237,63 @@ internal fun DeviceListItem(
 @OptIn(ExperimentalUuidApi::class)
 @Composable
 fun DeviceListItem(
-    peripheralIcon: Painter?,
+    iconPainter: Painter?,
     title: String,
     subtitle: String,
+    modifier: Modifier = Modifier,
     trailingContent: @Composable () -> Unit = { },
 ) {
-    OutlinedCard {
-        Row(
-            modifier = Modifier
-                .heightIn(min = 80.dp)
-                .padding(all = 16.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(16.dp)
-        ) {
-            peripheralIcon?.let {
-                CircularIcon(
-                    painter = it,
-                )
-            }
-            Column(
-                verticalArrangement = Arrangement.spacedBy(4.dp),
-                modifier = Modifier.weight(1.0f)
-            ) {
-                Text(
-                    text = title,
-                    color = MaterialTheme.colorScheme.onSurface,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                    style = MaterialTheme.typography.titleMedium,
-                )
-                Text(
-                    text = subtitle,
-                    style = MaterialTheme.typography.bodyMedium,
-                    maxLines = 1,
-                )
-            }
-            trailingContent()
-        }
+    DeviceListItem(
+        modifier = modifier,
+        iconPainter = iconPainter,
+        headlineContent = {
+            Text(
+                text = title,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
+        supportingContent = {
+            Text(
+                text = subtitle,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        },
+        trailingContent = trailingContent
+    )
+}
+
+@OptIn(ExperimentalUuidApi::class)
+@Composable
+fun DeviceListItem(
+    iconPainter: Painter?,
+    headlineContent: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
+    overlineContent: @Composable () -> Unit = {},
+    supportingContent: @Composable () -> Unit = {},
+    trailingContent: @Composable () -> Unit = {},
+) {
+    OutlinedCard(modifier) {
+        ListItem(
+            headlineContent = headlineContent,
+            overlineContent = overlineContent,
+            supportingContent = supportingContent,
+            leadingContent = {
+                iconPainter?.let {
+                    CircularIcon(painter = it)
+                }
+            },
+            trailingContent = trailingContent,
+        )
     }
 }
 
 @Preview
 @Composable
 private fun DeviceListItemPreview() {
     DeviceListItem(
-        peripheralIcon = painterResource(R.drawable.outline_bluetooth_24),
+        iconPainter = painterResource(R.drawable.outline_bluetooth_24),
         title = "Nordic HRM",
         subtitle = "12:34:56:78:9A:BC",
         trailingContent = {
@@ -354,7 +362,7 @@ private fun ScannerContentPreview() {
                             peripheral = PreviewPeripheral(
                                 scope = scope,
                                 name = "A device with a very long name",
-                                address = "00:11:22:33:44:55",
+                                address = "00000000-1234-1234-5678-1234567890AB",
                             ),
                             isConnectable = true,
                             advertisingData = AdvertisingData(raw = byteArrayOf(0x02, 0x01, 0x06)),

settings.gradle.kts

@@ -68,7 +68,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         // Use Nordic Gradle Version Catalog with common external libraries versions.
         create("libs") {
-            from("no.nordicsemi.android.gradle:version-catalog:2.12")
+            from("no.nordicsemi.android.gradle:version-catalog:2.12-1")
         }
         // Fixed versions for Nordic libraries.
         create("nordic") {

theme/src/main/res/drawable/ic_signal_max.xml

@@ -69,7 +69,7 @@ fun CircularIcon(
     modifier: Modifier = Modifier,
     backgroundColor: Color = MaterialTheme.colorScheme.secondary,
     enabled: Boolean = true,
-    size: Dp = 36.dp,
+    size: Dp = 40.dp,
     iconSize: Dp = 24.dp,
 ) {
     val padding = (size - iconSize) / 2

theme/src/main/res/drawable/ic_signal_medium.xml

@@ -36,10 +36,12 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -62,25 +64,24 @@ fun RssiIcon(rssi: Int) {
     ) {
         Image(
             painter = painterResource(id = getImageRes(rssi)),
-            contentDescription = null
+            contentDescription = null,
+            modifier = Modifier.size(24.dp),
         )
         Text(
             text = stringResource(id = R.string.dbm, rssi),
-            style = MaterialTheme.typography.labelSmall
+            style = MaterialTheme.typography.bodySmall
         )
     }
 }
 
 @DrawableRes
-private fun getImageRes(rssi: Int): Int {
-    return when {
-        rssi < MEDIUM_RSSI -> R.drawable.ic_signal_min
-        rssi < MAX_RSSI -> R.drawable.ic_signal_medium
-        else -> R.drawable.ic_signal_max
-    }
+private fun getImageRes(rssi: Int): Int = when {
+    rssi < MEDIUM_RSSI -> R.drawable.ic_signal_min
+    rssi < MAX_RSSI -> R.drawable.ic_signal_medium
+    else -> R.drawable.ic_signal_max
 }
 
-@Preview(showBackground = true, widthDp = 500)
+@Preview(showBackground = true, widthDp = 520)
 @Composable
 private fun RssiIconPreview() {
     MaterialTheme {

theme/src/main/res/drawable/ic_signal_min.xml

@@ -33,9 +33,9 @@
 <resources>
 
     <color name="appBarColor">#333f48</color>
-    <color name="colorError">#FFB4A9</color>
+    <!--<color name="colorError">#FFB4A9</color>
     <color name="colorWarning">#F58220</color>
-    <color name="colorSuccess">#00A651</color>
+    <color name="colorSuccess">#00A651</color>-->
     <color name="colorNeutral">#899296</color>
     <color name="colorNordicLogo">@android:color/white</color>
     <color name="colorNordicLogoText">@android:color/white</color>

ui/src/main/java/no/nordicsemi/android/common/ui/view/CircularIcon.kt

@@ -34,8 +34,8 @@
 
     <color name="appBarColor">#00A9CE</color>
     <color name="colorError">#BA1B1B</color>
-    <color name="colorWarning">#F58220</color>
-    <color name="colorSuccess">#00A651</color>
+    <color name="colorWarning">#f1750b</color>
+    <color name="colorSuccess">#008d45</color>
     <color name="colorNeutral">#70787C</color>
     <color name="colorNordicLogo">#00A9CE</color>
     <color name="colorNordicLogoText">@android:color/black</color>