Added checkbox for colpkg and apkg exports to match Anki desktop #17626
+61
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AnkiDroid/src/main/java/com/ichi2/anki/export/ExportDialogFragment.kt
Outdated
Show resolved
Hide resolved
Whoops, missed a commit, will do in a sec |
david-allison
requested changes
Dec 18, 2024
| @@ -273,40 +291,47 @@ class ExportDialogFragment : DialogFragment() { | |||
| container: View, | |||
| targetConfig: ExportConfiguration, | |||
| ) { | |||
| // if we export as collection there's no deck/selected items to choose from | |||
| // show the legacy checkbox only for collection and apkg exports | |||
| if (targetConfig.layoutId == R.id.export_extras_collection || targetConfig.layoutId == R.id.export_extras_apkg) { | |||
There was a problem hiding this comment.
To confirm; I wasn't just tired, there's a bug here
Comment on lines
+295
to
+299
| if (targetConfig.layoutId == R.id.export_extras_collection || targetConfig.layoutId == R.id.export_extras_apkg) { | ||
| collectionExportLegacyCheckbox.isVisible = true | ||
| } else { | ||
| apkgExportLegacyCheckbox.isVisible = false | ||
| } |
There was a problem hiding this comment.
I don't believe this code should exist at all. The code below should handle visibility of the container which contains the checkbox. Since this was unclear, I'd comment a little more
Suggested change
| if (targetConfig.layoutId == R.id.export_extras_collection || targetConfig.layoutId == R.id.export_extras_apkg) { | |
| collectionExportLegacyCheckbox.isVisible = true | |
| } else { | |
| apkgExportLegacyCheckbox.isVisible = false | |
| } |
code below
ExportConfiguration.entries.forEach { config ->
container.findViewById<View>(config.layoutId).isVisible =
config.layoutId == targetConfig.layoutId
}| if (targetConfig.layoutId == R.id.export_extras_collection) { | ||
| decksSelectorContainer.visibility = View.GONE | ||
| selectedLabel.visibility = View.GONE | ||
| decksSelectorContainer.isVisible = false |
There was a problem hiding this comment.
Since we're no longer modifying this method, I'd split this isVisible change into a separate commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose / Description
Describe the problem or feature and motivation
Fixes
Approach
Adds a checkbox and uses the common string to interop with Ani Desktop
How Has This Been Tested?
Did visual confirmation along with a screen recording of the changes and checked the sizes of the exports to confirm that legacy is being triggered properly.
Screen_recording_20241218_215818.webm
Learning (optional, can help others)
Had to play around with the XML for a bit to get it to align, and other than that nothing much
Checklist