From 893e5d474eadfe5b9cb1b12ba931c23f858c4019 Mon Sep 17 00:00:00 2001 From: Denver Braganza Date: Thu, 31 Mar 2022 03:38:42 +0530 Subject: [PATCH 1/5] Fixes based on ktlint linting --- CHANGELOG.md | 3 ++- cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aeea88e..3d1717ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - `Security` in case of vulnerabilities. ## [x.x.x] - unreleased - +### Fixed +- Fix disable closing AlertDialog when touching outside the dialog [#334](https://github.com/CanHub/Android-Image-Cropper/issues/334) ## [4.2.0] - 21/03/2022 ### Added - Added an option to skip manual editing and return entire image when required [#324](https://github.com/CanHub/Android-Image-Cropper/pull/324) diff --git a/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt b/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt index 42f5ee4c..a6fd7494 100644 --- a/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt +++ b/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt @@ -115,6 +115,7 @@ open class CropImageActivity : */ open fun showImageSourceDialog(openSource: (Source) -> Unit) { AlertDialog.Builder(this) + .setCancelable(false) .setTitle(R.string.pick_image_chooser_title) .setItems( arrayOf( From 9e6f188e32620b0b321724b8e03ff66ff5ad4633 Mon Sep 17 00:00:00 2001 From: Denver Braganza Date: Thu, 31 Mar 2022 03:38:42 +0530 Subject: [PATCH 2/5] Fixes based on ktlint linting --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3014dd56..7f7acbae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -141,7 +141,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Fixed - ENOENT (no such file or directory) [#99](https://github.com/CanHub/Android-Image-Cropper/issues/99) -- `content://` instead of `file://` [#83](https://github.com/CanHub/Android-Image-Cropper/issues/83) [#84](https://github.com/CanHub/Android-Image-Cropper/issues/84) +- `content://` instead of `file://` [#83](https://github.com/CanHub/Android-Image-Cropper/issues/83) [#84](https://github.com/CanHub/Android-Image-Cropper/issues/84) ## [2.3.2-alpha] - 12/04/21 ### Added @@ -231,4 +231,3 @@ Versions `2.0.1` and `2.0.2` are similar, issues with jitpack. ## [1.0.0] - 21/11/20 - Copy from previous repo [ArthurHub](https://github.com/ArthurHub/Android-Image-Cropper/) -- From b488f50242e562c84a0207bb727040ef46b0247c Mon Sep 17 00:00:00 2001 From: Denver Braganza Date: Sun, 28 Aug 2022 19:34:33 +0530 Subject: [PATCH 3/5] Added a fix where back button does not work when dialog is shown On Cancelled Result will no longer show empty screen --- .../src/main/java/com/canhub/cropper/CropImageActivity.kt | 7 +++++++ .../src/main/java/com/canhub/cropper/sample/SampleCrop.kt | 3 +++ 2 files changed, 10 insertions(+) diff --git a/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt b/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt index 78fae1ad..489abb3c 100644 --- a/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt +++ b/cropper/src/main/java/com/canhub/cropper/CropImageActivity.kt @@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable import android.net.Uri import android.os.Bundle import android.util.Log +import android.view.KeyEvent import android.view.Menu import android.view.MenuItem import androidx.activity.result.contract.ActivityResultContracts @@ -158,6 +159,12 @@ open class CropImageActivity : open fun showImageSourceDialog(openSource: (Source) -> Unit) { AlertDialog.Builder(this) .setCancelable(false) + .setOnKeyListener { _, keyCode, keyEvent -> + if (keyCode == KeyEvent.KEYCODE_BACK && keyEvent.action == KeyEvent.ACTION_UP) { + onBackPressed() + } + true + } .setTitle(R.string.pick_image_chooser_title) .setItems( arrayOf( diff --git a/sample/src/main/java/com/canhub/cropper/sample/SampleCrop.kt b/sample/src/main/java/com/canhub/cropper/sample/SampleCrop.kt index 21f8bc99..6674be43 100644 --- a/sample/src/main/java/com/canhub/cropper/sample/SampleCrop.kt +++ b/sample/src/main/java/com/canhub/cropper/sample/SampleCrop.kt @@ -59,6 +59,9 @@ internal class SampleCrop : Fragment() { } } private val customCropImage = registerForActivityResult(CropImageContract()) { + if (it is CropImage.CancelledResult) { + return@registerForActivityResult + } handleCropImageResult(it.uriContent.toString()) } From 12e7b45bec22a1604747fefd4c0ac5d63637ed4d Mon Sep 17 00:00:00 2001 From: Denver Braganza Date: Sun, 28 Aug 2022 19:44:34 +0530 Subject: [PATCH 4/5] Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f7acbae..3488dcc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Added the option to set custom color to toolbar of CropImageActivity [#421](https://github.com/CanHub/Android-Image-Cropper/issues/421) - Added the option to set custom background color to activity of CropImageActivity [#421](https://github.com/CanHub/Android-Image-Cropper/issues/421) - Fixed accidentally swiping back on newer Android devices when trying to resize the crop window [#423](https://github.com/CanHub/Android-Image-Cropper/issues/423) +- Fixed an issue on sample project where back button would not work when dialog is shown [#427](https://github.com/CanHub/Android-Image-Cropper/issues/427) +- Fixed an issue on sample project where cancelling/going back would go to a screen with empty image [#427](https://github.com/CanHub/Android-Image-Cropper/issues/427) ## [4.3.1] - 20/07/2022 ### Fix From d4ac3f64ce6ef996d0db9ff1519fd8a3f0374dc2 Mon Sep 17 00:00:00 2001 From: Denver Braganza Date: Sun, 28 Aug 2022 20:42:23 +0530 Subject: [PATCH 5/5] Minor fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3488dcc5..63727870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -143,7 +143,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Fixed - ENOENT (no such file or directory) [#99](https://github.com/CanHub/Android-Image-Cropper/issues/99) -- `content://` instead of `file://` [#83](https://github.com/CanHub/Android-Image-Cropper/issues/83) [#84](https://github.com/CanHub/Android-Image-Cropper/issues/84) +- `content://` instead of `file://` [#83](https://github.com/CanHub/Android-Image-Cropper/issues/83) [#84](https://github.com/CanHub/Android-Image-Cropper/issues/84) ## [2.3.2-alpha] - 12/04/21 ### Added