Skip to content

Commit

Permalink
Replace xml resources and hardcoded colors in MtuDialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pururun
Pururun committed Sep 7, 2023
1 parent b4ed289 commit 0c75ee6
Showing 1 changed file with 42 additions and 57 deletions.
99 changes: 42 additions & 57 deletions android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
Expand All @@ -19,22 +18,19 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.button.ActionButton
import net.mullvad.mullvadvpn.compose.textfield.MtuTextField
import net.mullvad.mullvadvpn.constant.MTU_MAX_VALUE
import net.mullvad.mullvadvpn.constant.MTU_MIN_VALUE
import net.mullvad.mullvadvpn.lib.theme.MullvadBlue
import net.mullvad.mullvadvpn.lib.theme.MullvadDarkBlue
import net.mullvad.mullvadvpn.lib.theme.MullvadWhite
import net.mullvad.mullvadvpn.lib.theme.MullvadWhite20
import net.mullvad.mullvadvpn.lib.theme.MullvadWhite60
import net.mullvad.mullvadvpn.lib.theme.AlphaDescription
import net.mullvad.mullvadvpn.lib.theme.AlphaDisabled
import net.mullvad.mullvadvpn.lib.theme.AlphaInactive
import net.mullvad.mullvadvpn.lib.theme.Dimens
import net.mullvad.mullvadvpn.util.isValidMtu

@Composable
Expand All @@ -44,16 +40,10 @@ fun MtuDialog(
onRestoreDefaultValue: () -> Unit,
onDismiss: () -> Unit,
) {
val buttonSize = dimensionResource(id = R.dimen.button_height)
val mediumPadding = dimensionResource(id = R.dimen.medium_padding)
val dialogPadding = 20.dp
val midPadding = 10.dp
val smallPadding = 5.dp

val textSmallSize = dimensionResource(id = R.dimen.text_small).value.sp
val textMediumSize = dimensionResource(id = R.dimen.text_medium_plus).value.sp
val textBigSize = dimensionResource(id = R.dimen.text_big).value.sp

val mtu = remember { mutableStateOf(mtuInitial?.toString() ?: "") }

val textFieldFocusRequester = FocusRequester()
Expand All @@ -68,13 +58,13 @@ fun MtuDialog(
Modifier
// Related to the fix for https://issuetracker.google.com/issues/221643630
.fillMaxWidth(0.8f)
.background(color = MullvadDarkBlue)
.background(color = MaterialTheme.colorScheme.background)
.padding(dialogPadding)
) {
Text(
text = stringResource(id = R.string.wireguard_mtu),
color = Color.White,
fontSize = textBigSize
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.headlineSmall
)

Box(
Expand Down Expand Up @@ -107,69 +97,64 @@ fun MtuDialog(
MTU_MIN_VALUE,
MTU_MAX_VALUE
),
fontSize = textSmallSize,
color = MullvadWhite60,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaDescription),
modifier = Modifier.padding(top = smallPadding)
)

Button(
ActionButton(
modifier =
Modifier.padding(top = mediumPadding).height(buttonSize).fillMaxWidth(),
Modifier.padding(top = Dimens.mediumPadding)
.height(Dimens.buttonHeight)
.fillMaxWidth(),
colors =
ButtonDefaults.buttonColors(
containerColor = MullvadBlue,
contentColor = MullvadWhite,
disabledContentColor = MullvadWhite60,
disabledContainerColor = MullvadWhite20
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
disabledContentColor =
MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaInactive),
disabledContainerColor =
MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaDisabled)
),
enabled = isValidMtu,
isEnabled = isValidMtu,
text = stringResource(R.string.submit_button),
onClick = {
val mtuInt = mtu.value.toIntOrNull()
if (mtuInt?.isValidMtu() == true) {
onSave(mtuInt)
}
},
shape = MaterialTheme.shapes.small
) {
Text(text = stringResource(R.string.submit_button), fontSize = textMediumSize)
}
}
)

Button(
ActionButton(
modifier =
Modifier.padding(top = mediumPadding)
.height(buttonSize)
.defaultMinSize(minHeight = buttonSize)
Modifier.padding(top = Dimens.mediumPadding)
.height(Dimens.buttonHeight)
.defaultMinSize(minHeight = Dimens.buttonHeight)
.fillMaxWidth(),
colors =
ButtonDefaults.buttonColors(
containerColor = MullvadBlue,
contentColor = MullvadWhite
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
),
onClick = onRestoreDefaultValue,
shape = MaterialTheme.shapes.small
) {
Text(
text = stringResource(R.string.reset_to_default_button),
fontSize = textMediumSize
)
}
text = stringResource(R.string.reset_to_default_button),
onClick = onRestoreDefaultValue
)

Button(
ActionButton(
modifier =
Modifier.padding(top = mediumPadding)
.height(buttonSize)
.defaultMinSize(minHeight = buttonSize)
Modifier.padding(top = Dimens.mediumPadding)
.height(Dimens.buttonHeight)
.defaultMinSize(minHeight = Dimens.buttonHeight)
.fillMaxWidth(),
colors =
ButtonDefaults.buttonColors(
containerColor = MullvadBlue,
contentColor = Color.White
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
),
onClick = onDismiss,
shape = MaterialTheme.shapes.small
) {
Text(text = stringResource(R.string.cancel), fontSize = textMediumSize)
}
text = stringResource(R.string.cancel),
onClick = onDismiss
)
}
}
)
Expand Down

0 comments on commit 0c75ee6

Please sign in to comment.