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

Move "Content blockers" closer to "Custom Dns" setting #5334

Merged
merged 3 commits into from
Nov 6, 2023

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Oct 20, 2023


This change is Reviewable

@linear
Copy link

linear bot commented Oct 20, 2023

DROID-338 Move Custom DNS next to content blockers

Move according to the design on confluence/zeplin.

@Rawa Rawa changed the title Move Content blockers closer to Use custon Dns setting Move "Content blockers" closer to "Custom Dns" setting Oct 20, 2023
@Rawa Rawa force-pushed the move-custom-dns-next-to-content-blockers-droid-338 branch from c022e24 to 132a25a Compare October 20, 2023 09:57
@Rawa Rawa self-assigned this Oct 23, 2023
@Rawa Rawa requested review from sabercodic and Pururun and removed request for sabercodic October 23, 2023 08:50
@Rawa Rawa added the Android Issues related to Android label Oct 23, 2023
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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa force-pushed the move-custom-dns-next-to-content-blockers-droid-338 branch 8 times, most recently from e2758c7 to a9e964e Compare October 30, 2023 09:06
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 3 of 3 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @Rawa)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 268 at r2 (raw file):

            )
        }
        //        composeTestRule

This should removed no?


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 394 at r2 (raw file):

            )
        }
        //        composeTestRule

See above.

@Rawa Rawa force-pushed the move-custom-dns-next-to-content-blockers-droid-338 branch from a9e964e to 813c994 Compare October 30, 2023 14:18
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: 2 of 3 files reviewed, 2 unresolved discussions (waiting on @Pururun)


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 268 at r2 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

This should removed no?

Correct, thanks!


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 394 at r2 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

See above.

Done.

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


android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt line 268 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Correct, thanks!

Done.

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

@Pururun Pururun force-pushed the move-custom-dns-next-to-content-blockers-droid-338 branch from 813c994 to abb2034 Compare November 6, 2023 10:40
@Pururun Pururun force-pushed the move-custom-dns-next-to-content-blockers-droid-338 branch from abb2034 to 19618db Compare November 6, 2023 11:37
@Pururun Pururun merged commit 11ee38e into main Nov 6, 2023
9 checks passed
@Pururun Pururun deleted the move-custom-dns-next-to-content-blockers-droid-338 branch November 6, 2023 11:38
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.

2 participants