mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove Zoom code from ShareActivity

Browse source
This commit is contained in:
misaochan 2018-05-26 00:42:27 +10:00
parent b1055f2fba
commit 3816d81daf
1 changed files with 4 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

81
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -499,96 +499,23 @@ public class ShareActivity
* function to provide pinch zoom * function to provide pinch zoom
*/ */
private void zoomImageFromThumb(final View thumbView, Uri imageuri ) { private void zoomImageFromThumb(final View thumbView, Uri imageuri ) {
// If there's an animation in progress, cancel it // If there's an animation in progress, cancel it immediately and proceed with this one.
// immediately and proceed with this one.
if (CurrentAnimator != null) { if (CurrentAnimator != null) {
CurrentAnimator.cancel(); CurrentAnimator.cancel();
} }
ViewUtil.hideKeyboard(ShareActivity.this.findViewById(R.id.titleEdit | R.id.descEdit)); ViewUtil.hideKeyboard(ShareActivity.this.findViewById(R.id.titleEdit | R.id.descEdit));
closeFABMenu(); closeFABMenu();
mainFab.setVisibility(View.GONE); mainFab.setVisibility(View.GONE);
InputStream input = null; InputStream input = null;
Bitmap scaled = null;
try { try {
input = this.getContentResolver().openInputStream(imageuri); input = this.getContentResolver().openInputStream(imageuri);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
BitmapRegionDecoder decoder = null;
try {
decoder = BitmapRegionDecoder.newInstance(input, false);
} catch (IOException e) {
e.printStackTrace();
}
Bitmap bitmap = decoder.decodeRegion(new Rect(10, 10, 50, 50), null);
try {
//Compress the Image
System.gc();
Runtime rt = Runtime.getRuntime();
long maxMemory = rt.freeMemory();
bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), imageuri);
int bitmapByteCount= BitmapCompat.getAllocationByteCount(bitmap);
long height = bitmap.getHeight();
long width = bitmap.getWidth();
long calHeight = (long) ((height * maxMemory)/(bitmapByteCount * 1.1));
long calWidth = (long) ((width * maxMemory)/(bitmapByteCount * 1.1));
scaled = Bitmap.createScaledBitmap(bitmap,(int) Math.min(width,calWidth), (int) Math.min(height,calHeight), true);
} catch (IOException e) {
} catch (NullPointerException e){
scaled = bitmap;
}
// Load the high-resolution "zoomed-in" image.
expandedImageView.setImageBitmap(scaled);
ZoomUtils.zoomImageUtil(thumbView, startBounds, input);
// Calculate the starting and ending bounds for the zoomed-in image.
// This step involves lots of math. Yay, math.
// The start bounds are the global visible rectangle of the thumbnail,
// and the final bounds are the global visible rectangle of the container
// view. Also set the container view's offset as the origin for the
// bounds, since that's the origin for the positioning animation
// properties (X, Y).
thumbView.getGlobalVisibleRect(startBounds);
flContainer.getGlobalVisibleRect(finalBounds, globalOffset);
startBounds.offset(-globalOffset.x, -globalOffset.y);
finalBounds.offset(-globalOffset.x, -globalOffset.y);
// Adjust the start bounds to be the same aspect ratio as the final
// bounds using the "center crop" technique. This prevents undesirable
// stretching during the animation. Also calculate the start scaling
// factor (the end scaling factor is always 1.0).
float startScale;
if ((float) finalBounds.width() / finalBounds.height()
> (float) startBounds.width() / startBounds.height()) {
// Extend start bounds horizontally
startScale = (float) startBounds.height() / finalBounds.height();
float startWidth = startScale * finalBounds.width();
float deltaWidth = (startWidth - startBounds.width()) / 2;
startBounds.left -= deltaWidth;
startBounds.right += deltaWidth;
} else {
// Extend start bounds vertically
startScale = (float) startBounds.width() / finalBounds.width();
float startHeight = startScale * finalBounds.height();
float deltaHeight = (startHeight - startBounds.height()) / 2;
startBounds.top -= deltaHeight;
startBounds.bottom += deltaHeight;
}
// Hide the thumbnail and show the zoomed-in view. When the animation
// begins, it will position the zoomed-in view in the place of the
// thumbnail.
thumbView.setAlpha(0f);
expandedImageView.setVisibility(View.VISIBLE);
zoomOutButton.setVisibility(View.VISIBLE);
zoomInButton.setVisibility(View.GONE);
// Set the pivot point for SCALE_X and SCALE_Y transformations
// to the top-left corner of the zoomed-in view (the default
// is the center of the view).
expandedImageView.setPivotX(0f);
expandedImageView.setPivotY(0f);
// Construct and run the parallel animation of the four translation and // Construct and run the parallel animation of the four translation and
// scale properties (X, Y, SCALE_X, and SCALE_Y). // scale properties (X, Y, SCALE_X, and SCALE_Y).