Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#96 Fix picking camera image without cropping #97

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#96 Fix picking camera image without cropping #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/ImagePickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,7 @@ class ImagePickerActivity : AppCompatActivity() {
* Dispatch incoming result to the correct provider.
*/
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>,
grantResults: IntArray
requestCode: Int, permissions: Array<String>, grantResults: IntArray
) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
mCameraProvider?.onRequestPermissionsResult(requestCode)
Expand All @@ -170,8 +168,7 @@ class ImagePickerActivity : AppCompatActivity() {
outputFormat = mCropProvider.outputFormat()
)
mCompressionProvider.isResizeRequired(uri) -> mCompressionProvider.compress(
uri = uri,
outputFormat = mCropProvider.outputFormat()
uri = uri, outputFormat = mCropProvider.outputFormat()
)
else -> setResult(uri)
}
Expand All @@ -180,7 +177,7 @@ class ImagePickerActivity : AppCompatActivity() {
fun setMultipleImage(fileList: ArrayList<Uri>) {
this.fileToCrop = fileList

if (!fileList.isNullOrEmpty()) {
if (fileList.isNotEmpty()) {
val file = fileList[0]
setMultipleCropper(uri = file)
try {
Expand All @@ -203,8 +200,7 @@ class ImagePickerActivity : AppCompatActivity() {
outputFormat = mCropProvider.outputFormat()
)
mCompressionProvider.isResizeRequired(uri) -> mCompressionProvider.compress(
uri = uri,
outputFormat = mCropProvider.outputFormat()
uri = uri, outputFormat = mCropProvider.outputFormat()
)
}
}
Expand Down Expand Up @@ -255,17 +251,14 @@ class ImagePickerActivity : AppCompatActivity() {
mCameraProvider?.let {
// Delete Camera file after Compress. Else there will be two image for the same action.
// In case of Gallery Provider, we will get original image path, so we will not delete that.
file.delete()
// it.delete()
}

// If crop file is not null, Delete it after crop
mCropUri?.path?.let {
File(it).delete()
mImageUri?.path?.let { path ->
File(path).delete()
}
it.delete()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one was commented

mImageUri = null
}
mCropUri = null

setResult(mCropUri!!)
setResult(Uri.fromFile(file))
}

/**
Expand Down Expand Up @@ -308,4 +301,4 @@ class ImagePickerActivity : AppCompatActivity() {
finish()
}

}
}
9 changes: 3 additions & 6 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/BaseProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,18 @@ abstract class BaseProvider(protected val activity: ImagePickerActivity) :
/**
* This method will be Call on Error, It can be used for clean up Tasks
*/
protected open fun onFailure() {
}
protected open fun onFailure() {}

/**
* Save all appropriate provider state.
*/
open fun onSaveInstanceState(outState: Bundle) {
}
open fun onSaveInstanceState(outState: Bundle) {}

/**
* Restores the saved state for all Providers.
*
* @param savedInstanceState the Bundle returned by {@link #onSaveInstanceState()}
* @see #onSaveInstanceState()
*/
open fun onRestoreInstanceState(savedInstanceState: Bundle?) {
}
open fun onRestoreInstanceState(savedInstanceState: Bundle?) {}
}
6 changes: 2 additions & 4 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/CameraProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ class CameraProvider(
/**
* Permission Require for Image Capture using Camera
*/
private val REQUIRED_PERMISSIONS = arrayOf(
Manifest.permission.CAMERA
)
private val REQUIRED_PERMISSIONS = arrayOf(Manifest.permission.CAMERA)

private const val PERMISSION_INTENT_REQ_CODE = 4282
}
Expand Down Expand Up @@ -200,4 +198,4 @@ class CameraProvider(
}.toTypedArray()
}

}
}
12 changes: 7 additions & 5 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/CompressionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import com.github.drjacky.imagepicker.ImagePicker
import com.github.drjacky.imagepicker.ImagePickerActivity
import com.github.drjacky.imagepicker.util.ExifDataCopier
import com.github.drjacky.imagepicker.util.FileUriUtils
import com.github.drjacky.imagepicker.util.ImageUtil.getBitmap
import kotlinx.coroutines.launch
import java.io.File
import java.io.FileOutputStream
import java.util.*

