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

Jump to bottom

[Android] Maintain transparency in PNG images when picking & cropping #1925

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Android] Maintain transparency in PNG images when picking & cropping #1925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d4819
Maintain all PNG properties when picking and cropping a PNG image
GunnarAK May 23, 2023
9776bcb
Formatting
GunnarAK May 23, 2023
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
19 changes: 17 additions & 2 deletions android/src/main/java/com/reactnative/ivpusic/imagepicker/Compression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,25 @@ File resize(
imageDirectory.mkdirs();
}

File resizeImageFile = new File(imageDirectory, UUID.randomUUID() + ".jpg");
String extension = originalImagePath.substring(originalImagePath.lastIndexOf(".") + 1);

final String resizeImageFileExtension;
final Bitmap.CompressFormat compressFormat;
if (extension.equals("png")) {
resizeImageFileExtension = ".png";
compressFormat = Bitmap.CompressFormat.PNG;
} else {
resizeImageFileExtension = ".jpg";
compressFormat = Bitmap.CompressFormat.JPEG;
}

File resizeImageFile = new File(
imageDirectory,
UUID.randomUUID() + resizeImageFileExtension
);

OutputStream os = new BufferedOutputStream(new FileOutputStream(resizeImageFile));
bitmap.compress(Bitmap.CompressFormat.JPEG, quality, os);
bitmap.compress(compressFormat, quality, os);

// Don't set unnecessary exif attribute
if (shouldSetOrientation(originalOrientation)) {
Expand Down
32 changes: 21 additions & 11 deletions android/src/main/java/com/reactnative/ivpusic/imagepicker/PickerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import java.util.concurrent.Callable;



class PickerModule extends ReactContextBaseJavaModule implements ActivityEventListener {

private static final int IMAGE_PICKER_REQUEST = 61110;
Expand Down Expand Up @@ -526,8 +525,7 @@ private static Long getVideoDuration(String path) {
retriever.setDataSource(path);

return Long.parseLong(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION));
}
catch(Exception e) {
} catch (Exception e) {
return -1L;
}
}
Expand Down Expand Up @@ -729,7 +727,6 @@ private void configureCropperColors(UCrop.Options options) {

private void startCropping(final Activity activity, final Uri uri) {
UCrop.Options options = new UCrop.Options();
options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
options.setCompressionQuality(100);
options.setCircleDimmedLayer(cropperCircleOverlay);
options.setFreeStyleCropEnabled(freeStyleCropEnabled);
Expand All @@ -754,15 +751,28 @@ private void startCropping(final Activity activity, final Uri uri) {
configureCropperColors(options);
}

UCrop uCrop = UCrop
.of(uri, Uri.fromFile(new File(this.getTmpDir(activity), UUID.randomUUID().toString() + ".jpg")))
.withOptions(options);
try {
String originalImagePath = resolveRealPath(activity, uri, false);
String extension = originalImagePath.substring(originalImagePath.lastIndexOf("."));

if (width > 0 && height > 0) {
uCrop.withAspectRatio(width, height);
}
if (extension.equals(".png")) {
options.setCompressionFormat(Bitmap.CompressFormat.PNG);
} else {
options.setCompressionFormat(Bitmap.CompressFormat.JPEG);
}

UCrop uCrop = UCrop
.of(uri, Uri.fromFile(new File(this.getTmpDir(activity), UUID.randomUUID().toString() + extension)))
.withOptions(options);

if (width > 0 && height > 0) {
uCrop.withAspectRatio(width, height);
}

uCrop.start(activity);
uCrop.start(activity);
} catch (Exception e) {
resultCollector.notifyProblem(E_NO_IMAGE_DATA_FOUND, e.getMessage());
}
}

private void imagePickerResult(Activity activity, final int requestCode, final int resultCode, final Intent data) {
Expand Down