Moving calculateTopOffset in CardBrowser.kt

Author: Scapesfear

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

@@ -341,7 +341,8 @@ open class CardBrowser :
         launchCatchingTask {
             if (viewModel.isInMultiSelectMode) {
                 viewModel.toggleRowSelection(id)
-                viewModel.saveScrollingState(cardsListView, id)
+                viewModel.saveScrollingState(id)
+                viewModel.oldCardTopOffset = calculateTopOffset(viewModel.lastSelectedPosition)
             } else {
                 val cardId = viewModel.queryDataForCardEdit(id)
                 openNoteEditorForCard(cardId)
@@ -354,7 +355,8 @@ open class CardBrowser :
         if (viewModel.isInMultiSelectMode && viewModel.lastSelectedId != null) {
             viewModel.selectRowsBetween(viewModel.lastSelectedId!!, id)
         } else {
-            viewModel.saveScrollingState(cardsListView, id)
+            viewModel.saveScrollingState(id)
+            viewModel.oldCardTopOffset = calculateTopOffset(viewModel.lastSelectedPosition)
             viewModel.toggleRowSelection(id)
         }
     }
@@ -1914,6 +1916,13 @@ open class CardBrowser :
         ): Intent = NoteEditorLauncher.AddNoteFromCardBrowser(viewModel).getIntent(context)
     }
 
+    private fun calculateTopOffset(cardPosition: Int): Int {
+        val layoutManager = cardsListView.layoutManager as LinearLayoutManager
+        val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
+        val view = cardsListView.getChildAt(cardPosition - firstVisiblePosition)
+        return view?.top ?: 0
+    }
+
     private fun autoScrollTo(
         newPosition: Int,
         offset: Int,

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

@@ -24,8 +24,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import anki.collection.OpChanges
 import anki.collection.OpChangesWithCount
 import anki.search.BrowserColumns
@@ -908,17 +906,9 @@ class CardBrowserViewModel(
         ) : SearchState
     }
 
-    fun saveScrollingState(
-        recyclerView: RecyclerView,
-        id: CardOrNoteId,
-    ) {
+    fun saveScrollingState(id: CardOrNoteId) {
         cards.indexOf(id).takeIf { it >= 0 }?.let { position ->
-            val layoutManager = recyclerView.layoutManager as LinearLayoutManager
-            val firstVisiblePosition = layoutManager.findFirstVisibleItemPosition()
-            val cardView = recyclerView.getChildAt(position - firstVisiblePosition)
-
             lastSelectedPosition = position
-            oldCardTopOffset = cardView?.top ?: 0
         }
     }
 }