Make settings icon optional in top bar

Cherry-pick from: f5daa12f4e865581d5effafff803d482a8be381f

2 files changed, 15 insertions, 13 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
index 38c188eece..05cd60cba1 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -11,7 +11,7 @@ fun ScaffoldWithTopBar(
     topBarColor: Color,
     statusBarColor: Color,
     navigationBarColor: Color,
-    onSettingsClicked: () -> Unit,
+    onSettingsClicked: (() -> Unit)?,
     isIconAndLogoVisible: Boolean = true,
     content: @Composable (PaddingValues) -> Unit,
 ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
index d4560457b4..55d015a7db 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
@@ -33,7 +33,7 @@ fun PreviewTopBar() {
 @Composable
 fun TopBar(
     backgroundColor: Color,
-    onSettingsClicked: () -> Unit,
+    onSettingsClicked: (() -> Unit)?,
     modifier: Modifier = Modifier,
     isIconAndLogoVisible: Boolean = true
 ) {
@@ -72,16 +72,18 @@ fun TopBar(
             )
         }
 
-        Image(
-            painter = painterResource(R.drawable.icon_settings),
-            contentDescription = stringResource(id = R.string.settings),
-            modifier = Modifier
-                .clickable { onSettingsClicked() }
-                .fillMaxHeight()
-                .padding(horizontal = 16.dp)
-                .constrainAs(settingsIcon) {
-                    end.linkTo(parent.end)
-                }
-        )
+        if (onSettingsClicked != null) {
+            Image(
+                painter = painterResource(R.drawable.icon_settings),
+                contentDescription = stringResource(id = R.string.settings),
+                modifier = Modifier
+                    .clickable { onSettingsClicked() }
+                    .fillMaxHeight()
+                    .padding(horizontal = 16.dp)
+                    .constrainAs(settingsIcon) {
+                        end.linkTo(parent.end)
+                    }
+            )
+        }
     }
 }