Merge pull request #162 from NordicSemiconductor/migration/dependencies

philips77 · web-flow · commit ba49ec6eec7c · 2025-12-09T15:02:05.000+01:00
Migration to AGP 2.12, minSdk increased to 23
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/MainActivity.kt b/app/src/main/java/no/nordicsemi/android/common/test/MainActivity.kt
@@ -83,7 +83,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt b/app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt
@@ -61,7 +61,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/simple/Hello.kt b/app/src/main/java/no/nordicsemi/android/common/test/simple/Hello.kt
@@ -57,7 +57,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.navigation.createDestination
 import no.nordicsemi.android.common.navigation.defineDestination
 import no.nordicsemi.android.common.navigation.defineDialogDestination
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/simple/ScannerDestination.kt b/app/src/main/java/no/nordicsemi/android/common/test/simple/ScannerDestination.kt
@@ -31,18 +31,15 @@
 
 package no.nordicsemi.android.common.test.simple
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MonitorHeart
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.navigation.createDestination
 import no.nordicsemi.android.common.navigation.defineDestination
 import no.nordicsemi.android.common.navigation.viewmodel.SimpleNavigationViewModel
 import no.nordicsemi.android.common.scanner.data.CustomFilter
 import no.nordicsemi.android.common.scanner.data.OnlyNearby
 import no.nordicsemi.android.common.scanner.data.OnlyWithNames
-import no.nordicsemi.android.common.scanner.data.WithServiceUuid
 import no.nordicsemi.android.common.scanner.rememberFilterState
 import no.nordicsemi.android.common.scanner.view.FilterDialog
 import no.nordicsemi.android.common.scanner.view.ScannerView
diff --git a/app/src/main/java/no/nordicsemi/android/common/test/tab/Second.kt b/app/src/main/java/no/nordicsemi/android/common/test/tab/Second.kt
@@ -42,7 +42,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.navigation.createSimpleDestination
 import no.nordicsemi.android.common.navigation.defineDestination
 import no.nordicsemi.android.common.navigation.viewmodel.SimpleNavigationViewModel
diff --git a/navigation/src/main/java/no/nordicsemi/android/common/navigation/NavigationView.kt b/navigation/src/main/java/no/nordicsemi/android/common/navigation/NavigationView.kt
@@ -44,7 +44,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavGraph.Companion.findStartDestination
diff --git a/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/RequireBluetooth.kt b/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/RequireBluetooth.kt
@@ -35,7 +35,7 @@ import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.ble.util.BlePermissionState
 import no.nordicsemi.android.common.permissions.ble.view.BluetoothDisabledView
diff --git a/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/RequireLocation.kt b/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/RequireLocation.kt
@@ -34,7 +34,7 @@ package no.nordicsemi.android.common.permissions.ble
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.ble.util.BlePermissionState
 import no.nordicsemi.android.common.permissions.ble.view.LocationPermissionRequiredView
diff --git a/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/view/BluetoothPermissionRequiredView.kt b/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/view/BluetoothPermissionRequiredView.kt
@@ -54,7 +54,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.permissions.ble.R
 import no.nordicsemi.android.common.permissions.ble.viewmodel.PermissionViewModel
 import no.nordicsemi.android.common.ui.view.WarningView
diff --git a/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/view/LocationPermissionRequiredView.kt b/permissions-ble/src/main/java/no/nordicsemi/android/common/permissions/ble/view/LocationPermissionRequiredView.kt
@@ -54,7 +54,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.permissions.ble.R
 import no.nordicsemi.android.common.permissions.ble.viewmodel.PermissionViewModel
 import no.nordicsemi.android.common.ui.view.WarningView
diff --git a/permissions-internet/src/main/java/no/nordicsemi/android/common/permissions/internet/RequireInternet.kt b/permissions-internet/src/main/java/no/nordicsemi/android/common/permissions/internet/RequireInternet.kt
@@ -36,7 +36,7 @@ package no.nordicsemi.android.common.permissions.internet
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.internet.util.InternetPermissionState
 import no.nordicsemi.android.common.permissions.internet.view.InternetNotAvailableView
