feat(browse): more than 2 columns #17781

david-allison · 2025-01-09T21:14:35Z

Purpose / Description

Anki Desktop allows more than 2 columns in the Browse screen. Let's do the same for AnkiDroid

Fixes

⚠️ This changes the default columns, I believe to match AnkiMobile

Approach

Remove 'column1' and 'column2' and instead use 'availableColumns'
Replace column spinners with TextViews, to allow more horizontal space
Either modify columns from the settings, or long press a header to open the options item
Add a settings screen
Move from a 'processing' popup to a LinearProgressBar

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:

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

How Has This Been Tested?

Unit tested, and tested on an API 32 emulator

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

github-actions · 2025-01-09T21:14:46Z

Important

Maintainers: This PR contains Strings changes

Sync Translations before merging this PR and wait for the action to complete
Review and merge the auto-generated PR in order to sync all user-submitted translations
Sync Translations again and merge the PR so the huge automated string changes caused by merging this PR are by themselves and easy to review

AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt

AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt

AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserMultiColumnAdapter.kt

david-allison · 2025-01-13T03:36:48Z

Thanks for getting to this! I've moved to layouts and removed the 'disabled' status for the checkmark

There's more to do with in-IDE layout previews (low priority. On me)

Fixed: animations

Also, leaving the columns selection fragment seems "abrupt", as there is no animation after leaving it (after all, it is just a Fragment being cleared of the backstack with no transition)

Help Wanted Requesting Pull Requests from volunteers . the following line blocks the fade animation:

Anki-Android/AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnSelectionFragment.kt

Lines 113 to 114 in 5676b32

    
           // fullscreen material dialog 
        
           setStyle(STYLE_NORMAL, com.google.android.material.R.style.MaterialAlertDialog_Material3)

This should use the main view if available

Prep for a variable column count * replace `setColumn1(` with `setColumn(0, ` Issue 17780

david-allison · 2025-01-20T17:53:12Z

I've also improved the onBackPressedDispatcher work, due to learnings from #17826

Using ComponentDialog.onBackPressedDispatcher

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: 'active' & '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 'active' 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

Added bonus: This means we can remove 'initCompleted' and don't need to handle flow re-subscription if the user moves from dark to light mode Fixes a bug in the Columns where the preview didn't remain if switching dark/light mode * make searchForCards non-blocking * stop refreshing searches unconditionally on state restore

* cards.reset() is no longer needed * onCleared is no longer needed： * It's called when the theme changes, and we didn't actually want this, as we wanted to persist the rows in the ViewModel

* After a collection change, `setActiveBrowserColumns` is reset * After a language change, column headers need to be updated Due to the language change, the activity goes through `onCreate`, so pick up this change on `onRestoreInstanceState` This was a good opportunity to decouple the column data and the column headings in the View Fixes 17803 Fixes 17367

lukstbit

Still LGTM, even better with the extension on the Dialog.

lukstbit · 2025-01-21T07:06:59Z

Did a strings sync in

Updated strings from Crowdin 2025/01/21 06:22 #17847

I'm out for now but will merge if not already done when I come back.

david-allison · 2025-01-21T07:25:35Z

Over the moon that we got this in before 2.21. Thank you both!!

github-actions · 2025-01-21T07:39:32Z

Maintainers: Please Sync Translations to produce a commit with only the automated changes from this PR.

Read more about updating strings on the wiki,

mikehardy · 2025-01-21T12:41:59Z

Ooooo smells like new alpha time :-)

snowtimeglass · 2025-01-28T09:11:48Z

Thanks for these great works!

Has the following change been withdrawn?

This has been updated to no longer show vertical dividers between the columns:

Originally posted by @david-allison in #17781 (comment)

(I skimmed through this PR page some times, but unfortunately could not find out what happened about it.)

david-allison · 2025-01-28T09:16:35Z

It was. I marked the comment as outdated, but should have communicated more. Apologies!

I felt that this PR would already be a huge change to get in, and didn't want to change functionality, especially if it would act as a rationale to drag out the review.

I figured it would be faster to do it in two PRs, and it's a trivial change now the PR is in.

Needs a little discussion, I'm pretty ambivalent but happy to implement it

snowtimeglass · 2025-01-28T22:49:08Z

Thank you for the clarification! I understand.

david-allison added Anki Ecosystem Compatibility Blocked by dependency Currently blocked by some other dependent / related change labels Jan 9, 2025

github-actions bot added the Strings label Jan 9, 2025

david-allison commented Jan 9, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

david-allison force-pushed the card-browser-column branch 3 times, most recently from cc173fb to a072fbc Compare January 10, 2025 00:16

github-actions bot added the Has Conflicts label Jan 11, 2025

david-allison force-pushed the card-browser-column branch 2 times, most recently from 7e1bf25 to 54a640a Compare January 11, 2025 22:14

