feat(browse): more than 2 columns #17781
Open
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
Prep for a variable column count * replace `setColumn1` with `setColumn(0` Issue 17780
david-allison
added
Anki Ecosystem Compatibility
Blocked by dependency
|
Important Maintainers: This PR contains Strings changes
|
david-allison
commented
Jan 9, 2025
|
|
||
| for (column in columnCollection.columns) { | ||
| Timber.d("setting up column %s", column) | ||
| TextView(this).apply { |
There was a problem hiding this comment.
Do we want a custom layout?
Comment on lines
+150
to
+162
| // setup back button handling | ||
| requireActivity().onBackPressedDispatcher.addCallback(onCloseDialogCallback) | ||
| requireActivity().onBackPressedDispatcher.addCallback(discardChangesCallback) | ||
|
|
||
| // stop the back button closing the dialog, and use the back dispatcher | ||
| this.isCancelable = false | ||
| dialog?.setOnKeyListener { _: DialogInterface?, keyCode: Int, e: KeyEvent? -> | ||
| if (keyCode == KeyEvent.KEYCODE_BACK) { | ||
| requireActivity().onBackPressedDispatcher.onBackPressed() | ||
| true | ||
| } | ||
| false | ||
| } |
There was a problem hiding this comment.
This feels janky, improvements requested
Comment on lines
+300
to
+338
| runBlocking { | ||
| var oldColumns: MutableList<CardBrowserColumn?> = mutableListOf() | ||
|
|
||
| // save the current columns | ||
| BrowserColumnCollection | ||
| .update(sharedPrefs(), cardsOrNotes) { cols -> | ||
| oldColumns = cols.toMutableList() | ||
| cols.clear() | ||
| cols.addAll(CardBrowserColumn.entries) | ||
| true | ||
| }?.apply { | ||
| withCol { backend.setActiveBrowserColumns(backendKeys) } | ||
| } | ||
|
|
||
| // obtain a sample row | ||
| sampleRow = withCol { browserRowForId(id.cardOrNoteId) } | ||
| Timber.d("got sample row") | ||
|
|
||
| // restore the past values | ||
| BrowserColumnCollection | ||
| .update(sharedPrefs(), cardsOrNotes) { cols -> | ||
| cols.clear() | ||
| cols.addAll(oldColumns) | ||
| true | ||
| }?.apply { | ||
| withCol { backend.setActiveBrowserColumns(backendKeys) } | ||
| } | ||
| } | ||
|
|
||
| return sampleRow | ||
| } |
There was a problem hiding this comment.
This isn't great, patches to make this more 'Kotlin' would be fantastic
Comment on lines
+95
to
+101
| // TODO: 4, 2, 1 on other | ||
| setPaddingRelative( | ||
| start = 3.dp, | ||
| top = 1.dp, | ||
| end = 3.dp, | ||
| bottom = 1.dp, | ||
| ) |
There was a problem hiding this comment.
This seems to work, but open for review
Comment on lines
+106
to
+112
| View(context).apply { | ||
| layoutParams = | ||
| LinearLayout.LayoutParams( | ||
| 0.5.dp.toPx(context), | ||
| LinearLayout.LayoutParams.MATCH_PARENT, | ||
| ) | ||
| setBackgroundResource(getResFromAttr(context, R.attr.cardBrowserDivider)) |
There was a problem hiding this comment.
Likewise: should these be layouts?
AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
Outdated
Show resolved
Hide resolved
AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt
Outdated
Show resolved
Hide resolved
This comment was marked as resolved.
This comment was marked as resolved.
david-allison
force-pushed
the
card-browser-column
branch
2 times, most recently
from
c84c591 to
cc173fb
Compare
We introduce BrowserColumnSelectionFragment: a full screen dialog which allows a user to select and reorder the available columns in the Browse window There are two headings: 'displayed' & 'available' Headings are implemented as RecyclerView items, so dragging feels natural. Headings may not be dragged. It has two primary functions: * Drag to reorder * +/- to quickly add/remove from 'displayed' A 'preview' is obtained from the first row of the Browse window If there are no rows, there is no preview Issue 17780
A user can long press the column headings or edit them from the options to add/remove multiple columns Issue 17780
If a user is editing options and changes 'cards/notes' then they should be editing columns for their provided selection If a user saves columns, then reverts the switch, columns should not be updated Issue 17780
david-allison
force-pushed
the
card-browser-column
branch
from
cc173fb to
a072fbc
Compare
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
Anki Desktop allows more than 2 columns in the Browse screen. Let's do the same for AnkiDroid
Fixes
Approach
The settings screen allows a user to reorder and 'select' usable columns
A full-screen dialog fragment with two headings: 'displayed' & 'available'
Headings are implemented as RecyclerView items, so dragging feels natural. Headings may not be dragged.
It has two primary functions:
A 'preview' is obtained from the first row of the Browse window. If there are no rows, there is no preview
How Has This Been Tested?
Unit tested, and tested on an API 32 emulator
Checklist