File tree Expand file tree Collapse file tree 4 files changed +4
-8
lines changed
Expand file tree Collapse file tree 4 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -572,7 +572,7 @@ abstract class AbstractFlashcardViewer :
572572
573573 override fun setupBackPressedCallbacks () {
574574 onBackPressedDispatcher.addCallback(this , defaultOnBackCallback)
575- onBackPressedDispatcher.addCallback(this , exitViaDoubleTapBackCallback(R .string.back_pressed_once_reviewer ))
575+ onBackPressedDispatcher.addCallback(this , exitViaDoubleTapBackCallback())
576576 super .setupBackPressedCallbacks()
577577 }
578578
Original file line number Diff line number Diff line change @@ -652,7 +652,7 @@ open class DeckPicker :
652652
653653 override fun setupBackPressedCallbacks () {
654654 onBackPressedDispatcher.addCallback(this , exitAndSyncBackCallback)
655- onBackPressedDispatcher.addCallback(this , exitViaDoubleTapBackCallback(R .string.back_pressed_once ))
655+ onBackPressedDispatcher.addCallback(this , exitViaDoubleTapBackCallback())
656656 onBackPressedDispatcher.addCallback(this , closeFloatingActionBarBackPressCallback)
657657 super .setupBackPressedCallbacks()
658658 }
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ package com.ichi2.anki.android.back
1818
1919import android.content.SharedPreferences.OnSharedPreferenceChangeListener
2020import androidx.activity.OnBackPressedCallback
21- import androidx.annotation.StringRes
2221import androidx.preference.PreferenceManager
2322import com.google.android.material.snackbar.Snackbar
2423import com.ichi2.anki.AnkiActivity
@@ -37,14 +36,12 @@ import timber.log.Timber
3736 * @see Prefs.exitViaDoubleTapBack
3837 */
3938// TODO: Convert this to a class when context parameters are usable
40- fun AnkiActivity.exitViaDoubleTapBackCallback (
41- @StringRes stringRes : Int ,
42- ): OnBackPressedCallback =
39+ fun AnkiActivity.exitViaDoubleTapBackCallback (): OnBackPressedCallback =
4340 object : OnBackPressedCallback (enabled = Prefs .exitViaDoubleTapBack) {
4441 lateinit var strongListenerReference: OnSharedPreferenceChangeListener
4542
4643 override fun handleOnBackPressed () {
47- showSnackbar(stringRes , Snackbar .LENGTH_SHORT )
44+ showSnackbar(R .string.back_pressed_once , Snackbar .LENGTH_SHORT )
4845 this .isEnabled = false
4946 HandlerUtils .executeFunctionWithDelay(Consts .SHORT_TOAST_DURATION ) {
5047 this .isEnabled = true
Original file line number Diff line number Diff line change 257257 <string name =" password_empty" >Password is required</string >
258258
259259 <string name =" back_pressed_once" >Press back again to exit</string >
260- <string name =" back_pressed_once_reviewer" >Press back again to return</string >
261260
262261 <!-- %% is required to display % symbol. Reference: https://stackoverflow.com/a/16834358 -->
263262 <string name =" percentage" >%s%%</string >
You can’t perform that action at this time.
0 commit comments