refactor(card-browser): inline cardsListView

Author: david-allison

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

@@ -49,8 +49,6 @@ import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import anki.collection.OpChanges
 import com.google.android.material.snackbar.Snackbar
 import com.ichi2.anim.ActivityTransitionAnimation.Direction
@@ -183,9 +181,6 @@ open class CardBrowser :
 
     private lateinit var deckSpinnerSelection: DeckSpinnerSelection
 
-    @VisibleForTesting
-    val cardsListView: RecyclerView
-        get() = cardBrowserFragment.cardsListView
     private var searchView: CardBrowserSearchView? = null
 
     @VisibleForTesting
@@ -561,15 +556,13 @@ open class CardBrowser :
                 // Due to the ripple on long press, we set padding
                 browserColumnHeadings.updatePaddingRelative(start = 48.dp)
                 multiSelectOnBackPressedCallback.isEnabled = true
-                autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
             } else {
                 Timber.d("end multiselect mode")
                 refreshSubtitle()
                 deckSpinnerSelection.setSpinnerVisibility(View.VISIBLE)
                 actionBarTitle.visibility = View.GONE
                 browserColumnHeadings.updatePaddingRelative(start = 0.dp)
                 multiSelectOnBackPressedCallback.isEnabled = false
-                autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
             }
             // reload the actionbar using the multi-select mode actionbar
             invalidateOptionsMenu()
@@ -967,7 +960,6 @@ open class CardBrowser :
     override fun onResume() {
         super.onResume()
         selectNavigationItem(R.id.nav_browser)
-        autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
         searchView?.post {
             hideKeyboard()
         }
@@ -1945,13 +1937,6 @@ open class CardBrowser :
             inFragmentedActivity: Boolean = false,
         ): NoteEditorLauncher = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel, inFragmentedActivity)
     }
-
-    private fun autoScrollTo(
-        newPosition: Int,
-        offset: Int,
-    ) {
-        (cardsListView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(newPosition, offset)
-    }
 }
 
 suspend fun searchForRows(

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

@@ -97,6 +97,11 @@ class CardBrowserFragment :
         setupFlows()
     }
 
+    override fun onResume() {
+        super.onResume()
+        autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
+    }
+
     @Suppress("UNUSED_PARAMETER", "unused")
     private fun setupFlows() {
         fun onIsTruncatedChanged(isTruncated: Boolean) = cardsAdapter.notifyDataSetChanged()
@@ -111,6 +116,7 @@ class CardBrowserFragment :
         fun isInMultiSelectModeChanged(inMultiSelect: Boolean) {
             // update adapter to remove check boxes
             cardsAdapter.notifyDataSetChanged()
+            autoScrollTo(viewModel.lastSelectedPosition, viewModel.oldCardTopOffset)
         }
 
         fun searchStateChanged(searchState: SearchState) {
@@ -188,6 +194,13 @@ class CardBrowserFragment :
         return view?.top ?: 0
     }
 
+    private fun autoScrollTo(
+        newPosition: Int,
+        offset: Int,
+    ) {
+        (cardsListView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(newPosition, offset)
+    }
+
     private fun requireCardBrowserActivity(): CardBrowser = requireActivity() as CardBrowser
 
     // TODO: Move this to an extension method once we have context parameters

AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt

@@ -1698,8 +1698,14 @@ fun TestClass.flagCardForNote(
 
 fun CardBrowser.getVisibleRows() =
     sequence {
+        val cardsListView = cardBrowserFragment.cardsListView
         for (i in 0 until (cardsListView.childCount)) {
-            val row = cardsListView.getChildViewHolder(cardsListView.getChildAt(i))
+            val row =
+                cardsListView.getChildViewHolder(
+                    cardsListView.getChildAt(
+                        i,
+                    ),
+                )
             yield(row as BrowserMultiColumnAdapter.MultiColumnViewHolder)
         }
     }.toList().also {