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

Add auto connect and lockdown mode screen #5592

Closed
wants to merge 7 commits into from
Closed

Add auto connect and lockdown mode screen #5592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2df548
Add drawable resources
MaryamShaghaghi Dec 13, 2023
1387cca
Add string resources
MaryamShaghaghi Dec 13, 2023
8438a95
Update VPNSettings screen
MaryamShaghaghi Dec 15, 2023
8bc9688
Add dimensions
MaryamShaghaghi Dec 13, 2023
68c5caa
Create auto connect and lockdown mode screen
MaryamShaghaghi Dec 13, 2023
07d668d
fix build
MaryamShaghaghi Dec 15, 2023
8649867
fix navigation
MaryamShaghaghi Dec 15, 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
215 changes: 215 additions & 0 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AutoConnectCarousel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
package net.mullvad.mullvadvpn.compose.component

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.core.text.HtmlCompat
import kotlinx.coroutines.launch
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString
import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.lib.theme.Dimens
import net.mullvad.mullvadvpn.lib.theme.color.AlphaDescription

@Preview
@Composable
fun PreviewAutoConnectCarousel() {
AppTheme { AutoConnectCarousel() }
}

private const val CAROUSEL_PAGE_SIZE = 3

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun AutoConnectCarousel() {
val pagerState = rememberPagerState(pageCount = { CAROUSEL_PAGE_SIZE })
HorizontalPager(state = pagerState, modifier = Modifier.fillMaxSize()) { page ->
val scope = rememberCoroutineScope()
ConstraintLayout(
modifier = Modifier.fillMaxSize(),
) {
val (
upperTextRef,
backButtonRef,
imageRef,
nextButtonRef,
lowerTextRef,
pageIndicatorRef) =
createRefs()
Text(
modifier =
Modifier.padding(horizontal = Dimens.largePadding).constrainAs(upperTextRef) {
start.linkTo(parent.start)
end.linkTo(parent.end)
bottom.linkTo(imageRef.top)
},
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSecondary,
text =
HtmlCompat.fromHtml(
stringResource(
id =
when (page) {
0 -> R.string.auto_connect_carousel_first_slide_top_text
1 -> R.string.auto_connect_carousel_second_slide_top_text
else -> R.string.auto_connect_carousel_third_slide_top_text
}
),
HtmlCompat.FROM_HTML_MODE_COMPACT
)
.toAnnotatedString(
boldSpanStyle =
SpanStyle(
fontWeight = FontWeight.ExtraBold,
color = MaterialTheme.colorScheme.onPrimary
)
)
)
if (page != 0) {
IconButton(
modifier =
Modifier.constrainAs(backButtonRef) {
top.linkTo(parent.top)
start.linkTo(parent.start)
bottom.linkTo(parent.bottom)
},
onClick = {
scope.launch { pagerState.scrollToPage(pagerState.currentPage - 1) }
},
) {
Icon(
painter = painterResource(id = R.drawable.icon_chevron),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.rotate(180f).alpha(AlphaDescription)
)
}
}

Image(
modifier =
Modifier.padding(top = Dimens.topPadding, bottom = Dimens.bottomPadding)
.constrainAs(imageRef) {
top.linkTo(parent.top)
start.linkTo(parent.start)
bottom.linkTo(parent.bottom)
end.linkTo(parent.end)
},
painter =
when (page) {
0 -> painterResource(id = R.drawable.carousel_slide_1_cogwheel)
1 -> painterResource(id = R.drawable.carousel_slide_2_always_on)
else -> painterResource(id = R.drawable.carousel_slide_3_block_connections)
},
contentDescription = null,
)

if (page < CAROUSEL_PAGE_SIZE) {
IconButton(
modifier =
Modifier.constrainAs(nextButtonRef) {
top.linkTo(parent.top)
end.linkTo(parent.end)
bottom.linkTo(parent.bottom)
},
onClick = {
scope.launch { pagerState.scrollToPage(pagerState.currentPage + 1) }
}
) {
Icon(
painter = painterResource(id = R.drawable.icon_chevron),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.size(Dimens.titleIconSize).alpha(AlphaDescription)
)
}
}
Text(
modifier =
Modifier.padding(horizontal = Dimens.largePadding).constrainAs(lowerTextRef) {
top.linkTo(imageRef.bottom)
end.linkTo(parent.end)
start.linkTo(parent.start)
},
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSecondary,
text =
HtmlCompat.fromHtml(
stringResource(
id =
when (page) {
0 -> R.string.auto_connect_carousel_first_slide_bottom_text
1 -> R.string.auto_connect_carousel_second_slide_bottom_text
else ->
R.string.auto_connect_carousel_third_slide_bottom_text
}
),
HtmlCompat.FROM_HTML_MODE_COMPACT
)
.toAnnotatedString(
boldSpanStyle =
SpanStyle(
fontWeight = FontWeight.ExtraBold,
color = MaterialTheme.colorScheme.onPrimary
)
)
)

Row(
Modifier.wrapContentHeight()
.fillMaxWidth()
.padding(top = Dimens.topPadding)
.constrainAs(pageIndicatorRef) {
top.linkTo(lowerTextRef.bottom)

end.linkTo(parent.end)
start.linkTo(parent.start)
},
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.Bottom
) {
repeat(pagerState.pageCount) { iteration ->
val color =
if (pagerState.currentPage == iteration) MaterialTheme.colorScheme.onPrimary
else MaterialTheme.colorScheme.primary
Box(
modifier =
Modifier.padding(Dimens.indicatorPadding)
.clip(CircleShape)
.background(color)
.size(Dimens.indicatorSize)
)
}
}
}
}
}
62 changes: 62 additions & 0 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
package net.mullvad.mullvadvpn.compose.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.systemBarsPadding
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Snackbar
Expand All @@ -23,6 +26,10 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.painterResource
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.button.PrimaryButton
import net.mullvad.mullvadvpn.lib.theme.Dimens
import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar

