-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature: Allow changing deck name in statistics screen
- Loading branch information
1 parent
f145def
commit 9d2531b
Showing
6 changed files
with
208 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
AnkiDroid/src/main/java/com/ichi2/anki/DeckMaterialButtonSelection.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
/* | ||
* Copyright (c) 2024 Ashish Yadav <mailtoashish693@gmail.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it under | ||
* the terms of the GNU General Public License as published by the Free Software | ||
* Foundation; either version 3 of the License, or (at your option) any later | ||
* version. | ||
* | ||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY | ||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
* PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
package com.ichi2.anki | ||
|
||
import androidx.annotation.MainThread | ||
import androidx.appcompat.app.AppCompatActivity | ||
import com.google.android.material.button.MaterialButton | ||
import com.ichi2.anki.dialogs.DeckSelectionDialog | ||
import com.ichi2.anki.dialogs.DeckSelectionDialog.SelectableDeck.Companion.fromCollection | ||
import com.ichi2.anki.widgets.DeckDropDownAdapter | ||
import com.ichi2.libanki.Collection | ||
import com.ichi2.libanki.DeckNameId | ||
import com.ichi2.utils.FragmentManagerSupplier | ||
import com.ichi2.utils.asFragmentManagerSupplier | ||
import timber.log.Timber | ||
|
||
/** | ||
* Handles deck selection using a MaterialButton. | ||
* Decks are selected from a dialog displayed when the MaterialButton is clicked. | ||
* | ||
* @param context The context of the Activity | ||
* @param materialButton The MaterialButton used for deck selection. | ||
* @param showAllDecks Indicates whether to show all decks including filtered ones. | ||
*/ | ||
class DeckMaterialButtonSelection( | ||
private val context: AppCompatActivity, | ||
private val materialButton: MaterialButton, | ||
private val showAllDecks: Boolean | ||
) { | ||
|
||
private val fragmentManagerSupplier: FragmentManagerSupplier = context.asFragmentManagerSupplier() | ||
|
||
private var deckDropDownAdapter: DeckDropDownAdapter? = null | ||
|
||
private lateinit var dropDownDecks: MutableList<DeckNameId> | ||
|
||
@MainThread | ||
fun initializeNoteEditorDeckMaterialButton(col: Collection) { | ||
dropDownDecks = computeDropDownDecks(col).toMutableList() | ||
setMaterialButtonListener() | ||
} | ||
|
||
private fun computeDropDownDecks(col: Collection): List<DeckNameId> = | ||
col.decks.allNamesAndIds(includeFiltered = false) | ||
|
||
private fun setMaterialButtonListener() { | ||
materialButton.setOnClickListener { | ||
context.launchCatchingTask { displayDeckSelectionDialog() } | ||
} | ||
} | ||
|
||
private suspend fun displayDeckSelectionDialog() { | ||
val decks = fromCollection(includeFiltered = false).toMutableList() | ||
if (showAllDecks) { | ||
decks.add( | ||
DeckSelectionDialog.SelectableDeck( | ||
ALL_DECKS_ID, | ||
context.resources.getString(R.string.card_browser_all_decks) | ||
) | ||
) | ||
} | ||
val dialog = DeckSelectionDialog.newInstance(context.getString(R.string.search_deck), null, false, decks) | ||
dialog.deckCreationListener = DeckSelectionDialog.DeckCreationListener { onDeckAdded(it) } | ||
AnkiActivity.showDialogFragment(fragmentManagerSupplier.getFragmentManager(), dialog) | ||
} | ||
|
||
private fun onDeckAdded(deck: DeckNameId) { | ||
Timber.d("added deck %s to MaterialButton", deck) | ||
deckDropDownAdapter?.addDeck(deck) | ||
dropDownDecks.add(deck) | ||
} | ||
|
||
companion object { | ||
const val ALL_DECKS_ID = 0L | ||
} | ||
} |
79 changes: 79 additions & 0 deletions
79
AnkiDroid/src/main/java/com/ichi2/anki/StatisticsActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/* | ||
* Copyright (c) 2024 Ashish Yadav <mailtoashish693@gmail.com> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it under | ||
* the terms of the GNU General Public License as published by the Free Software | ||
* Foundation; either version 3 of the License, or (at your option) any later | ||
* version. | ||
* | ||
* This program is distributed in the hope that it will be useful, but WITHOUT ANY | ||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
* PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License along with | ||
* this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
package com.ichi2.anki | ||
|
||
import android.content.Context | ||
import android.content.Intent | ||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.Fragment | ||
import androidx.lifecycle.MutableLiveData | ||
import com.google.android.material.button.MaterialButton | ||
import com.ichi2.anki.dialogs.DeckSelectionDialog | ||
import com.ichi2.libanki.Collection | ||
import com.ichi2.libanki.DeckId | ||
import kotlin.reflect.KClass | ||
import kotlin.reflect.jvm.jvmName | ||
|
||
/** | ||
* Handles changing of deck in Statistics webview | ||
* | ||
* Based in [SingleFragmentActivity], but with `configChanges="orientation|screenSize"` | ||
* to avoid unwanted activity recreations | ||
*/ | ||
class StatisticsActivity : SingleFragmentActivity(), DeckSelectionDialog.DeckSelectionListener { | ||
|
||
private var deckMaterialSelection: DeckMaterialButtonSelection? = null | ||
var deckId: DeckId = 0 | ||
var deckNameLive = MutableLiveData<String>() | ||
private var collection: Collection? = null | ||
|
||
override fun onCollectionLoaded(col: Collection) { | ||
super.onCollectionLoaded(col) | ||
collection = col | ||
} | ||
|
||
fun setupDeckSelector(button: MaterialButton) { | ||
button.visibility = View.VISIBLE | ||
startLoadingCollection() | ||
deckMaterialSelection = DeckMaterialButtonSelection( | ||
this, | ||
button, | ||
showAllDecks = true | ||
).apply { | ||
collection?.let { initializeNoteEditorDeckMaterialButton(it) } | ||
} | ||
} | ||
|
||
override fun onDeckSelected(deck: DeckSelectionDialog.SelectableDeck?) { | ||
if (deck == null) { | ||
return | ||
} | ||
deckNameLive.value = deck.name | ||
deckId = deck.deckId | ||
} | ||
|
||
companion object { | ||
|
||
fun getIntent(context: Context, fragmentClass: KClass<out Fragment>, arguments: Bundle? = null): Intent { | ||
return Intent(context, StatisticsActivity::class.java).apply { | ||
putExtra(FRAGMENT_NAME_EXTRA, fragmentClass.jvmName) | ||
putExtra(FRAGMENT_ARGS_EXTRA, arguments) | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters