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 button highlight and refactor screen #5387

Merged
merged 1 commit into from
Nov 17, 2023

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Oct 31, 2023

  • Fix button highlight
  • Fix spacing
  • Refactor screen to make it easier to comprehend.

This change is Reviewable

@Rawa Rawa added the Android Issues related to Android label Oct 31, 2023
@Rawa Rawa self-assigned this Oct 31, 2023
Copy link

linear bot commented Oct 31, 2023

DROID-470 Too many devices remove button

Button to delete devices on "Too Many Devices" page is not a icon button, this causes the touch target and ripple to be off. We should replace it with a proper Icon button

@Rawa Rawa force-pushed the too-many-devices-remove-button-droid-470 branch from 65f416b to 76c822e Compare October 31, 2023 12:27
@Rawa Rawa requested review from Pururun and albin-mullvad November 6, 2023 09:40
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 r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Rawa)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt line 247 at r1 (raw file):

                    Icon(
                        painter = painterResource(id = R.drawable.icon_close),
                        contentDescription = "Remove",

Should this be hardcoded? I think we can use R.string.remove_button instead.

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt line 247 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Should this be hardcoded? I think we can use R.string.remove_button instead.

It got carried over from the old button when refactoring, I've changed to use the content description of the remove button now which has a matching string.

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt line 247 at r1 (raw file):

Previously, Rawa (David Göransson) wrote…

It got carried over from the old button when refactoring, I've changed to use the content description of the remove button now which has a matching string.

Done.

@Rawa Rawa force-pushed the too-many-devices-remove-button-droid-470 branch 2 times, most recently from dcbdbc3 to 5648a77 Compare November 10, 2023 08:14
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 2 of 2 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

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 3 files at r1, 2 of 2 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa force-pushed the too-many-devices-remove-button-droid-470 branch 2 times, most recently from 07bb6c4 to 2f35a14 Compare November 17, 2023 15:48
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 2 of 2 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@albin-mullvad albin-mullvad force-pushed the too-many-devices-remove-button-droid-470 branch from 2f35a14 to 64e2a2c Compare November 17, 2023 16:20
@albin-mullvad albin-mullvad merged commit 89420ba into main Nov 17, 2023
11 checks passed
@albin-mullvad albin-mullvad deleted the too-many-devices-remove-button-droid-470 branch November 17, 2023 16:25
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