mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 20:03:05 +02:00
Code

NF: factorize onKeyDown

Browse Source
This commit is contained in:
Arthur Milchior 2022-05-25 18:36:51 +02:00 committed by Brayan Oliveira
parent f90d7a2259
commit 3144b9c903
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AnkiDroid/src/main/java/com/ichi2/anki/DeckOptions.kt
View File

@ -27,7 +27,6 @@ import android.preference.ListPreference
import android.preference.Preference
import android.preference.PreferenceScreen
import android.text.TextUtils
import android.view.KeyEvent
import android.view.MenuItem
import com.afollestad.materialdialogs.MaterialDialog
import com.ichi2.anim.ActivityTransitionAnimation
@ -608,15 +607,6 @@ class DeckOptions :
return false
}
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
Timber.i("DeckOptions - onBackPressed()")
closeWithResult()
return true
}
return super.onKeyDown(keyCode, event)
}
override fun closeWithResult() {
if (prefChanged) {
setResult(RESULT_OK)

10
AnkiDroid/src/main/java/com/ichi2/anki/FilteredDeckOptions.kt
View File

@ -21,7 +21,6 @@ import android.content.*
import android.content.res.Configuration
import android.os.Bundle
import android.preference.*
import android.view.KeyEvent
import android.view.MenuItem
import com.ichi2.anim.ActivityTransitionAnimation
import com.ichi2.anim.ActivityTransitionAnimation.slide
@ -388,15 +387,6 @@ class FilteredDeckOptions : AppCompatPreferenceActivity() {
return false
}
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
Timber.i("DeckOptions - onBackPressed()")
closeWithResult()
return true
}
return super.onKeyDown(keyCode, event)
}
override fun closeWithResult() {
if (prefChanged) {
// Rebuild the filtered deck if a setting has changed

11
AnkiDroid/src/main/java/com/ichi2/ui/AppCompatPreferenceActivity.kt
View File

@ -22,6 +22,7 @@ import android.content.*
import android.content.res.Configuration
import android.os.Bundle
import android.preference.PreferenceActivity
import android.view.KeyEvent
import android.view.MenuInflater
import android.view.View
import android.view.ViewGroup
@ -33,6 +34,7 @@ import com.ichi2.anki.AnkiDroidApp
import com.ichi2.anki.CollectionHelper
import com.ichi2.anki.receiver.SdCardReceiver
import com.ichi2.libanki.Collection
import timber.log.Timber
/**
* A [android.preference.PreferenceActivity] which implements and proxies the necessary calls
@ -170,4 +172,13 @@ abstract class AppCompatPreferenceActivity : PreferenceActivity(), SharedPrefere
}
protected abstract fun closeWithResult()
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_BACK && event.repeatCount == 0) {
Timber.i("DeckOptions - onBackPressed()")
closeWithResult()
return true
}
return super.onKeyDown(keyCode, event)
}
}