Merge pull request #99 from Dhaval2404/feature/v1.7.3

v1.7.3 Release

Author: Dhaval2404

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.3] - 2020-07-18
+### Changed
+  * Fixed PNG image saved as JPG after crop issue [#94](https://github.com/Dhaval2404/ImagePicker/issues/94)
+
 ## [1.7.2] - 2020-07-14
 ### Changed
   * Fixed .crop() opening gallery or camera twice [#32](https://github.com/Dhaval2404/ImagePicker/issues/32)
@@ -66,9 +70,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * Crop Image(Its based on [uCrop](https://github.com/Yalantis/uCrop))
   * Compress Image(Compress image based on resolution and size)
   * Handle Runtime Permission for Camera and Storage
-  * Retrive Image Result as File, File Path as String or Uri object
+  * Retrieve Image Result as File, File Path as String or Uri object
 
 [Unreleased]: https://github.com/Dhaval2404/ImagePicker/compare/v2.0...HEAD
+[1.7.3]: https://github.com/Dhaval2404/ImagePicker/compare/v1.7.2...v1.7.3
 [1.7.2]: https://github.com/Dhaval2404/ImagePicker/compare/v1.7.1...v1.7.2
 [1.7.1]: https://github.com/Dhaval2404/ImagePicker/compare/v1.7...v1.7.1
 [1.7]: https://github.com/Dhaval2404/ImagePicker/compare/v1.6...v1.7

README.md

@@ -54,7 +54,7 @@ Almost 90% of the app that I have developed has an Image upload feature. Along w
 	```
 
     ```groovy
-   implementation 'com.github.dhaval2404:imagepicker:1.7.2'
+   implementation 'com.github.dhaval2404:imagepicker:1.7.3'
     ```
 
    **If you are yet to Migrate on AndroidX, Use support build artifact:**
@@ -270,9 +270,12 @@ Almost 90% of the app that I have developed has an Image upload feature. Along w
 
   * Added option to limit MIME types while choosing a gallery image (Special Thanks to [Marchuck](https://github.com/Marchuck))
   * Introduced ImageProviderInterceptor, Can be used for analytics (Special Thanks to [Marchuck](https://github.com/Marchuck))
+  * Fixed .crop() opening gallery or camera twice [#32](https://github.com/Dhaval2404/ImagePicker/issues/32)
   * Fixed FileProvider of the library clashes with the FileProvider of the app [#51](https://github.com/Dhaval2404/ImagePicker/issues/51) (Special Thanks to [OyaCanli](https://github.com/OyaCanli))
   * Added option to set Storage Directory [#52](https://github.com/Dhaval2404/ImagePicker/issues/52)
   * Fixed NullPointerException in FileUriUtils.getPathFromRemoteUri()  [#61](https://github.com/Dhaval2404/ImagePicker/issues/61) (Special Thanks to [himphen](https://github.com/himphen))
+  * Fixed UCropActivity Crash Android 4.4 (KiKat) [#82](https://github.com/Dhaval2404/ImagePicker/issues/82)
+  * Fixed PNG image saved as JPG after crop issue [#94](https://github.com/Dhaval2404/ImagePicker/issues/94)
 
 ### Version: 1.6
 

imagepicker/build.gradle

@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 10
-        versionName "1.7.2"
+        versionCode 11
+        versionName "1.7.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -72,7 +72,7 @@ ext {
     siteUrl = 'https://github.com/Dhaval2404/ImagePicker/'
     gitUrl = 'https://github.com/Dhaval2404/ImagePicker.git'
 
-    libraryVersion = '1.7.2'
+    libraryVersion = '1.7.3'
     //If you are uploading new library try : gradlew install
     //If you are updating existing library then execute: gradlew bintrayUpload
     //In both the case don't forgot to put bintray credentials in local.properties file.

imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/ImagePickerFileProvider.kt

@@ -1,4 +1,4 @@
-package com.github.dhaval2404.imagepicker;
+package com.github.dhaval2404.imagepicker
 
 import androidx.core.content.FileProvider
 

imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/provider/CropProvider.kt

@@ -9,6 +9,7 @@ import android.util.Log
 import com.github.dhaval2404.imagepicker.ImagePicker
 import com.github.dhaval2404.imagepicker.ImagePickerActivity
 import com.github.dhaval2404.imagepicker.R
+import com.github.dhaval2404.imagepicker.util.FileUriUtils
 import com.github.dhaval2404.imagepicker.util.FileUtil
 import com.yalantis.ucrop.UCrop
 import java.io.File
@@ -103,7 +104,9 @@ class CropProvider(activity: ImagePickerActivity) : BaseProvider(activity) {
      */
     @Throws(IOException::class)
     private fun cropImage(file: File) {
-        mCropImageFile = FileUtil.getImageFile(dir = mFileDir)
+        val uri = Uri.fromFile(file)
+        val extension = FileUriUtils.getImageExtension(uri)
+        mCropImageFile = FileUtil.getImageFile(dir = mFileDir, extension = extension)
 
         if (mCropImageFile == null || !mCropImageFile!!.exists()) {
             Log.e(TAG, "Failed to create crop image file")
@@ -112,7 +115,8 @@ class CropProvider(activity: ImagePickerActivity) : BaseProvider(activity) {
         }
 
         val options = UCrop.Options()
-        val uCrop = UCrop.of(Uri.fromFile(file), Uri.fromFile(mCropImageFile))
+        options.setCompressionFormat(FileUtil.getCompressFormat(extension))
+        val uCrop = UCrop.of(uri, Uri.fromFile(mCropImageFile))
             .withOptions(options)
 
         if (mCropAspectX > 0 && mCropAspectY > 0) {

imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/provider/GalleryProvider.kt

@@ -34,7 +34,7 @@ class GalleryProvider(activity: ImagePickerActivity) :
         private const val PERMISSION_INTENT_REQ_CODE = 4262
     }
 
-    //Mime types restrictions for gallery. By default all mime types are valid
+    // Mime types restrictions for gallery. By default all mime types are valid
     private val mimeTypes: Array<String>
 
     init {

imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/util/FileUriUtils.kt

@@ -182,7 +182,7 @@ object FileUriUtils {
 
     /** @return extension of image with dot, or default .jpg if it none.
      */
-    private fun getImageExtension(uriImage: Uri): String {
+    fun getImageExtension(uriImage: Uri): String {
         var extension: String? = null
 
         try {

imagepicker/src/main/kotlin/com/github/dhaval2404/imagepicker/util/FileUtil.kt

@@ -1,5 +1,6 @@
 package com.github.dhaval2404.imagepicker.util
 
+import android.graphics.Bitmap
 import android.os.Environment
 import android.os.StatFs
 import java.io.File
@@ -83,4 +84,19 @@ object FileUtil {
         val blockSize = stat.blockSizeLong
         return availBlocks * blockSize
     }
+
+    /**
+     * Get Bitmap Compress Format
+     *
+     * @param extension Image File Extension
+     * @return Bitmap CompressFormat
+     */
+    fun getCompressFormat(extension: String): Bitmap.CompressFormat {
+        return when {
+            extension.contains("png", ignoreCase = true) -> Bitmap.CompressFormat.PNG
+            extension.contains("webp", ignoreCase = true) -> Bitmap.CompressFormat.WEBP
+            else -> Bitmap.CompressFormat.JPEG
+        }
+    }
+
 }

sample/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.github.dhaval2404.imagepicker.sample"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 10
-        versionName "1.7.2"
+        versionCode 11
+        versionName "1.7.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }