Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'onbackpressed_fix' into 'master' 

Do edit check in onBackPressed to also catch pressing the system back button

See merge request pixeldroid/PixelDroid!287
This commit is contained in:
Matthieu 2021-01-14 12:54:33 +01:00
parent 6266e5653d 417332fb5c
commit 72b902e522
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/h/pixeldroid/postCreation/photoEdit/PhotoEditActivity.kt
View File

@ -154,26 +154,28 @@ class PhotoEditActivity : BaseActivity() {
saving = false
}
override fun onBackPressed() {
if (noEdits()) super.onBackPressed()
else {
val builder = AlertDialog.Builder(this)
builder.apply {
setMessage(R.string.save_before_returning)
setPositiveButton(android.R.string.ok) { _, _ ->
saveImageToGallery()
}
setNegativeButton(R.string.no_cancel_edit) { _, _ ->
onBackPressed()
}
}
// Create the AlertDialog
builder.show()
}
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when(item.itemId) {
android.R.id.home -> {
if (noEdits()) onBackPressed()
else {
val builder = AlertDialog.Builder(this)
builder.apply {
setMessage(R.string.save_before_returning)
setPositiveButton(android.R.string.ok) { _, _ ->
saveImageToGallery()
}
setNegativeButton(R.string.no_cancel_edit) { _, _ ->
onBackPressed()
}
}
// Create the AlertDialog
builder.show()
}
}
android.R.id.home -> onBackPressed()
R.id.action_save -> {
saveImageToGallery()
}