Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ConstraintLayout with Row #5171

Merged
merged 2 commits into from
Sep 25, 2023
Merged

Replace ConstraintLayout with Row #5171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae35bde
Replace ConstraintLayout with Row
Rawa Sep 20, 2023
67d3484
Add previews
Rawa Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 51 additions & 39 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@ package net.mullvad.mullvadvpn.compose.component
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.constraintlayout.compose.ConstraintLayout
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.lib.theme.Dimens
Expand All @@ -34,6 +35,34 @@ private fun PreviewTopBar() {
}
}

@Preview
@Composable
private fun PreviewNoIconAndLogoTopBar() {
AppTheme {
TopBar(
backgroundColor = MaterialTheme.colorScheme.inversePrimary,
iconTintColor = MaterialTheme.colorScheme.onPrimary,
isIconAndLogoVisible = false,
onSettingsClicked = {},
onAccountClicked = null,
)
}
}

@Preview
@Composable
private fun PreviewNothingTopBar() {
AppTheme {
TopBar(
backgroundColor = MaterialTheme.colorScheme.inversePrimary,
iconTintColor = MaterialTheme.colorScheme.onPrimary,
isIconAndLogoVisible = false,
onSettingsClicked = null,
onAccountClicked = null
)
}
}

@Composable
fun TopBar(
backgroundColor: Color,
Expand All @@ -43,41 +72,32 @@ fun TopBar(
iconTintColor: Color,
isIconAndLogoVisible: Boolean = true
) {
ConstraintLayout(
Row(
modifier =
Modifier.fillMaxWidth()
.height(Dimens.topBarHeight)
.background(backgroundColor)
.then(modifier),
verticalAlignment = Alignment.CenterVertically
) {
val (logo, appName, accountIcon, settingsIcon) = createRefs()

if (isIconAndLogoVisible) {
Image(
painter = painterResource(id = R.drawable.logo_icon),
contentDescription = null, // No meaningful user info or action.
modifier =
Modifier.padding(start = Dimens.mediumPadding)
.width(Dimens.buttonHeight)
.height(Dimens.buttonHeight)
.constrainAs(logo) {
centerVerticallyTo(parent)
start.linkTo(parent.start)
}
)

Icon(
painter = painterResource(id = R.drawable.logo_text),
tint = iconTintColor,
contentDescription = null, // No meaningful user info or action.
modifier =
Modifier.padding(start = Dimens.smallPadding)
.height(Dimens.mediumPadding)
.constrainAs(appName) {
centerVerticallyTo(parent)
start.linkTo(logo.end)
}
)
Row(
Modifier.height(Dimens.topBarHeight).weight(1f).padding(start = Dimens.mediumPadding),
verticalAlignment = Alignment.CenterVertically
) {
if (isIconAndLogoVisible) {
Image(
painter = painterResource(id = R.drawable.logo_icon),
contentDescription = null, // No meaningful user info or action.
modifier = Modifier.size(Dimens.buttonHeight)
)
Icon(
painter = painterResource(id = R.drawable.logo_text),
tint = iconTintColor,
contentDescription = null, // No meaningful user info or action.
modifier =
Modifier.padding(start = Dimens.smallPadding).height(Dimens.mediumPadding)
)
}
}

if (onAccountClicked != null) {
Expand All @@ -88,13 +108,6 @@ fun TopBar(
Modifier.clickable { onAccountClicked() }
.fillMaxHeight()
.padding(horizontal = Dimens.mediumPadding)
.constrainAs(accountIcon) {
if (onSettingsClicked != null) {
end.linkTo(settingsIcon.start)
} else {
end.linkTo(parent.end)
}
}
)
}

Expand All @@ -106,7 +119,6 @@ fun TopBar(
Modifier.clickable { onSettingsClicked() }
.fillMaxHeight()
.padding(horizontal = Dimens.mediumPadding)
.constrainAs(settingsIcon) { end.linkTo(parent.end) }
)
}
}
Expand Down
Loading