mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Code

fixed: deck search not scrolling to current deck in statistics (#12030)

Browse Source 
* fixed: deck search not scrolling to current deck in statistics
This commit is contained in:
Shubham kumar yadav 2022-08-29 05:12:56 +05:30 committed by GitHub
parent 8721e8ac30
commit 0fb16b89cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AnkiDroid/src/main/java/com/ichi2/anki/DeckSpinnerSelection.kt
View File

@ -238,6 +238,10 @@ class DeckSpinnerSelection(
decks.removeIf { x: SelectableDeck -> x.deckId == Consts.DEFAULT_DECK_ID }
}
val dialog = DeckSelectionDialog.newInstance(context.getString(R.string.search_deck), null, false, decks)
val did: DeckId? = (context as? Statistics)?.getCurrentDeckId()
if (did != null) {
dialog.requireArguments().putLong("currentDeckId", did)
}
AnkiActivity.showDialogFragment(mFragmentManagerSupplier.getFragmentManager(), dialog)
}

4
AnkiDroid/src/main/java/com/ichi2/anki/Statistics.kt
View File

@ -489,6 +489,10 @@ class Statistics : NavigationDrawerActivity(), DeckSelectionListener, SubtitleLi
}
}
fun getCurrentDeckId(): DeckId {
return mStatsDeckId
}
companion object {
const val TODAYS_STATS_TAB_POSITION = 0
const val FORECAST_TAB_POSITION = 1

12
AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckSelectionDialog.kt
View File

@ -94,6 +94,11 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
val adapter = DecksArrayAdapter(decks)
recyclerView.adapter = adapter
adjustToolbar(dialogView, adapter)
val args = requireArguments()
if (args.containsKey("currentDeckId")) {
val did = args.getLong("currentDeckId")
recyclerView.scrollToPosition(getPositionOfDeck(did, adapter.getCurrentlyDisplayedDecks()))
}
mDialog = MaterialDialog(requireActivity())
.neutralButton(R.string.dialog_cancel) // Shouldn't it be negative button?
.customView(view = dialogView, noVerticalPadding = true)
@ -105,6 +110,9 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
return mDialog!!
}
private fun getPositionOfDeck(did: DeckId, decks: List<SelectableDeck>) =
decks.indexOfFirst { it.deckId == did }
private fun getSummaryMessage(arguments: Bundle): String? {
return arguments.getString(SUMMARY_MESSAGE)
}
@ -282,6 +290,10 @@ open class DeckSelectionDialog : AnalyticsDialogFragment() {
return DecksFilter()
}
fun getCurrentlyDisplayedDecks(): List<SelectableDeck> {
return mCurrentlyDisplayedDecks
}
private inner class DecksFilter : TypedFilter<SelectableDeck>(mAllDecksList) {
override fun filterResults(constraint: CharSequence, items: List<SelectableDeck>): List<SelectableDeck> {
val filterPattern = constraint.toString().lowercase(Locale.getDefault()).trim { it <= ' ' }