Skip to content

Commit 1c8e2c6

Browse files
BrayanDSOlukstbit
authored andcommitted
refactor: use PrefsRepository in StudyScreenRepository
1 parent a330581 commit 1c8e2c6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import kotlin.reflect.KProperty
4040
object Prefs : PrefsRepository(AnkiDroidApp.sharedPrefs(), AnkiDroidApp.appResources)
4141

4242
open class PrefsRepository(
43-
private val sharedPrefs: SharedPreferences,
43+
val sharedPrefs: SharedPreferences,
4444
private val resources: Resources,
4545
) {
4646
@VisibleForTesting

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/ReviewerFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ class ReviewerFragment :
635635
webViewLayout.pageDown()
636636
}
637637

638-
val repository = StudyScreenRepository(sharedPrefs())
638+
val repository = StudyScreenRepository()
639639

640640
viewModel.isMarkedFlow
641641
.flowWithLifecycle(lifecycle)

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/reviewer/StudyScreenRepository.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@
1515
*/
1616
package com.ichi2.anki.ui.windows.reviewer
1717

18-
import android.content.SharedPreferences
1918
import com.ichi2.anki.preferences.reviewer.MenuDisplayType
2019
import com.ichi2.anki.preferences.reviewer.ReviewerMenuRepository
2120
import com.ichi2.anki.preferences.reviewer.ViewerAction
2221
import com.ichi2.anki.settings.Prefs
22+
import com.ichi2.anki.settings.PrefsRepository
2323
import com.ichi2.anki.settings.enums.ToolbarPosition
2424
import timber.log.Timber
2525
import java.net.BindException
2626
import java.net.ServerSocket
2727

2828
class StudyScreenRepository(
29-
preferences: SharedPreferences,
29+
prefs: PrefsRepository = Prefs,
3030
) {
3131
val isMarkShownInToolbar: Boolean
3232
val isFlagShownInToolbar: Boolean
3333

3434
init {
3535
val actions =
36-
ReviewerMenuRepository(preferences)
36+
ReviewerMenuRepository(prefs.sharedPrefs)
3737
.getActionsByMenuDisplayTypes(
3838
MenuDisplayType.ALWAYS,
3939
).getValue(MenuDisplayType.ALWAYS)
40-
val isToolbarShown = Prefs.toolbarPosition != ToolbarPosition.NONE
40+
val isToolbarShown = prefs.toolbarPosition != ToolbarPosition.NONE
4141
isMarkShownInToolbar = isToolbarShown && ViewerAction.MARK in actions
4242
isFlagShownInToolbar = isToolbarShown && ViewerAction.FLAG_MENU in actions
4343
}

0 commit comments

Comments
 (0)