diff options
| author | Albin <albin@mullvad.net> | 2023-02-20 08:47:46 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-02-23 10:07:27 +0100 |
| commit | 3957b9797922128b09fff55e08ac01e187446e01 (patch) | |
| tree | fa5b4e5269edb797b904fbf1dfe93374891b92bf /android | |
| parent | 4efa76c08a190f53440c7b6ef9dd4ac08beea7ce (diff) | |
| download | mullvadvpn-3957b9797922128b09fff55e08ac01e187446e01.tar.xz mullvadvpn-3957b9797922128b09fff55e08ac01e187446e01.zip | |
Add option to hide logo and icon from top bar
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt | 4 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt | 49 |
2 files changed, 29 insertions, 24 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 67e4a3ec19..38c188eece 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 @@ -12,6 +12,7 @@ fun ScaffoldWithTopBar( statusBarColor: Color, navigationBarColor: Color, onSettingsClicked: () -> Unit, + isIconAndLogoVisible: Boolean = true, content: @Composable (PaddingValues) -> Unit, ) { val systemUiController = rememberSystemUiController() @@ -22,7 +23,8 @@ fun ScaffoldWithTopBar( topBar = { TopBar( backgroundColor = topBarColor, - onSettingsClicked = onSettingsClicked + onSettingsClicked = onSettingsClicked, + isIconAndLogoVisible = isIconAndLogoVisible ) }, content = content 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 7756479883..d4560457b4 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 @@ -34,7 +34,8 @@ fun PreviewTopBar() { fun TopBar( backgroundColor: Color, onSettingsClicked: () -> Unit, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, + isIconAndLogoVisible: Boolean = true ) { ConstraintLayout( modifier = Modifier @@ -45,29 +46,31 @@ fun TopBar( ) { val (logo, appName, settingsIcon) = createRefs() - Image( - painter = painterResource(id = R.drawable.logo_icon), - contentDescription = null, // No meaningful user info or action. - modifier = Modifier - .width(44.dp) - .height(44.dp) - .constrainAs(logo) { - centerVerticallyTo(parent) - start.linkTo(parent.start, margin = 16.dp) - } - ) + if (isIconAndLogoVisible) { + Image( + painter = painterResource(id = R.drawable.logo_icon), + contentDescription = null, // No meaningful user info or action. + modifier = Modifier + .width(44.dp) + .height(44.dp) + .constrainAs(logo) { + centerVerticallyTo(parent) + start.linkTo(parent.start, margin = 16.dp) + } + ) - Icon( - painter = painterResource(id = R.drawable.logo_text), - tint = colorResource(id = R.color.white80), - contentDescription = null, // No meaningful user info or action. - modifier = Modifier - .height(16.dp) - .constrainAs(appName) { - centerVerticallyTo(parent) - start.linkTo(logo.end, margin = 8.dp) - } - ) + Icon( + painter = painterResource(id = R.drawable.logo_text), + tint = colorResource(id = R.color.white80), + contentDescription = null, // No meaningful user info or action. + modifier = Modifier + .height(16.dp) + .constrainAs(appName) { + centerVerticallyTo(parent) + start.linkTo(logo.end, margin = 8.dp) + } + ) + } Image( painter = painterResource(R.drawable.icon_settings), |