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

fix: Deck Options: "Back" works incorrectly if the manual is open #15145

Merged
merged 3 commits into from Jan 5, 2024
Merged

fix: Deck Options: "Back" works incorrectly if the manual is open #15145

merged 3 commits into from Jan 5, 2024

Conversation

david-allison
Copy link
Member

Purpose / Description

Fixes

Approach

  • onBackPressedDispatcher

How Has This Been Tested?

API 33 emulator:

  • Manage Note Types + Reviewer to ensure no breakage
  • Deck Options - pressing back goes back
  • Deck Options - pressing back when on manual goes back to options
15130.webm

Checklist

  • 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

@david-allison david-allison changed the title fix: "back" button on deck options fix: Deck Options: "Back" works incorrectly if the manual is open Jan 3, 2024
@BrayanDSO BrayanDSO added Needs Second Approval Has one approval, one more approval to merge and removed Needs Review labels Jan 3, 2024
@mikehardy
Copy link
Member

@david-allison this one took a conflict but the bot hasn't seen it yet. Was just going to stuff the merge queue more :)

@david-allison
Copy link
Member Author

@mikehardy just an import conflict. Good to go

@david-allison
OnPageFinishedCallback: add 'WebView' param
a44862a
@david-allison
fix: AnkiActivity - use onBackPressedDispatcher
b7e57cf
@david-allison
fix: DeckOptions - 'back' when manual open
15c9a7e 
If the manual is open, the back button and back icon should
 go back to the deck options, rather than closing the screen

Fixes 15130
mikehardy
mikehardy approved these changes Jan 5, 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.

a tangled webview we weave

@mikehardy mikehardy added this pull request to the merge queue Jan 5, 2024
Merged via the queue into ankidroid:main with commit 3ad2d9f Jan 5, 2024
7 checks passed
@github-actions github-actions bot added this to the 2.17 release milestone Jan 5, 2024
@github-actions github-actions bot removed the Needs Second Approval Has one approval, one more approval to merge label Jan 5, 2024
@david-allison david-allison deleted the 15130-deck-options-back branch January 5, 2024 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikehardy mikehardy mikehardy approved these changes

@BrayanDSO BrayanDSO BrayanDSO approved these changes

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

Successfully merging this pull request may close these issues.

[Bug] Deck Options: "Back" works incorrectly if the manual is open
3 participants
@david-allison @mikehardy @BrayanDSO