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

Design system PR 1 #5210

Closed
wants to merge 1 commit into from
Closed

Design system PR 1 #5210

wants to merge 1 commit into from

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Sep 29, 2023

  • Set default theme as dark instead of light
  • Move to a color token system instead of colors in the theme
  • Replace some theme colors with alpha with normal colors
  • Remove some usage of color resource

This change is Reviewable

- Set default theme as dark instead of light
- Move to a color token system instead of colors in the theme
- Replace some theme colors with alpha with normal colors
- Remove some usage of color resource
Copy link
Contributor

@Rawa Rawa 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: 0 of 10 files reviewed, 3 unresolved discussions (waiting on @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt line 172 at r1 (raw file):

            relay.type == RelayItemType.City ->
                MaterialTheme.colorScheme.primary
                    .copy(alpha = Alpha40)

I believe this is some transition step, but long we should look into avoiding all these Alpha's together. Maybe the result of

                    .copy(alpha = Alpha40)
                    .compositeOver(MaterialTheme.colorScheme.background)

Is a candidate of being the Secondary color?


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt line 112 at r1 (raw file):

                    ButtonDefaults.buttonColors(
                        containerColor = MaterialTheme.colorScheme.primary,
                        contentColor = MaterialTheme.colorScheme.onPrimary

This looks so nice 🤩


android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt line 73 at r1 (raw file):

        //scrim = md_theme_dark_scrim,
    )

Idea is to slowly transition there all over?

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Nice work! 🤩

Reviewable status: 0 of 10 files reviewed, 3 unresolved discussions (waiting on @Pururun)

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 9 of 10 files at r1, all commit messages.
Reviewable status: 9 of 10 files reviewed, 2 unresolved discussions (waiting on @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt line 112 at r1 (raw file):

Previously, Rawa (David Göransson) wrote…

This looks so nice 🤩

Indeed! 😄 👍

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: 9 of 10 files reviewed, 2 unresolved discussions (waiting on @Rawa)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt line 172 at r1 (raw file):

Previously, Rawa (David Göransson) wrote…

I believe this is some transition step, but long we should look into avoiding all these Alpha's together. Maybe the result of

                    .copy(alpha = Alpha40)
                    .compositeOver(MaterialTheme.colorScheme.background)

Is a candidate of being the Secondary color?

Yes will add compositeOver.


android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt line 73 at r1 (raw file):

Previously, Rawa (David Göransson) wrote…

Idea is to slowly transition there all over?

Yes the idea is to take a few colors at a time.

@Pururun Pururun added the Android Issues related to Android label Oct 1, 2023
@Pururun
Copy link
Contributor Author

Pururun commented Oct 1, 2023

Split this PR into 3 other PRs instead:
#5216
#5215
#5211

@Pururun Pururun closed this Oct 1, 2023
Copy link
Contributor

@sabercodic sabercodic left a comment

Choose a reason for hiding this comment

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

Reviewed 10 of 10 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Rawa)

@Pururun Pururun deleted the design-system-1 branch October 3, 2023 13:02
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.

4 participants