diff --git a/permissions-nfc/src/main/java/no/nordicsemi/android/common/permissions/nfc/RequireNfc.kt b/permissions-nfc/src/main/java/no/nordicsemi/android/common/permissions/nfc/RequireNfc.kt
@@ -36,7 +36,7 @@ package no.nordicsemi.android.common.permissions.nfc
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.nfc.utils.NfcPermissionState
 import no.nordicsemi.android.common.permissions.nfc.view.NfcDisabledView
diff --git a/permissions-notification/src/main/java/no/nordicsemi/android/common/permissions/notification/view/NotificationPermissionRequestView.kt b/permissions-notification/src/main/java/no/nordicsemi/android/common/permissions/notification/view/NotificationPermissionRequestView.kt
@@ -46,7 +46,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import no.nordicsemi.android.common.permissions.notification.viewmodel.NotificationPermissionViewModel
 
diff --git a/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/RequireLocationForWiFi.kt b/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/RequireLocationForWiFi.kt
@@ -36,7 +36,7 @@ package no.nordicsemi.android.common.permissions.wifi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.wifi.utils.WiFiPermissionState
 import no.nordicsemi.android.common.permissions.wifi.view.LocationDisabledView
diff --git a/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/RequireWiFi.kt b/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/RequireWiFi.kt
@@ -37,7 +37,7 @@ import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import no.nordicsemi.android.common.permissions.wifi.utils.WiFiPermissionState
 import no.nordicsemi.android.common.permissions.wifi.view.WiFiDisabledView
diff --git a/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/view/LocationPermissionRequiredView.kt b/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/view/LocationPermissionRequiredView.kt
@@ -52,7 +52,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.permissions.wifi.R
 import no.nordicsemi.android.common.permissions.wifi.viewmodel.PermissionViewModel
 import no.nordicsemi.android.common.ui.view.WarningView
diff --git a/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/view/WiFiPermissionRequiredView.kt b/permissions-wifi/src/main/java/no/nordicsemi/android/common/permissions/wifi/view/WiFiPermissionRequiredView.kt
@@ -53,7 +53,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import no.nordicsemi.android.common.permissions.wifi.R
 import no.nordicsemi.android.common.permissions.wifi.viewmodel.PermissionViewModel
 import no.nordicsemi.android.common.ui.view.WarningView
diff --git a/scanner-ble/src/main/java/no/nordicsemi/android/common/scanner/view/ScannerView.kt b/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
@@ -74,7 +70,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.launch
 import no.nordicsemi.android.common.permissions.ble.RequireBluetooth
@@ -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)),
diff --git a/settings.gradle.kts b/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.11")
+            from("no.nordicsemi.android.gradle:version-catalog:2.12-1")
         }
         // Fixed versions for Nordic libraries.
         create("nordic") {
diff --git a/theme/src/main/res/drawable/ic_signal_max.xml b/theme/src/main/res/drawable/ic_signal_max.xml
diff --git a/theme/src/main/res/drawable/ic_signal_medium.xml b/theme/src/main/res/drawable/ic_signal_medium.xml
diff --git a/theme/src/main/res/drawable/ic_signal_min.xml b/theme/src/main/res/drawable/ic_signal_min.xml
diff --git a/ui/src/main/java/no/nordicsemi/android/common/ui/view/CircularIcon.kt b/ui/src/main/java/no/nordicsemi/android/common/ui/view/CircularIcon.kt
diff --git a/ui/src/main/java/no/nordicsemi/android/common/ui/view/RssiIcon.kt b/ui/src/main/java/no/nordicsemi/android/common/ui/view/RssiIcon.kt
diff --git a/ui/src/main/res/values-night/colors.xml b/ui/src/main/res/values-night/colors.xml
diff --git a/ui/src/main/res/values/colors.xml b/ui/src/main/res/values/colors.xml