Expand Down Expand Up @@ -183,3 +190,58 @@ fun ScaffoldWithMediumTopBar(
}
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ScaffoldWithLargeTopBarAndButton(
appBarTitle: String,
modifier: Modifier = Modifier,
navigationIcon: @Composable () -> Unit = {},
actions: @Composable RowScope.() -> Unit = {},
onButtonClick: () -> Unit = {}, // Add button
buttonTitle: String,
scrollbarColor: Color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar),
content: @Composable (modifier: Modifier) -> Unit
) {
val appBarState = rememberTopAppBarState()
val scrollState = rememberScrollState()
val canScroll = scrollState.canScrollForward || scrollState.canScrollBackward
val scrollBehavior =
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState, canScroll = { canScroll })
Scaffold(
modifier = modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).systemBarsPadding().nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
MullvadLargeTopBar(
title = appBarTitle,
navigationIcon = navigationIcon,
actions,
scrollBehavior = scrollBehavior
)
},
bottomBar = {
PrimaryButton(
text = buttonTitle,
onClick = onButtonClick,
modifier =
Modifier.padding(
horizontal = Dimens.sideMargin,
vertical = Dimens.screenVerticalMargin
),
icon = {
Icon(
painter = painterResource(id = R.drawable.icon_extlink),
contentDescription = null
)
},
)
},
content = {
content(
Modifier.fillMaxSize()
.padding(it)
.drawVerticalScrollbar(state = scrollState, color = scrollbarColor)
.verticalScroll(scrollState)
)
}
)
}
32 changes: 32 additions & 0 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 @@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LargeTopAppBar
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MediumTopAppBar
import androidx.compose.material3.Surface
Expand Down Expand Up @@ -198,6 +199,16 @@ private fun PreviewMediumTopBar() {
}
}

@Preview
@Composable
private fun PreviewLargeTopBar() {
AppTheme {
MullvadLargeTopBar(
title = "Title",
)
}
}

@Preview(widthDp = 260)
@Composable
private fun PreviewSlimMediumTopBar() {
Expand Down Expand Up @@ -236,6 +247,27 @@ fun MullvadMediumTopBar(
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MullvadLargeTopBar(
title: String,
navigationIcon: @Composable () -> Unit = {},
actions: @Composable RowScope.() -> Unit = {},
scrollBehavior: TopAppBarScrollBehavior? = null
) {
LargeTopAppBar(
title = { Text(text = title, maxLines = 2, overflow = TextOverflow.Ellipsis) },
navigationIcon = navigationIcon,
scrollBehavior = scrollBehavior,
colors =
TopAppBarDefaults.mediumTopAppBarColors(
containerColor = MaterialTheme.colorScheme.background,
actionIconContentColor = MaterialTheme.colorScheme.onPrimary.copy(AlphaTopBar),
),
actions = actions
)
}

@Preview
@Composable
private fun PreviewMullvadTopBarWithLongDeviceName() {
Expand Down
38 changes: 38 additions & 0 deletions ...src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package net.mullvad.mullvadvpn.compose.screen

import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.component.AutoConnectCarousel
import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
import net.mullvad.mullvadvpn.compose.component.ScaffoldWithLargeTopBarAndButton
import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
import net.mullvad.mullvadvpn.lib.common.util.openVpnSettings
import net.mullvad.mullvadvpn.lib.theme.AppTheme

@Preview
@Composable
private fun PreviewAutoConnectAndLockdownModeScreen() {

AppTheme { AutoConnectAndLockdownModeScreen(EmptyDestinationsNavigator) }
}

@Destination(style = SlideInFromRightTransition::class)
@Composable
fun AutoConnectAndLockdownModeScreen(
navigator: DestinationsNavigator,
) {
val context = LocalContext.current
ScaffoldWithLargeTopBarAndButton(
appBarTitle = stringResource(id = R.string.auto_connect_and_lockdown_mode_two_lines),
navigationIcon = { NavigateBackIconButton(navigator::navigateUp) },
buttonTitle = stringResource(id = R.string.go_to_vpn_settings),
onButtonClick = { context.openVpnSettings() },
content = { modifier -> AutoConnectCarousel() }
)
}
Loading