Use cross instead of back icon and make top bar more flexible

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionScreen.kt

@@ -93,7 +93,7 @@ internal fun LocationForSecureConnectionScreen(
 ) {
     Scaffold(
         modifier = modifier,
-        topBar = { HATopBar(onBackClick = onBackClick, onHelpClick = onHelpClick) },
+        topBar = { HATopBar(onHelpClick = onHelpClick, onCloseClick = onBackClick) },
         contentWindowInsets = WindowInsets.safeDrawing,
     ) { contentPadding ->
         LocationForSecureConnectionContent(

app/src/main/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionViewModel.kt

@@ -38,7 +38,7 @@ class LocationForSecureConnectionViewModel @VisibleForTesting constructor(
     fun allowInsecureConnection(allowInsecureConnection: Boolean) {
         viewModelScope.launch {
             try {
-                serverManager.integrationRepository(serverId).setAllowInsecureConnection(allowInsecureConnection)
+                // serverManager.integrationRepository(serverId).setAllowInsecureConnection(allowInsecureConnection)
             } catch (e: Exception) {
                 Timber.e(
                     e,

app/src/screenshotTest/kotlin/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionScreenshotTest.kt

@@ -20,6 +20,21 @@ class LocationForSecureConnectionScreenshotTest {
         }
     }
 
+    @PreviewTest
+    @HAPreviews
+    @Composable
+    fun `LocationForSecureConnection with back navigation`() {
+        HAThemeForPreview {
+            LocationForSecureConnectionScreen(
+                onAllowInsecureConnection = { _ -> },
+                onHelpClick = {},
+                onBackClick = {},
+                onShowSnackbar = { _, _ -> true },
+                initialAllowInsecureConnection = null,
+            )
+        }
+    }
+
     @PreviewTest
     @HAPreviews
     @Composable

app/src/screenshotTestFullDebug/reference/io/homeassistant/companion/android/onboarding/locationforsecureconnection/LocationForSecureConnectionScreenshotTest/LocationForSecureConnection with back navigation_foldable_c908f502_0.png

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.automirrored.rounded.ArrowBack
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -23,16 +24,22 @@ import io.homeassistant.companion.android.common.compose.theme.LocalHAColorSchem
  * Generic top bar for Home Assistant screens with optional buttons
  * - if onHelpClick is not null, a help button will be added
  * - if onBackClick is not null, a back button will be added
+ * - if onCloseClick is not null, a close button will be added
+ *
+ * Note: onBackClick and onCloseClick are mutually exclusive and cannot be set together.
  */
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HATopBar(
     modifier: Modifier = Modifier,
     title: @Composable () -> Unit = {},
     onHelpClick: (() -> Unit)? = null,
     onBackClick: (() -> Unit)? = null,
+    onCloseClick: (() -> Unit)? = null,
 ) {
-    TopAppBar(
+    require(onBackClick == null || onCloseClick == null) {
+        "onBackClick and onCloseClick are mutually exclusive and cannot be set together"
+    }
+    HATopBar(
         title = title,
         navigationIcon = {
             onBackClick?.let {
@@ -43,6 +50,14 @@ fun HATopBar(
                     )
                 }
             }
+            onCloseClick?.let {
+                IconButton(onClick = onCloseClick) {
+                    Icon(
+                        imageVector = Icons.Default.Close,
+                        contentDescription = stringResource(commonR.string.close),
+                    )
+                }
+            }
         },
         actions = {
             onHelpClick?.let {
@@ -54,6 +69,26 @@ fun HATopBar(
                 }
             }
         },
+        modifier = modifier,
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun HATopBar(
+    modifier: Modifier = Modifier,
+    title: @Composable () -> Unit = {},
+    navigationIcon: (@Composable () -> Unit)? = null,
+    actions: (@Composable () -> Unit)? = null,
+) {
+    TopAppBar(
+        title = title,
+        navigationIcon = {
+            navigationIcon?.invoke()
+        },
+        actions = {
+            actions?.invoke()
+        },
         colors = TopAppBarColors(
             containerColor = LocalHAColorScheme.current.colorSurfaceDefault,
             // TODO validate that we use colorOnNeutralQuiet