-
Notifications
You must be signed in to change notification settings - Fork 354
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.
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
Fix title overflow and replace switch #5310
Fix title overflow and replace switch #5310
Conversation
DROID-385 Custom DNS toggle looks strange in 2023.6
david said:
We should probably replace the switch with the material3 one. |
I've posted the question to design whether we should keep the toggles closer to material or our desktop design. Update: Design wanted it as per Zeplin, I've fixed and updated it. |
5c5fd71
to
f625ae7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 8 of 8 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Rawa)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
line 49 at r1 (raw file):
thumbContent: (@Composable () -> Unit)? = { // This is needed to ensure the thumb always is big in off mode Spacer(modifier = Modifier.size(24.dp))
Probably should not be a magic number.
Is there any way to get this number from the material library?
Otherwise I guess we should set in Dimens.
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
line 69 at r1 (raw file):
fun mullvadSwitchColors(): SwitchColors = SwitchDefaults.colors( checkedThumbColor = MaterialTheme.colorScheme.surface, // TODO Change
Since we have now merged the button PR, we can use selected()
here instead and thus we can change that color in the future.
f625ae7
to
0a14773
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status: 6 of 9 files reviewed, 2 unresolved discussions (waiting on @Pururun)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
line 49 at r1 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
Probably should not be a magic number.
Is there any way to get this number from the material library?
Otherwise I guess we should set in Dimens.
Done.
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
line 69 at r1 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
Since we have now merged the button PR, we can use
selected()
here instead and thus we can change that color in the future.
Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 3 of 3 files at r2, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved
0a14773
to
ac9358c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 1 of 1 files at r3, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved
ac9358c
to
b8f3314
Compare
b8f3314
to
453992d
Compare
This change is