This comment was marked as outdated.

Sign in to view

david-allison added Needs Review and removed Blocked by dependency Currently blocked by some other dependent / related change Has Conflicts labels Jan 11, 2025

This comment was marked as resolved.

Sign in to view

BrayanDSO added Needs Author Reply Waiting for a reply from the original author and removed Needs Review labels Jan 12, 2025

david-allison force-pushed the card-browser-column branch 3 times, most recently from 4a968f2 to 5676b32 Compare January 13, 2025 03:24

david-allison force-pushed the card-browser-column branch from 5676b32 to 3af3c04 Compare January 13, 2025 03:54

david-allison added Help Wanted Requesting Pull Requests from volunteers and removed Needs Author Reply Waiting for a reply from the original author labels Jan 13, 2025

david-allison requested a review from BrayanDSO January 13, 2025 19:56

david-allison force-pushed the card-browser-column branch 3 times, most recently from 651e63e to b01dba5 Compare January 13, 2025 23:21

david-allison added 2 commits January 20, 2025 17:15

fix: DialogFragment.showSnackbar

ffb4f23

This should use the main view if available

refactor: remove hardcoded columns

b0747c3

Prep for a variable column count * replace `setColumn1(` with `setColumn(0, ` Issue 17780

david-allison force-pushed the card-browser-column branch 2 times, most recently from 21946d8 to 9141054 Compare January 20, 2025 17:51

david-allison added 6 commits January 20, 2025 20:33

feat(browser): implement 'Manage columns'

6950975

A user can long press the column headings or edit them from the options to add/remove multiple columns Issue 17780

improvement(browser-columns): allow cards/notes mismatch

40f0345

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

fix(browse): theme change with no state refresh

1ec7d39

* cards.reset() is no longer needed * onCleared is no longer needed： * It's called when the theme changes, and we didn't actually want this, as we wanted to persist the rows in the ViewModel

david-allison force-pushed the card-browser-column branch from 9141054 to 9d80674 Compare January 20, 2025 20:33

lukstbit approved these changes Jan 21, 2025

View reviewed changes

david-allison added this pull request to the merge queue Jan 21, 2025

Merged via the queue into ankidroid:main with commit 3ea835e Jan 21, 2025
9 checks passed

github-actions bot added this to the 2.21 release milestone Jan 21, 2025

github-actions bot removed Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) Review High Priority Request for high priority review labels Jan 21, 2025

david-allison mentioned this pull request Jan 21, 2025

Updated strings from Crowdin 2025/01/21 07:48 #17849

Merged

david-allison mentioned this pull request Jan 22, 2025

CardBrowser RecyclerView IndexOutOfBoundsException #17759

Open

4 tasks

david-allison deleted the card-browser-column branch January 27, 2025 20:50

david-allison mentioned this pull request Feb 2, 2025

[UX Regression]: Card Browser - two taps to change column #17910

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(browse): more than 2 columns #17781

feat(browse): more than 2 columns #17781

david-allison commented Jan 9, 2025 •

edited

Loading

github-actions bot commented Jan 9, 2025

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as resolved.

david-allison commented Jan 13, 2025 •

edited

Loading

david-allison commented Jan 20, 2025 •

edited

Loading

lukstbit left a comment

lukstbit commented Jan 21, 2025

david-allison commented Jan 21, 2025 •

edited

Loading

github-actions bot commented Jan 21, 2025

mikehardy commented Jan 21, 2025

snowtimeglass commented Jan 28, 2025 •

edited

Loading

david-allison commented Jan 28, 2025

snowtimeglass commented Jan 28, 2025 •

edited

Loading

feat(browse): more than 2 columns #17781

feat(browse): more than 2 columns #17781

Conversation

david-allison commented Jan 9, 2025 • edited Loading

Purpose / Description

Fixes

Approach

How Has This Been Tested?

Checklist

github-actions bot commented Jan 9, 2025

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as resolved.

david-allison commented Jan 13, 2025 • edited Loading

david-allison commented Jan 20, 2025 • edited Loading

lukstbit left a comment

Choose a reason for hiding this comment

lukstbit commented Jan 21, 2025

david-allison commented Jan 21, 2025 • edited Loading

github-actions bot commented Jan 21, 2025

mikehardy commented Jan 21, 2025

snowtimeglass commented Jan 28, 2025 • edited Loading

david-allison commented Jan 28, 2025

snowtimeglass commented Jan 28, 2025 • edited Loading

david-allison commented Jan 9, 2025 •

edited

Loading

david-allison commented Jan 13, 2025 •

edited

Loading

david-allison commented Jan 20, 2025 •

edited

Loading

david-allison commented Jan 21, 2025 •

edited

Loading

snowtimeglass commented Jan 28, 2025 •

edited

Loading

snowtimeglass commented Jan 28, 2025 •

edited

Loading