Skip to content

Commit a59fa41

Browse files
committed
Prefs for review reminder entry points
GSoC 2025: Review Reminders - Used Prefs for review reminder entry points since it is more concise compared to requireContext().sharedPrefs() - Renamed vague "enableReviewReminder" variables to be more clearer, ex. "newReviewRemindersAreEnabled"
1 parent 2dce713 commit a59fa41

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import com.ichi2.anki.dialogs.customstudy.CustomStudyDialog
4545
import com.ichi2.anki.libanki.Collection
4646
import com.ichi2.anki.libanki.Decks
4747
import com.ichi2.anki.observability.ChangeManager
48-
import com.ichi2.anki.preferences.sharedPrefs
4948
import com.ichi2.anki.reviewreminders.ScheduleReminders
49+
import com.ichi2.anki.settings.Prefs
5050
import com.ichi2.anki.snackbar.showSnackbar
5151
import com.ichi2.anki.ui.internationalization.toSentenceCase
5252
import com.ichi2.anki.utils.ext.description
@@ -365,8 +365,8 @@ class StudyOptionsFragment :
365365
menu.findItem(R.id.action_custom_study).isVisible = false
366366
}
367367
// Use new review reminders system if enabled
368-
val enableNewReviewReminders = requireContext().sharedPrefs().getBoolean(getString(R.string.pref_new_notifications), false)
369-
menu.findItem(R.id.action_schedule_reminders).isVisible = enableNewReviewReminders
368+
val newReviewRemindersAreEnabled = Prefs.getBoolean(R.string.pref_new_notifications, false)
369+
menu.findItem(R.id.action_schedule_reminders).isVisible = newReviewRemindersAreEnabled
370370
// Switch on or off unbury depending on if there are cards to unbury
371371
menu.findItem(R.id.action_unbury).isVisible = col != null && col!!.sched.haveBuried()
372372
} catch (e: IllegalStateException) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.core.os.bundleOf
2424
import com.ichi2.anki.R
2525
import com.ichi2.anki.analytics.AnalyticsDialogFragment
2626
import com.ichi2.anki.libanki.DeckId
27-
import com.ichi2.anki.preferences.sharedPrefs
27+
import com.ichi2.anki.settings.Prefs
2828
import com.ichi2.utils.title
2929

3030
class DeckPickerContextMenu : AnalyticsDialogFragment() {
@@ -76,7 +76,7 @@ class DeckPickerContextMenu : AnalyticsDialogFragment() {
7676
if (!dyn) {
7777
add(DeckPickerContextMenuOption.EDIT_DESCRIPTION)
7878
}
79-
if (requireContext().sharedPrefs().getBoolean(getString(R.string.pref_new_notifications), false)) {
79+
if (Prefs.getBoolean(R.string.pref_new_notifications, false)) {
8080
add(DeckPickerContextMenuOption.SCHEDULE_REMINDERS)
8181
}
8282
add(DeckPickerContextMenuOption.DELETE_DECK)

AnkiDroid/src/main/java/com/ichi2/anki/preferences/HeaderFragment.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ class HeaderFragment : SettingsFragment() {
6969
true
7070
}
7171

72-
val reviewRemindersEnabled = requireContext().sharedPrefs().getBoolean(getString(R.string.pref_new_notifications), false)
72+
val newReviewRemindersAreEnabled = Prefs.getBoolean(R.string.pref_new_notifications, false)
7373
requirePreference<HeaderPreference>(R.string.pref_review_reminders_screen_key)
74-
.isVisible = reviewRemindersEnabled
74+
.isVisible = newReviewRemindersAreEnabled
7575
requirePreference<HeaderPreference>(R.string.pref_notifications_screen_key)
76-
.isVisible = !reviewRemindersEnabled
76+
.isVisible = !newReviewRemindersAreEnabled
7777

7878
configureSearchBar(
7979
requireActivity() as AppCompatActivity,
@@ -119,7 +119,8 @@ class HeaderFragment : SettingsFragment() {
119119
index(R.xml.preferences_custom_sync_server)
120120
.addBreadcrumb(R.string.pref_cat_sync)
121121

122-
if (activity.sharedPrefs().getBoolean(activity.getString(R.string.pref_new_notifications), false)) {
122+
val newReviewRemindersAreEnabled = Prefs.getBoolean(R.string.pref_new_notifications, false)
123+
if (newReviewRemindersAreEnabled) {
123124
searchConfiguration
124125
.indexItem()
125126
.withKey(activity.getString(R.string.pref_review_reminders_screen_key))

0 commit comments

Comments
 (0)