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

Refactor to use Collection parameter in onCollectionLoaded callback

Browse Source
This commit is contained in:
lukstbit 2022-05-20 16:14:17 +03:00 committed by Arthur Milchior
parent 9024e6629b
commit 44a3850d29
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
View File

@ -539,7 +539,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
// Load reference to action bar title // Load reference to action bar title
mActionBarTitle = findViewById(R.id.toolbar_title) mActionBarTitle = findViewById(R.id.toolbar_title)
mOrder = CARD_ORDER_NONE mOrder = CARD_ORDER_NONE
val colOrder = getCol().get_config_string("sortType") val colOrder = col.get_config_string("sortType")
for (c in fSortTypes.indices) { for (c in fSortTypes.indices) {
if (fSortTypes[c] == colOrder) { if (fSortTypes[c] == colOrder) {
mOrder = c mOrder = c
@ -553,7 +553,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
// setConf. However older version of AnkiDroid didn't call // setConf. However older version of AnkiDroid didn't call
// upgradeJSONIfNecessary during setConf, which means the // upgradeJSONIfNecessary during setConf, which means the
// conf saved may still have this bug. // conf saved may still have this bug.
mOrderAsc = upgradeJSONIfNecessary(getCol(), "sortBackwards", false) mOrderAsc = upgradeJSONIfNecessary(col, "sortBackwards", false)
mCards.reset() mCards.reset()
mCardsListView = findViewById(R.id.card_browser_list) mCardsListView = findViewById(R.id.card_browser_list)
// Create a spinner for column1 // Create a spinner for column1
@ -675,7 +675,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
true true
} }
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
val deckId = getCol().decks.selected() val deckId = col.decks.selected()
mDeckSpinnerSelection = DeckSpinnerSelection( mDeckSpinnerSelection = DeckSpinnerSelection(
this, col, findViewById(R.id.toolbar_spinner), this, col, findViewById(R.id.toolbar_spinner),
showAllDecks = true, alwaysShowDefault = false showAllDecks = true, alwaysShowDefault = false
@ -698,7 +698,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
mRestrictOnDeck = if (deckId == ALL_DECKS_ID) { mRestrictOnDeck = if (deckId == ALL_DECKS_ID) {
"" ""
} else { } else {
val deckName = col.decks.name(deckId) val deckName = col!!.decks.name(deckId)
"deck:\"$deckName\" " "deck:\"$deckName\" "
} }
saveLastDeckId(deckId) saveLastDeckId(deckId)

2
AnkiDroid/src/main/java/com/ichi2/anki/CardTemplatePreviewer.kt
View File

@ -235,7 +235,7 @@ open class CardTemplatePreviewer : AbstractFlashcardViewer() {
// loading from the note editor // loading from the note editor
val toPreview = setCurrentCardFromNoteEditorBundle(col) val toPreview = setCurrentCardFromNoteEditorBundle(col)
if (toPreview != null) { if (toPreview != null) {
mTemplateCount = getCol().findTemplates(toPreview.note()).size mTemplateCount = col.findTemplates(toPreview.note()).size
if (mTemplateCount >= 2) { if (mTemplateCount >= 2) {
mPreviewLayout!!.showNavigationButtons() mPreviewLayout!!.showNavigationButtons()
} }

2
AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
View File

@ -348,7 +348,7 @@ open class Reviewer : AbstractFlashcardViewer() {
setWhiteboardVisibility(whiteboardVisibility) setWhiteboardVisibility(whiteboardVisibility)
} }
col.sched.deferReset() // Reset schedule in case card was previously loaded col.sched.deferReset() // Reset schedule in case card was previously loaded
getCol().startTimebox() col.startTimebox()
GetCard().runWithHandler(answerCardHandler(false)) GetCard().runWithHandler(answerCardHandler(false))
disableDrawerSwipeOnConflicts() disableDrawerSwipeOnConflicts()
// Add a weak reference to current activity so that scheduler can talk to to Activity // Add a weak reference to current activity so that scheduler can talk to to Activity

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

@ -108,7 +108,7 @@ class Statistics : NavigationDrawerActivity(), DeckSelectionListener, SubtitleLi
invalidateOptionsMenu() invalidateOptionsMenu()
// StatisticFragment.updateAllFragments(); // StatisticFragment.updateAllFragments();
when (val defaultDeck = AnkiDroidApp.getSharedPrefs(this).getString("stats_default_deck", "current")) { when (val defaultDeck = AnkiDroidApp.getSharedPrefs(this).getString("stats_default_deck", "current")) {
"current" -> mStatsDeckId = getCol().decks.selected() "current" -> mStatsDeckId = col.decks.selected()
"all" -> mStatsDeckId = Stats.ALL_DECKS_ID "all" -> mStatsDeckId = Stats.ALL_DECKS_ID
else -> Timber.w("Unknown defaultDeck: %s", defaultDeck) else -> Timber.w("Unknown defaultDeck: %s", defaultDeck)
} }