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

Add support for bullets in changes file #6389

Merged
merged 2 commits into from
Jun 24, 2024

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Jun 19, 2024


This change is Reviewable

@Pururun Pururun added the Android Issues related to Android label Jun 19, 2024
Copy link

linear bot commented Jun 19, 2024

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt line 16 at r1 (raw file):

    Html.fromHtml(this, HtmlCompat.FROM_HTML_MODE_LEGACY).toString()

fun List<String>.trim() = map { it.trim() }

I suggest renaming to trimAll

Code quote:

trim

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: 1 of 3 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/StringExtensions.kt line 16 at r1 (raw file):

Previously, albin-mullvad wrote…

I suggest renaming to trimAll

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

@Pururun Pururun marked this pull request as ready for review June 20, 2024 09:46
@Pururun Pururun force-pushed the add-support-for-bullets-in-changes-file-droid-1064 branch from 238a5db to 1f5651f Compare June 20, 2024 09:49
@Pururun Pururun requested a review from albin-mullvad June 20, 2024 09:54
@Pururun Pururun force-pushed the add-support-for-bullets-in-changes-file-droid-1064 branch 2 times, most recently from a3f1331 to bb8dfd7 Compare June 24, 2024 07:18
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.

Reviewed all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt line 29 at r3 (raw file):

            .getChangelog()
            .split(BULLET_POINT_CHAR)
            .map { it.split(NEWLINE_CHAR).trimAll().fastJoinToString(SPACE_STRING).trim() }

Not sure what we feel about fastJoinToString it comes from the compose.ui.util package, do we see a good purpose to have it? Or should we just use the normal joinToString?

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


android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/ChangelogRepository.kt line 29 at r3 (raw file):

Previously, Rawa (David Göransson) wrote…

Not sure what we feel about fastJoinToString it comes from the compose.ui.util package, do we see a good purpose to have it? Or should we just use the normal joinToString?

No it was just me that was confused and though it was part of some kotlin library instead of compose. Changed it to joinToString

@Pururun Pururun force-pushed the add-support-for-bullets-in-changes-file-droid-1064 branch from bb8dfd7 to 3bc7618 Compare June 24, 2024 08:33
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.

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

@Pururun Pururun force-pushed the add-support-for-bullets-in-changes-file-droid-1064 branch from 3bc7618 to 25777ab Compare June 24, 2024 09:22
@Pururun Pururun merged commit d304842 into main Jun 24, 2024
26 checks passed
@Pururun Pururun deleted the add-support-for-bullets-in-changes-file-droid-1064 branch June 24, 2024 10:51
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