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

Fix blocked connection text color #6058

Merged

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Apr 3, 2024


This change is Reviewable

Copy link

linear bot commented Apr 3, 2024

@Rawa Rawa added the Android Issues related to Android label Apr 3, 2024
@Rawa Rawa self-assigned this Apr 3, 2024
@Rawa Rawa requested review from Pururun and albin-mullvad April 3, 2024 08:42
Copy link
Contributor

@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.

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt line 103 at r1 (raw file):

            ),
        color =
            if (isBlocking) MaterialTheme.colorScheme.onBackground else MaterialTheme.colorScheme.error,

On connecting we use onPrimary for white text so I think this should be the same.

@Rawa Rawa force-pushed the connection-blocked-text-is-green-on-connect-screen-droid-816 branch from a91498f to 526c5c1 Compare April 3, 2024 10:47
Copy link
Contributor Author

@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 1 files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt line 103 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

On connecting we use onPrimary for white text so I think this should be the same.

Fixed! I looked into the map as well, seems like we use primay for land there as well, so it sort of makes sense I think.

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 r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)

Copy link
Contributor

@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.

:lgtm:

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

@Rawa Rawa force-pushed the connection-blocked-text-is-green-on-connect-screen-droid-816 branch from 526c5c1 to ae77318 Compare April 4, 2024 06:49
@Rawa Rawa requested review from Pururun and albin-mullvad April 4, 2024 06:51
Copy link
Contributor

@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.

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

@Rawa Rawa force-pushed the connection-blocked-text-is-green-on-connect-screen-droid-816 branch from ae77318 to c660099 Compare April 4, 2024 13:57
@Rawa Rawa merged commit 662a75f into main Apr 4, 2024
22 checks passed
@Rawa Rawa deleted the connection-blocked-text-is-green-on-connect-screen-droid-816 branch April 4, 2024 13:58
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