-
Notifications
You must be signed in to change notification settings - Fork 382
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
Android materialize colors #6405
Conversation
7b8ea9f
to
a45bebc
Compare
a45bebc
to
9047c19
Compare
9047c19
to
a2bbe7a
Compare
82ca032
to
6d72933
Compare
468775e
to
630ef0b
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 22 of 90 files at r1, 18 of 37 files at r2, all commit messages.
Reviewable status: 40 of 97 files reviewed, 2 unresolved discussions (waiting on @Pururun)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt
line 74 at r2 (raw file):
containerColor = MaterialTheme.colorScheme.error, contentColor = MaterialTheme.colorScheme.onError, disabledContentColor = MaterialTheme.colorScheme.onError.copy(alpha = Alpha20),
We eventually want to get rid of all alpha values, right? But I guess that's a future improvement?
Code quote:
Alpha20
android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
line 1 at r2 (raw file):
package net.mullvad.mullvadvpn.lib.theme.color
Would perhaps be nice to split light and default/dark into separate files
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 24 of 90 files at r1, 5 of 37 files at r2.
Reviewable status: 69 of 97 files reviewed, 3 unresolved discussions (waiting on @Pururun)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
line 64 at r2 (raw file):
modifier = Modifier.fillMaxWidth(), onClick = dropUnlessResumed { resultBackNavigator.navigateBack(result = true) }, text = stringResource(id = R.string.send_anyway)
Looks like a bug (mixup of send anyway <-> back)? 🤔
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 13 of 90 files at r1, 13 of 37 files at r2.
Reviewable status: 95 of 97 files reviewed, 5 unresolved discussions (waiting on @Pururun)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
line 234 at r2 (raw file):
} } Color.Red
What happened here? 😄
Code quote:
Color.Red
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
line 270 at r2 (raw file):
) if (overridesActive) { HorizontalDivider(color = MaterialTheme.colorScheme.onSurface)
use locally declared onBackgroundColor
Code quote:
MaterialTheme.colorScheme.onSurface
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 90 files at r1, 1 of 37 files at r2.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on @Pururun)
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: 95 of 99 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt
line 74 at r2 (raw file):
Previously, albin-mullvad wrote…
We eventually want to get rid of all alpha values, right? But I guess that's a future improvement?
I guess, in this case it was either create a custom color or use alpha.
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
line 234 at r2 (raw file):
Previously, albin-mullvad wrote…
What happened here? 😄
No idea, removed.
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
line 270 at r2 (raw file):
Previously, albin-mullvad wrote…
use locally declared
onBackgroundColor
Done
android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt
line 1 at r2 (raw file):
Previously, albin-mullvad wrote…
Would perhaps be nice to split light and default/dark into separate files
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.
Reviewable status: 95 of 99 files reviewed, 2 unresolved discussions (waiting on @albin-mullvad)
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
line 64 at r2 (raw file):
Previously, albin-mullvad wrote…
Looks like a bug (mixup of send anyway <-> back)? 🤔
We moved the order of the buttons to better match the dialog with other dialogs in the app. I checked the code and tested it in the app that it works as expected so I guess it might be reviewable that makes it look weird.
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 4 of 4 files at r3, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt
line 74 at r2 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
I guess, in this case it was either create a custom color or use alpha.
Alright 👍
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
line 64 at r2 (raw file):
Previously, Pururun (Jonatan Rhodin) wrote…
We moved the order of the buttons to better match the dialog with other dialogs in the app. I checked the code and tested it in the app that it works as expected so I guess it might be reviewable that makes it look weird.
Alright 👍
ce04756
to
c012e4f
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 5 of 5 files at r4, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Pururun)
-- commits
line 3 at r4:
nit: we should try to keep the subject line short where possible. I suggest changing to something like: Align colors with material design
or Align colors better with material design
Code quote:
Update and change colors to be more in line with material design
android/CHANGELOG.md
line 32 at r4 (raw file):
- Migrate underlaying communication wtih daemon to gRPC. This also implies major changes and improvements throughout the app. - Updated colors in the app to be more in line with material design.
Change to imperative form
Code quote:
Updated
Co-authored-by: Matilda <matilda@mullvad.net>
c012e4f
to
e6d5463
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: 99 of 100 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)
Previously, albin-mullvad wrote…
nit: we should try to keep the subject line short where possible. I suggest changing to something like:
Align colors with material design
orAlign colors better with material design
Done
android/CHANGELOG.md
line 32 at r4 (raw file):
Previously, albin-mullvad wrote…
Change to imperative form
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 1 of 1 files at r5, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
e6d5463
to
2468105
Compare
Update all the colors in the app to be more in line with android design and materialize 3 colors.
Textfield colors are not included as they are not yet set in the design.
This change is