Skip to content

Commit 1bffa80

Browse files
lukstbitdavid-allison
authored andcommitted
Remove previous filtered deck options related code
1 parent ab65a75 commit 1bffa80

13 files changed

Lines changed: 2 additions & 1207 deletions

AnkiDroid/src/main/AndroidManifest.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,6 @@
401401
<category android:name="android.intent.category.MONKEY" />
402402
</intent-filter>
403403
</activity>
404-
<activity
405-
android:name=".FilteredDeckOptions"
406-
android:label="@string/deckpreferences_title"
407-
android:exported="false"
408-
android:configChanges="keyboardHidden|orientation|screenSize"
409-
android:theme="@style/Theme_Light"
410-
/>
411404
<activity
412405
android:name="com.ichi2.anki.Info"
413406
android:label="@string/pref_cat_about_title"

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

Lines changed: 0 additions & 472 deletions
This file was deleted.

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CreateDeckDialog.kt

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.annotation.VisibleForTesting
2424
import androidx.appcompat.app.AlertDialog
2525
import com.google.android.material.snackbar.Snackbar
2626
import com.ichi2.anki.CollectionManager
27-
import com.ichi2.anki.CollectionManager.withCol
2827
import com.ichi2.anki.R
2928
import com.ichi2.anki.common.annotations.NeedsTest
3029
import com.ichi2.anki.libanki.Collection
@@ -62,7 +61,6 @@ class CreateDeckDialog(
6261
private var shownDialog: AlertDialog? = null
6362

6463
enum class DeckDialogType {
65-
FILTERED_DECK,
6664
DECK,
6765
SUB_DECK,
6866
RENAME_DECK,
@@ -71,15 +69,6 @@ class CreateDeckDialog(
7169
private val getColUnsafe
7270
get() = CollectionManager.getColUnsafe()
7371

74-
suspend fun showFilteredDeckDialog() {
75-
Timber.i("CreateDeckDialog::showFilteredDeckDialog")
76-
initialDeckName =
77-
withCol {
78-
sched.getOrCreateFilteredDeck(did = 0).name
79-
}
80-
showDialog()
81-
}
82-
8372
/** Used for rename */
8473
var deckName: String
8574
get() = shownDialog!!.getInputField().text.toString()
@@ -102,7 +91,6 @@ class CreateDeckDialog(
10291

10392
DeckDialogType.DECK,
10493
DeckDialogType.SUB_DECK,
105-
DeckDialogType.FILTERED_DECK,
10694
-> R.string.dialog_positive_create
10795
}
10896
positiveButton(positiveButtonTextRes) {
@@ -181,7 +169,7 @@ class CreateDeckDialog(
181169
*/
182170
private fun fullyQualifyDeckName(dialogText: CharSequence) =
183171
when (deckDialogType) {
184-
DeckDialogType.DECK, DeckDialogType.FILTERED_DECK, DeckDialogType.RENAME_DECK -> dialogText.toString()
172+
DeckDialogType.DECK, DeckDialogType.RENAME_DECK -> dialogText.toString()
185173
DeckDialogType.SUB_DECK -> getColUnsafe.decks.getSubdeckName(parentId!!, dialogText.toString())
186174
}
187175

@@ -206,34 +194,6 @@ class CreateDeckDialog(
206194
shownDialog?.dismiss()
207195
}
208196

209-
fun createFilteredDeck(deckName: String): Boolean {
210-
fun validFilteredDeckName(initialName: String): String {
211-
for (i in 0..10) {
212-
val name = initialName + "+".repeat(i)
213-
if (getColUnsafe.decks.byName(name) == null) return name
214-
}
215-
throw IllegalStateException("Could not generate valid name")
216-
}
217-
218-
try {
219-
// create filtered deck
220-
Timber.i("CreateDeckDialog::createFilteredDeck...")
221-
val newDeckId = getColUnsafe.decks.newFiltered(validFilteredDeckName(deckName))
222-
Timber.d("Created filtered deck '%s'; id: %d", deckName, newDeckId)
223-
onNewDeckCreated(newDeckId)
224-
} catch (ex: IllegalStateException) {
225-
if (ex.message != "Could not generate valid name") {
226-
throw ex
227-
}
228-
displayFeedback(ex.localizedMessage ?: ex.message ?: "", Snackbar.LENGTH_LONG)
229-
return false
230-
} catch (ex: BackendDeckIsFilteredException) {
231-
displayFeedback(ex.localizedMessage ?: ex.message ?: "", Snackbar.LENGTH_LONG)
232-
return false
233-
}
234-
return true
235-
}
236-
237197
private fun createNewDeck(deckName: String): Boolean {
238198
try {
239199
// create normal deck or sub deck
@@ -262,10 +222,6 @@ class CreateDeckDialog(
262222
// create sub deck
263223
createSubDeck(parentId!!, deckName)
264224
}
265-
DeckDialogType.FILTERED_DECK -> {
266-
// create filtered deck
267-
createFilteredDeck(deckName)
268-
}
269225
}
270226
}
271227
}

AnkiDroid/src/main/java/com/ichi2/themes/Themes.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ import androidx.core.graphics.drawable.toDrawable
2828
import androidx.core.view.WindowInsetsControllerCompat
2929
import androidx.fragment.app.FragmentActivity
3030
import com.google.android.material.color.MaterialColors
31-
import com.ichi2.anki.AnkiDroidApp
3231
import com.ichi2.anki.R
3332
import com.ichi2.anki.settings.PrefsRepository
3433
import com.ichi2.anki.settings.enums.AppTheme
3534
import com.ichi2.anki.settings.enums.DayTheme
3635
import com.ichi2.anki.settings.enums.NightTheme
3736
import com.ichi2.anki.settings.enums.Theme
38-
import com.ichi2.ui.AppCompatPreferenceActivity
3937

4038
/**
4139
* Helper methods to configure things related to AnkiDroid's themes
@@ -63,16 +61,7 @@ object Themes {
6361
* Otherwise, updates to the selected theme.
6462
*/
6563
fun updateCurrentTheme(context: Context) {
66-
// AppCompatPreferenceActivity's sharedPreferences is initialized
67-
// after the time when the theme should be set
68-
// TODO (#5019): always use the context as the parameter for getSharedPrefs
69-
val prefsContext =
70-
if (context is AppCompatPreferenceActivity<*>) {
71-
AnkiDroidApp.instance
72-
} else {
73-
context
74-
}
75-
val prefs = PrefsRepository(prefsContext)
64+
val prefs = PrefsRepository(context)
7665
val appTheme = prefs.appTheme
7766

7867
val themeIsDark = (appTheme == AppTheme.FOLLOW_SYSTEM && systemIsInNightMode(context)) || appTheme == AppTheme.NIGHT

0 commit comments

Comments
 (0)