mirror of
https://github.com/ankidroid/Anki-Android.git
synced 2024-09-20 03:52:15 +02:00
Refactor to use Collection parameter in onCollectionLoaded callback
This commit is contained in:
parent
9024e6629b
commit
44a3850d29
@ -539,7 +539,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
|
||||
// Load reference to action bar title
|
||||
mActionBarTitle = findViewById(R.id.toolbar_title)
|
||||
mOrder = CARD_ORDER_NONE
|
||||
val colOrder = getCol().get_config_string("sortType")
|
||||
val colOrder = col.get_config_string("sortType")
|
||||
for (c in fSortTypes.indices) {
|
||||
if (fSortTypes[c] == colOrder) {
|
||||
mOrder = c
|
||||
@ -553,7 +553,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
|
||||
// setConf. However older version of AnkiDroid didn't call
|
||||
// upgradeJSONIfNecessary during setConf, which means the
|
||||
// conf saved may still have this bug.
|
||||
mOrderAsc = upgradeJSONIfNecessary(getCol(), "sortBackwards", false)
|
||||
mOrderAsc = upgradeJSONIfNecessary(col, "sortBackwards", false)
|
||||
mCards.reset()
|
||||
mCardsListView = findViewById(R.id.card_browser_list)
|
||||
// Create a spinner for column1
|
||||
@ -675,7 +675,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
|
||||
true
|
||||
}
|
||||
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
|
||||
val deckId = getCol().decks.selected()
|
||||
val deckId = col.decks.selected()
|
||||
mDeckSpinnerSelection = DeckSpinnerSelection(
|
||||
this, col, findViewById(R.id.toolbar_spinner),
|
||||
showAllDecks = true, alwaysShowDefault = false
|
||||
@ -698,7 +698,7 @@ open class CardBrowser : NavigationDrawerActivity(), SubtitleListener, DeckSelec
|
||||
mRestrictOnDeck = if (deckId == ALL_DECKS_ID) {
|
||||
""
|
||||
} else {
|
||||
val deckName = col.decks.name(deckId)
|
||||
val deckName = col!!.decks.name(deckId)
|
||||
"deck:\"$deckName\" "
|
||||
}
|
||||
saveLastDeckId(deckId)
|
||||
|
@ -235,7 +235,7 @@ open class CardTemplatePreviewer : AbstractFlashcardViewer() {
|
||||
// loading from the note editor
|
||||
val toPreview = setCurrentCardFromNoteEditorBundle(col)
|
||||
if (toPreview != null) {
|
||||
mTemplateCount = getCol().findTemplates(toPreview.note()).size
|
||||
mTemplateCount = col.findTemplates(toPreview.note()).size
|
||||
if (mTemplateCount >= 2) {
|
||||
mPreviewLayout!!.showNavigationButtons()
|
||||
}
|
||||
|
@ -348,7 +348,7 @@ open class Reviewer : AbstractFlashcardViewer() {
|
||||
setWhiteboardVisibility(whiteboardVisibility)
|
||||
}
|
||||
col.sched.deferReset() // Reset schedule in case card was previously loaded
|
||||
getCol().startTimebox()
|
||||
col.startTimebox()
|
||||
GetCard().runWithHandler(answerCardHandler(false))
|
||||
disableDrawerSwipeOnConflicts()
|
||||
// Add a weak reference to current activity so that scheduler can talk to to Activity
|
||||
|
@ -108,7 +108,7 @@ class Statistics : NavigationDrawerActivity(), DeckSelectionListener, SubtitleLi
|
||||
invalidateOptionsMenu()
|
||||
// StatisticFragment.updateAllFragments();
|
||||
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
|
||||
else -> Timber.w("Unknown defaultDeck: %s", defaultDeck)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user