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.

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

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Android materialize colors #6405

merged 2 commits into from
Aug 21, 2024

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Jun 25, 2024

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 Reviewable

@Pururun Pururun requested a review from Rawa June 25, 2024 13:36
@Pururun Pururun added the Android Issues related to Android label Jun 25, 2024
@Pururun Pururun force-pushed the android-materialize-colors branch from 7b8ea9f to a45bebc Compare June 26, 2024 12:44
@Pururun Pururun force-pushed the android-materialize-colors branch from a45bebc to 9047c19 Compare July 18, 2024 07:43
@Rawa Rawa added the On hold Means the PR is paused for some reason. No need to review it for now label Jul 18, 2024
@Pururun Pururun force-pushed the android-materialize-colors branch from 9047c19 to a2bbe7a Compare August 6, 2024 14:13
@Pururun Pururun force-pushed the android-materialize-colors branch 2 times, most recently from 82ca032 to 6d72933 Compare August 15, 2024 07:02
@Pururun Pururun removed the On hold Means the PR is paused for some reason. No need to review it for now label Aug 15, 2024
@Pururun Pururun force-pushed the android-materialize-colors branch from 468775e to 630ef0b Compare August 16, 2024 07:11
@Pururun Pururun requested a review from albin-mullvad August 16, 2024 09:24
@Pururun Pururun marked this pull request as ready for review August 16, 2024 09:25
Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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

Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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)? 🤔

Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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

Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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)

Copy link
Contributor Author

@Pururun Pururun left a 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

Copy link
Contributor Author

@Pururun Pururun left a 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.

Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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: :shipit: 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 👍

@Pururun Pururun force-pushed the android-materialize-colors branch 2 times, most recently from ce04756 to c012e4f Compare August 20, 2024 09:24
Copy link
Collaborator

@albin-mullvad albin-mullvad left a 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>
@Pururun Pururun force-pushed the android-materialize-colors branch from c012e4f to e6d5463 Compare August 21, 2024 07:21
Copy link
Contributor Author

@Pururun Pururun left a 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)


-- commits line 3 at r4:

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 or Align colors better with material design

Done


android/CHANGELOG.md line 32 at r4 (raw file):

Previously, albin-mullvad wrote…

Change to imperative form

Done

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@albin-mullvad albin-mullvad force-pushed the android-materialize-colors branch from e6d5463 to 2468105 Compare August 21, 2024 07:45
@albin-mullvad albin-mullvad merged commit 766cdae into main Aug 21, 2024
27 of 28 checks passed
@albin-mullvad albin-mullvad deleted the android-materialize-colors branch August 21, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants