fix(card-browser): only show focus if fragmented

Author: david-allison

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

@@ -158,6 +158,12 @@ open class CardBrowser :
         }
     }
 
+    override var fragmented: Boolean
+        get() = viewModel.isFragmented
+        set(value) {
+            throw UnsupportedOperationException()
+        }
+
     private enum class TagsDialogListenerAction {
         FILTER,
         EDIT_TAGS,
@@ -367,8 +373,6 @@ open class CardBrowser :
         )
 
         val launchOptions = intent?.toCardBrowserLaunchOptions() // must be called after super.onCreate()
-        // must be called once we have an accessible collection
-        viewModel = createViewModel(launchOptions)
 
         setContentView(R.layout.card_browser)
         initNavigationDrawer(findViewById(android.R.id.content))
@@ -381,10 +385,11 @@ open class CardBrowser :
          * [fragmented] will be true if the view size is large otherwise false
          */
         // TODO: Consider refactoring by storing noteEditorFrame and similar views in a sealed class (e.g., FragmentAccessor).
-        fragmented =
-            (noteEditorFrame?.visibility == View.VISIBLE).apply {
-                Timber.i("Using split Browser: %b", fragmented)
-            }
+        val fragmented = noteEditorFrame?.visibility == View.VISIBLE
+        Timber.i("Using split Browser: %b", fragmented)
+
+        // must be called once we have an accessible collection
+        viewModel = createViewModel(launchOptions, fragmented)
 
         supportFragmentManager.commit {
             replace(R.id.card_browser_frame, CardBrowserFragment())
@@ -843,7 +848,7 @@ open class CardBrowser :
     @NeedsTest("note edits are saved")
     @NeedsTest("I/O edits are saved")
     fun openNoteEditorForCard(cardId: CardId) {
-        viewModel.handleCardSelection(cardId, fragmented)
+        viewModel.handleCardSelection(cardId)
     }
 
     /**
@@ -1780,17 +1785,22 @@ open class CardBrowser :
      *
      * @see showedActivityFailedScreen - we may not have AnkiDroidApp.instance and therefore can't
      * create the ViewModel
+     *
+     * @param fragmented True if `noteEditorFrame` is non-null (x-large displays)
      */
-    private fun createViewModel(launchOptions: CardBrowserLaunchOptions?) =
-        ViewModelProvider(
-            viewModelStore,
-            CardBrowserViewModel.factory(
-                lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
-                cacheDir = cacheDir,
-                options = launchOptions,
-            ),
-            defaultViewModelCreationExtras,
-        )[CardBrowserViewModel::class.java]
+    private fun createViewModel(
+        launchOptions: CardBrowserLaunchOptions?,
+        fragmented: Boolean,
+    ) = ViewModelProvider(
+        viewModelStore,
+        CardBrowserViewModel.factory(
+            lastDeckIdRepository = AnkiDroidApp.instance.sharedPrefsLastDeckIdRepository,
+            cacheDir = cacheDir,
+            options = launchOptions,
+            isFragmented = fragmented,
+        ),
+        defaultViewModelCreationExtras,
+    )[CardBrowserViewModel::class.java]
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
     fun filterByTag(vararg tags: String) {

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

@@ -60,7 +60,7 @@ abstract class NavigationDrawerActivity :
     /**
      * Navigation Drawer
      */
-    var fragmented = false
+    open var fragmented = false
         protected set
     private var navButtonGoesBack = false
 

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

@@ -95,6 +95,15 @@ import kotlin.math.max
 import kotlin.math.min
 
 // TODO: move the tag computation to ViewModel
+
+/**
+ * @param lastDeckIdRepository returns the last selected ID. See [LastDeckIdRepository]
+ * @param cacheDir Temporary location to store data too large to pass via intent
+ * @param options Options passed to CardBrowser on startup
+ * @param preferences Accessor for `SharedPreferences`
+ * @param isFragmented `true` if a NoteEditor side panel is displayed (x-large displays)
+ * @param manualInit test-only: defer `initCompleted` until `manualInit()` is called
+ */
 @NeedsTest("reverseDirectionFlow/sortTypeFlow are not updated on .launch { }")
 @NeedsTest("columIndex1/2 config is not not updated on init")
 @NeedsTest("13442: selected deck is not changed, as this affects the reviewer")
@@ -105,6 +114,7 @@ class CardBrowserViewModel(
     private val cacheDir: File,
     options: CardBrowserLaunchOptions?,
     preferences: SharedPreferencesProvider,
+    val isFragmented: Boolean,
     private val manualInit: Boolean = false,
 ) : ViewModel(),
     SharedPreferencesProvider by preferences {
@@ -213,6 +223,10 @@ class CardBrowserViewModel(
     val flowOfCardStateChanged = MutableSharedFlow<Unit>()
 
     var focusedRow: CardOrNoteId? = null
+        set(value) {
+            if (!isFragmented) return
+            field = value
+        }
 
     suspend fun queryAllSelectedCardIds() = selectedRows.queryCardIds(this.cardsOrNotes)
 
@@ -451,11 +465,8 @@ class CardBrowserViewModel(
             rowLongPressFocusFlow.emit(id)
         }
 
-    fun handleCardSelection(
-        cardId: CardId,
-        fragmented: Boolean,
-    ) {
-        createCardSelector(this)(cardId, fragmented)
+    fun handleCardSelection(cardId: CardId) {
+        createCardSelector(this)(cardId, isFragmented)
     }
 
     /** Whether any rows are selected */
@@ -1130,6 +1141,7 @@ class CardBrowserViewModel(
         fun factory(
             lastDeckIdRepository: LastDeckIdRepository,
             cacheDir: File,
+            isFragmented: Boolean,
             preferencesProvider: SharedPreferencesProvider? = null,
             options: CardBrowserLaunchOptions?,
         ) = viewModelFactory {
@@ -1139,6 +1151,7 @@ class CardBrowserViewModel(
                     cacheDir,
                     options,
                     preferencesProvider ?: AnkiDroidApp.sharedPreferencesProvider,
+                    isFragmented,
                 )
             }
         }

AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt

@@ -588,7 +588,7 @@ class CardBrowserViewModelTest : JvmTest() {
     fun `suspend - notes - some cards suspended`() =
         runViewModelNotesTest(notes = 2) {
             // this suspends o single cid from a nid
-            suspend(cards.first().toCardId(cardsOrNotes))
+            suspend(cards.first().toCardId(cardsOrNotes) as CardId)
             ensureOpsExecuted(1) {
                 selectAll()
                 toggleSuspendCards()
@@ -1054,6 +1054,7 @@ class CardBrowserViewModelTest : JvmTest() {
                 cacheDir = createTransientDirectory(),
                 options = null,
                 preferences = AnkiDroidApp.sharedPreferencesProvider,
+                isFragmented = false,
                 manualInit = manualInit,
             )
         // makes ignoreValuesFromViewModelLaunch work under test
@@ -1078,6 +1079,7 @@ class CardBrowserViewModelTest : JvmTest() {
                 cacheDir = createTransientDirectory(),
                 options = null,
                 preferences = AnkiDroidApp.sharedPreferencesProvider,
+                isFragmented = false,
                 manualInit = manualInit,
             )
         // makes ignoreValuesFromViewModelLaunch work under test
@@ -1107,7 +1109,13 @@ class CardBrowserViewModelTest : JvmTest() {
             }
 
             val cache = File(createTempDirectory().pathString)
-            return CardBrowserViewModel(lastDeckIdRepository, cache, intent, AnkiDroidApp.sharedPreferencesProvider).apply {
+            return CardBrowserViewModel(
+                lastDeckIdRepository = lastDeckIdRepository,
+                cacheDir = cache,
+                options = intent,
+                isFragmented = false,
+                preferences = AnkiDroidApp.sharedPreferencesProvider,
+            ).apply {
                 invokeInitialSearch()
             }
         }