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: Use flags from col, dynamically loading them into the menu #16218

Merged
merged 3 commits into from Apr 20, 2024

Conversation

criticalAY
Copy link
Contributor

Purpose / Description

  • Display Renamed Flags Display Renamed Flags #16204
    This PR removes the static menu item - flags, from the menu and dynamically load the flag data which allow the user to access the renamed flags if they did rename them in Anki desktop

Fixes

Approach

Loaded flag from col

How Has This Been Tested?

Anki ->
image

AnkiDroid ->
image

Checklist

Please, go through these checks before submitting the PR.

  • You have a descriptive commit message with a short title (first line, max 50 chars).
  • You have commented your code, particularly in hard-to-understand areas
  • You have performed a self-review of your own code
  • UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
  • UI Changes: You have tested your change using the Google Accessibility Scanner

Copy link
Contributor Author

@criticalAY criticalAY left a comment

Choose a reason for hiding this comment

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

The strings also differ in AnkiDroid i.e. the flag after them but I am not focusing on that here, and if we wish to reuse addFlags then I am all ears

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.

CI issue

@criticalAY
Copy link
Contributor Author

I just want to test id this test is really causing the issue, if not then I will revert the commit

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.

Thanks!

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.

Thanks! Should be the last round

I'd also encourage adding a follow-up issue to change the strings from Red flag to Red as is used upstream

AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt Outdated Show resolved Hide resolved
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.

Thanks! One more to go

AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt Outdated Show resolved Hide resolved
@david-allison david-allison added Needs Author Reply Waiting for a reply from the original author Needs Second Approval Has one approval, one more approval to merge labels Apr 19, 2024
@david-allison david-allison removed the Needs Author Reply Waiting for a reply from the original author label Apr 20, 2024
@BrayanDSO BrayanDSO self-requested a review April 20, 2024 15:19
AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/res/menu/card_browser_multiselect.xml Outdated Show resolved Hide resolved
AnkiDroid/src/main/res/menu/card_browser.xml Outdated Show resolved Hide resolved
AnkiDroid/src/main/res/menu/previewer.xml Outdated Show resolved Hide resolved
AnkiDroid/src/main/res/menu/reviewer.xml Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/Flag.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/Flag.kt Outdated Show resolved Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/Flag.kt Outdated Show resolved Hide resolved
@BrayanDSO BrayanDSO added the Needs Author Reply Waiting for a reply from the original author label Apr 20, 2024
Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>
@BrayanDSO BrayanDSO removed the Needs Author Reply Waiting for a reply from the original author label Apr 20, 2024
@BrayanDSO BrayanDSO 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 Apr 20, 2024
@BrayanDSO BrayanDSO added this pull request to the merge queue Apr 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 20, 2024
@BrayanDSO BrayanDSO added this pull request to the merge queue Apr 20, 2024
Merged via the queue into ankidroid:main with commit 1a5c843 Apr 20, 2024
5 checks passed
@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 Apr 20, 2024
@github-actions github-actions bot added this to the 2.18 release milestone Apr 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display Renamed Flags
3 participants