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.

Sign up for GitHub

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

Jump to bottom

Introduce enums in Dialog #17432

Merged
merged 3 commits into from
Dec 28, 2024
Merged

Introduce enums in Dialog #17432

merged 3 commits into from
Dec 28, 2024

Conversation

Arthur-Milchior
Copy link
Member

In order to improve typing

david-allison
david-allison requested changes Nov 13, 2024
View reviewed changes
Copy link
Member

@david-allison david-allison left a comment

Choose a reason for hiding this comment

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

Doesn't feel like a major improvement, but OK

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt Outdated Show resolved Hide resolved
@david-allison david-allison added the Needs Author Reply Waiting for a reply from the original author label Nov 13, 2024
@github-actions GitHub Actions

This comment was marked as outdated.

Sign in to view
@Arthur-Milchior Arthur-Milchior added Needs Review and removed Needs Author Reply Waiting for a reply from the original author Has Conflicts labels Dec 4, 2024
david-allison

This comment was marked as resolved.

Sign in to view

@david-allison david-allison added Needs Author Reply Waiting for a reply from the original author and removed Needs Review labels Dec 4, 2024
david-allison
david-allison reviewed Dec 4, 2024
View reviewed changes
Copy link
Member

@david-allison david-allison left a comment

Choose a reason for hiding this comment

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

> Task :AnkiDroid:ktlintMainSourceSetCheck FAILED
/home/runner/work/Anki-Android/Anki-Android/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt:264:75 Missing spacing before "}"

@Arthur-Milchior Arthur-Milchior removed Needs Author Reply Waiting for a reply from the original author Has Conflicts labels Dec 6, 2024
mikehardy
mikehardy approved these changes Dec 7, 2024
View reviewed changes
Copy link
Member

@mikehardy mikehardy left a comment

Choose a reason for hiding this comment

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

okay by me, if David agrees now

@mikehardy mikehardy added Needs Second Approval Has one approval, one more approval to merge and removed Has Conflicts labels Dec 7, 2024
david-allison
david-allison reviewed Dec 7, 2024
View reviewed changes
Copy link
Member

@david-allison david-allison left a comment

Choose a reason for hiding this comment

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

Blocker: one comment I don't understand

Everything else is nitpicks/implementer's choice

There's a lot of code churn from adding Type. inside the class which defined it, which doesn't seem necessary and is more verbose than it was

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.kt Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt Outdated Show resolved Hide resolved
@Arthur-Milchior
Copy link
Member Author

There's a lot of code churn from adding Type. inside the class which defined it, which doesn't seem necessary and is more verbose than it was

I'm confused.
You wrote, above

I prefer Type.fromCode than fromCode, but this is optional

so I added the explicit Type prefix everywhere.

Visibly it's not what you were looking for. Can you clarify where I should have used the Type prefix then?

@david-allison

This comment was marked as resolved.

Sign in to view
@lukstbit lukstbit added the Needs Author Reply Waiting for a reply from the original author label Dec 8, 2024
@github-actions GitHub Actions

This comment was marked as outdated.

Sign in to view
@github-actions github-actions bot added the Stale label Dec 23, 2024
@Arthur-Milchior
Copy link
Member Author

Thanks

@Arthur-Milchior Arthur-Milchior removed Needs Author Reply Waiting for a reply from the original author Stale labels Dec 28, 2024
Arthur-Milchior and others added 2 commits December 28, 2024 15:43
@Arthur-Milchior @david-allison
NF: improve typing of MediaCheckDialog
e62189e 
Co-authored-by: David Allison <[email protected]>
@Arthur-Milchior @david-allison
NF: improve SyncErrorDialog
a86e936 
Use an enum and constants

Co-authored-by: David Allison <[email protected]>
david-allison
david-allison approved these changes Dec 28, 2024
View reviewed changes
Copy link
Member

@david-allison david-allison left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Cheers! Force pushed to fix a CI issue with the new ktLint not being applied

@david-allison david-allison added this pull request to the merge queue Dec 28, 2024
@david-allison david-allison added Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) and removed Needs Second Approval Has one approval, one more approval to merge labels Dec 28, 2024
Merged via the queue into ankidroid:main with commit afe220c Dec 28, 2024
9 checks passed
@github-actions github-actions bot added this to the 2.21 release milestone Dec 28, 2024
@github-actions github-actions bot removed the Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) label Dec 28, 2024
@Arthur-Milchior Arthur-Milchior deleted the dialog branch December 28, 2024 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@david-allison david-allison david-allison approved these changes

@mikehardy mikehardy mikehardy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.21 release
Development

Successfully merging this pull request may close these issues.
4 participants
@Arthur-Milchior @david-allison @mikehardy @lukstbit