Skip to content

Commit a459da0

Browse files
david-allisonmikehardy
authored andcommitted
refactor(nav): remove duplicate string
``` back_pressed_once -> Press back again to exit back_pressed_once_reviewer -> Press back again to return ``` Issue 14558
1 parent e584abc commit a459da0

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
}

AnkiDroid/src/main/java/com/ichi2/anki/android/back/ExitViaDoubleTapBackBackPressCallback.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.ichi2.anki.android.back
1818

1919
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
2020
import androidx.activity.OnBackPressedCallback
21-
import androidx.annotation.StringRes
2221
import androidx.preference.PreferenceManager
2322
import com.google.android.material.snackbar.Snackbar
2423
import 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

AnkiDroid/src/main/res/values/02-strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@
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>

0 commit comments

Comments
 (0)