Merge pull request #159 from NordicSemiconductor/improvements/full-screen-warning-views

Make warning screens fill max size

Author: philips77

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

@@ -36,7 +36,7 @@ import android.content.Context
 import android.content.Intent
 import android.provider.Settings
 import android.util.Log
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
@@ -61,7 +61,7 @@ import no.nordicsemi.android.common.ui.view.WarningView
 internal fun ScanEmptyView(locationRequiredAndDisabled: Boolean) {
     WarningView(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(16.dp),
         painterResource = painterResource(R.drawable.outline_bluetooth_searching_24),
         title = stringResource(id = R.string.scan_empty_title),

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

@@ -31,6 +31,7 @@
 
 package no.nordicsemi.android.common.scanner.view
 
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
@@ -49,7 +50,7 @@ internal fun ScanErrorView(
     val message = error ?: "Unknown reason"
     WarningView(
         modifier = Modifier
-            .fillMaxWidth()
+            .fillMaxSize()
             .padding(16.dp),
         painterResource = painterResource(R.drawable.outline_bluetooth_searching_24),
         title = stringResource(id = R.string.scan_failed_title),

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

@@ -158,34 +158,23 @@ internal fun ScannerContent(
     onClick: (ScanResult) -> Unit,
     deviceItem: @Composable (ScanResult) -> Unit,
 ) {
-    LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        contentPadding = WindowInsets.displayCutout
-            .only(WindowInsetsSides.Horizontal)
-            .union(WindowInsets(left = 8.dp, right = 8.dp, top = 8.dp, bottom = 8.dp))
-            .asPaddingValues()
-    ) {
-        when (uiState.scanningState) {
-            is ScanningState.Loading -> item {
-                ScanEmptyView(
-                    locationRequiredAndDisabled = isLocationRequiredAndDisabled,
-                )
-            }
+    when (uiState.scanningState) {
+        is ScanningState.Loading ->
+            ScanEmptyView(locationRequiredAndDisabled = isLocationRequiredAndDisabled)
 
-            is ScanningState.Error -> item {
-                ScanErrorView(
-                    error = uiState.scanningState.error
-                )
-            }
+        is ScanningState.Error -> ScanErrorView(error = uiState.scanningState.error)
 
-            is ScanningState.DevicesDiscovered -> {
-                if (uiState.scanningState.result.isEmpty()) {
-                    item {
-                        ScanEmptyView(
-                            locationRequiredAndDisabled = isLocationRequiredAndDisabled
-                        )
-                    }
-                } else {
+        is ScanningState.DevicesDiscovered -> {
+            if (uiState.scanningState.result.isEmpty()) {
+                ScanEmptyView(locationRequiredAndDisabled = isLocationRequiredAndDisabled)
+            } else {
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize(),
+                    contentPadding = WindowInsets.displayCutout
+                        .only(WindowInsetsSides.Horizontal)
+                        .union(WindowInsets(left = 8.dp, right = 8.dp, top = 8.dp, bottom = 8.dp))
+                        .asPaddingValues()
+                ) {
                     DeviceListItems(
                         devices = uiState.scanningState.result,
                         onScanResultSelected = onClick,
@@ -227,7 +216,7 @@ internal fun DeviceListItem(
     DeviceListItem(
         peripheralIcon = peripheralIcon?.let { painterResource(it) },
         title = result.advertisingData.name ?: result.peripheral.name
-            ?: stringResource(R.string.no_name),
+        ?: stringResource(R.string.no_name),
         subtitle = result.peripheral.address,
         trailingContent = {
             // Show RSSI if available
@@ -242,7 +231,7 @@ fun DeviceListItem(
     peripheralIcon: Painter?,
     title: String,
     subtitle: String,
-    trailingContent: @Composable () -> Unit = { }
+    trailingContent: @Composable () -> Unit = { },
 ) {
     Row(
         modifier = Modifier