From 132a25a8628257be4c9c83769fa27ac3c2e1b0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Fri, 20 Oct 2023 11:56:08 +0200 Subject: [PATCH] Move Content blockers closer to Use custom Dns setting --- .../compose/screen/VpnSettingsScreen.kt | 179 +++++++++--------- 1 file changed, 90 insertions(+), 89 deletions(-) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt index c65710f17bc7..be96146e1e8b 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt @@ -302,95 +302,6 @@ fun VpnSettingsScreen( } item { MtuSubtitle() } - itemWithDivider { - ExpandableComposeCell( - title = stringResource(R.string.dns_content_blockers_title), - isExpanded = expandContentBlockersState, - isEnabled = !uiState.isCustomDnsEnabled, - onInfoClicked = { onContentsBlockersInfoClick() }, - onCellClicked = { expandContentBlockersState = !expandContentBlockersState } - ) - } - - if (expandContentBlockersState) { - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_ads_title), - isToggled = uiState.contentBlockersOptions.blockAds, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockAds(it) }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_trackers_title), - isToggled = uiState.contentBlockersOptions.blockTrackers, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockTrackers(it) }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_malware_title), - isToggled = uiState.contentBlockersOptions.blockMalware, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockMalware(it) }, - onInfoClicked = { onMalwareInfoClick() }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_gambling_title), - isToggled = uiState.contentBlockersOptions.blockGambling, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockGambling(it) }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_adult_content_title), - isToggled = uiState.contentBlockersOptions.blockAdultContent, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockAdultContent(it) }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - - itemWithDivider { - NormalSwitchComposeCell( - title = stringResource(R.string.block_social_media_title), - isToggled = uiState.contentBlockersOptions.blockSocialMedia, - isEnabled = !uiState.isCustomDnsEnabled, - onCellClicked = { onToggleBlockSocialMedia(it) }, - background = MaterialTheme.colorScheme.secondaryContainer, - startPadding = Dimens.indentedCellStartPadding - ) - } - - if (uiState.isCustomDnsEnabled) { - item { - ContentBlockersDisableModeCellSubtitle( - Modifier.background(MaterialTheme.colorScheme.secondary) - .padding( - start = Dimens.cellStartPadding, - top = topPadding, - end = Dimens.cellEndPadding, - bottom = Dimens.cellLabelVerticalPadding - ) - ) - } - } - } - itemWithDivider { Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) InformationComposeCell( @@ -499,6 +410,96 @@ fun VpnSettingsScreen( mainTestTag = LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG, numberTestTag = LAZY_LIST_WIREGUARD_CUSTOM_PORT_NUMBER_TEST_TAG ) + Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) + } + + itemWithDivider { + ExpandableComposeCell( + title = stringResource(R.string.dns_content_blockers_title), + isExpanded = expandContentBlockersState, + isEnabled = !uiState.isCustomDnsEnabled, + onInfoClicked = { onContentsBlockersInfoClick() }, + onCellClicked = { expandContentBlockersState = !expandContentBlockersState } + ) + } + + if (expandContentBlockersState) { + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_ads_title), + isToggled = uiState.contentBlockersOptions.blockAds, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockAds(it) }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_trackers_title), + isToggled = uiState.contentBlockersOptions.blockTrackers, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockTrackers(it) }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_malware_title), + isToggled = uiState.contentBlockersOptions.blockMalware, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockMalware(it) }, + onInfoClicked = { onMalwareInfoClick() }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_gambling_title), + isToggled = uiState.contentBlockersOptions.blockGambling, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockGambling(it) }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_adult_content_title), + isToggled = uiState.contentBlockersOptions.blockAdultContent, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockAdultContent(it) }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + + itemWithDivider { + NormalSwitchComposeCell( + title = stringResource(R.string.block_social_media_title), + isToggled = uiState.contentBlockersOptions.blockSocialMedia, + isEnabled = !uiState.isCustomDnsEnabled, + onCellClicked = { onToggleBlockSocialMedia(it) }, + background = MaterialTheme.colorScheme.secondaryContainer, + startPadding = Dimens.indentedCellStartPadding + ) + } + + if (uiState.isCustomDnsEnabled) { + item { + ContentBlockersDisableModeCellSubtitle( + Modifier.background(MaterialTheme.colorScheme.secondary) + .padding( + start = Dimens.cellStartPadding, + top = topPadding, + end = Dimens.cellEndPadding, + bottom = Dimens.cellLabelVerticalPadding + ) + ) + } + } } item {