/**
* Compress Selected/Captured Image
Expand Down Expand Up @@ -66,8 +68,8 @@ class CompressionProvider(activity: ImagePickerActivity) : BaseProvider(activity
}

private fun compressTask(uri: Uri, outputFormat: Bitmap.CompressFormat?): File? {
var bitmap = BitmapFactory.decodeFile(uri.path, BitmapFactory.Options())
if (maxWidth > 0L && maxHeight > 0L) {
var bitmap = getBitmap(activity, uri)
if (bitmap != null && maxWidth > 0L && maxHeight > 0L) {
// resize if desired
bitmap = if ((bitmap.width > maxWidth || bitmap.height > maxHeight) && keepRatio) {
var width = maxWidth
Expand All @@ -90,15 +92,15 @@ class CompressionProvider(activity: ImagePickerActivity) : BaseProvider(activity
val format = outputFormat ?: FileUriUtils.getImageExtensionFormat(baseContext, uri)
var out: FileOutputStream? = null
return try {
val temp = "temp.${format.name}"
val temp = "temp${Random().nextInt()}.${format.name}"
val tempPath = activity.filesDir.toString() + "/$temp"
with(File(tempPath)) {
if (exists()) {
delete()
}
}
out = activity.openFileOutput(temp, Context.MODE_PRIVATE)
bitmap.compress(format, 100, out)
bitmap?.compress(format, 100, out)
File(tempPath)
} catch (e: Exception) {
e.printStackTrace()
Expand All @@ -121,4 +123,4 @@ class CompressionProvider(activity: ImagePickerActivity) : BaseProvider(activity
BitmapFactory.decodeStream(contentResolver.openInputStream(uri), null, options)
return intArrayOf(options.outWidth, options.outHeight)
}
}
}
25 changes: 2 additions & 23 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/CropProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package com.github.drjacky.imagepicker.provider

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.ImageDecoder
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.os.Environment
import androidx.activity.result.ActivityResult
Expand All @@ -17,6 +13,7 @@ import com.github.drjacky.imagepicker.ImagePickerActivity
import com.github.drjacky.imagepicker.R
import com.github.drjacky.imagepicker.util.FileUriUtils
import com.github.drjacky.imagepicker.util.FileUtil.getCompressFormat
import com.github.drjacky.imagepicker.util.ImageUtil.getBitmap
import com.yalantis.ucrop.UCrop
import java.io.ByteArrayOutputStream
import java.io.File
Expand Down Expand Up @@ -213,24 +210,6 @@ class CropProvider(activity: ImagePickerActivity, private val launcher: (Intent)
}
}

private fun getBitmap(context: Context, imageUri: Uri): Bitmap? {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
try {
ImageDecoder.decodeBitmap(
ImageDecoder.createSource(context.contentResolver, imageUri)
)
} catch (e: ImageDecoder.DecodeException) {
null
}
} else {
context
.contentResolver
.openInputStream(imageUri)?.use { inputStream ->
BitmapFactory.decodeStream(inputStream)
}
}
}

@Throws(IOException::class)
private fun convertBitmapToFile(destinationFile: File, bitmap: Bitmap, extension: String) {
destinationFile.createNewFile()
Expand Down Expand Up @@ -262,4 +241,4 @@ class CropProvider(activity: ImagePickerActivity, private val launcher: (Intent)
cropImageUri = null
}

}
}
15 changes: 5 additions & 10 deletions imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/provider/GalleryProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ import java.io.IOException
class GalleryProvider(
activity: ImagePickerActivity,
private val launcher: (Intent) -> Unit
) :
BaseProvider(activity) {
) : BaseProvider(activity) {

private var fileList: ArrayList<Uri>? = null

Expand All @@ -46,13 +45,9 @@ class GalleryProvider(
Manifest.permission.WRITE_EXTERNAL_STORAGE
)
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
arrayOf(
Manifest.permission.READ_MEDIA_IMAGES
)
arrayOf(Manifest.permission.READ_MEDIA_IMAGES)
} else {
arrayOf(
Manifest.permission.READ_EXTERNAL_STORAGE
)
arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
}

private const val PERMISSION_INTENT_REQ_CODE = 4262
Expand Down Expand Up @@ -162,7 +157,7 @@ class GalleryProvider(
*/
private fun handleResult(data: Intent?) {
data?.clipData?.let { dataClipData ->
fileList = ArrayList<Uri>()
fileList = ArrayList()
for (i in 0 until dataClipData.itemCount) {
val uri = dataClipData.getItemAt(i).uri
fileList!!.add(uri)
Expand Down Expand Up @@ -192,4 +187,4 @@ class GalleryProvider(
}
}
}
}
}
23 changes: 22 additions & 1 deletion imagepicker/src/main/kotlin/com/github/drjacky/imagepicker/util/ImageUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/
package com.github.drjacky.imagepicker.util

import android.content.Context
import android.graphics.*
import android.net.Uri
import android.os.Build
import java.io.File
import java.io.FileOutputStream
Expand Down Expand Up @@ -211,4 +213,23 @@ object ImageUtil {
else -> 1
}
}
}

fun getBitmap(context: Context, imageUri: Uri): Bitmap? {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
try {
ImageDecoder.decodeBitmap(
ImageDecoder.createSource(context.contentResolver, imageUri)
)
} catch (e: ImageDecoder.DecodeException) {
e.printStackTrace()
null
}
} else {
context
.contentResolver
.openInputStream(imageUri)?.use { inputStream ->
BitmapFactory.decodeStream(inputStream)
}
}
}
}
4 changes: 2 additions & 2 deletions sample/src/main/kotlin/com.github.drjacky.imagepicker/sample/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class MainActivity : AppCompatActivity() {
fun pickCameraImage(view: View) {
cameraLauncher.launch(
ImagePicker.with(this)
.crop()
//.crop()
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why's that?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I see that's because of #96

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but what if someone wants to crop the camera image?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no problem. It's optional. Both with or without crop are handled.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, the issue is not with the crop itself as the titles say: #96 Fix picking camera image without cropping & [Crash] When picking a camera image without setting crop()

The improvement is here, right?

mImageUri?.path?.let { path ->
                File(path).delete()
            }
            it.delete() //Why uncommented BTW?

.cameraOnly()
.maxResultSize(1080, 1920, true)
.createIntent()
Expand Down Expand Up @@ -174,4 +174,4 @@ class MainActivity : AppCompatActivity() {
.setPositiveButton("Ok", null)
.show()
}
}
}