Skip to content

Commit

Permalink
Support flip horizontal orientation and others
Browse files Browse the repository at this point in the history
  • Loading branch information
@AhmedMSayed
AhmedMSayed committed May 15, 2019
1 parent 5058030 commit 322c607
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 75 deletions.
137 changes: 72 additions & 65 deletions android/src/ti/imagefactory/ImageFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,105 +18,113 @@

public class ImageFactory {

public static Bitmap imageRotate(Bitmap image, KrollDict args)
{
public static Bitmap imageRotate(Bitmap image, KrollDict args) {
if (image != null) {

Matrix matrix = new Matrix();
matrix.postRotate(args.optInt("degrees", 90));

if (args.containsKey("flipHorizontal")) {
matrix.postScale(-1, 1);
}

if (args.containsKey("degrees")) {
matrix.postRotate(args.optInt("degrees", 0));
}

Bitmap newImage = Bitmap.createBitmap(image, 0, 0, image.getWidth(), image.getHeight(), matrix, true);

if (newImage != image && !image.isRecycled()) {
image.recycle();
image = null;
}

return newImage;
}

return null;
}

public static Bitmap imageCrop(Bitmap image, KrollDict args)
{

public static Bitmap imageCrop(Bitmap image, KrollDict args) {
if (image != null) {
int width = args.optInt("width", image.getWidth());
int height = args.optInt("height", image.getHeight());
int x = args.optInt("x", (image.getWidth() - width) / 2);
int y = args.optInt("y", (image.getHeight() - height) / 2);

Bitmap newImage = Bitmap.createBitmap(image, x, y, width, height);

if (newImage != image && !image.isRecycled()) {
image.recycle();
image = null;
}

return newImage;
}

return null;
}

public static Bitmap imageResize(Bitmap image, KrollDict args)
{
public static Bitmap imageResize(Bitmap image, KrollDict args) {
if (image != null) {
int width = args.optInt("width", image.getWidth());
int height = args.optInt("height", image.getHeight());

Bitmap newImage = Bitmap.createScaledBitmap(image, width, height, true);

if (newImage != image && !image.isRecycled()) {
image.recycle();
image = null;
}

return newImage;
}

return null;
}

public static Bitmap imageThumbnail(Bitmap image, KrollDict args)
{

public static Bitmap imageThumbnail(Bitmap image, KrollDict args) {
if (image != null) {
int size = args.optInt("size", 48);
int borderSize = args.optInt("borderSize", 1);
int cornerRadius = args.optInt("cornerRadius", 0);
Boolean dither = args.optBoolean("dither", true);

// Create a temporary bitmap that maintains the aspect ratio. Note that one of either the height or width
// may be larger than the thumbnail size if it is not a 1:1 aspect ratio. This is necessary to provide
// parity with iOS since the Android scale-to-fit options will scale the image so that both width and
// height fit within the specified rectangle, whereas the iOS scale-to-fit options will scale so that

// Create a temporary bitmap that maintains the aspect ratio. Note that one of
// either the height or width
// may be larger than the thumbnail size if it is not a 1:1 aspect ratio. This
// is necessary to provide
// parity with iOS since the Android scale-to-fit options will scale the image
// so that both width and
// height fit within the specified rectangle, whereas the iOS scale-to-fit
// options will scale so that
// the smaller size fits the specified rectangle

float scale = (image.getWidth() < image.getHeight()) ? (float)image.getWidth() / (float)size : (float)image.getHeight() / (float)size;
int width = (int)(image.getWidth() / scale);
int height = (int)(image.getHeight() / scale);

float scale = (image.getWidth() < image.getHeight()) ? (float) image.getWidth() / (float) size
: (float) image.getHeight() / (float) size;
int width = (int) (image.getWidth() / scale);
int height = (int) (image.getHeight() / scale);
Bitmap tempBitmap = Bitmap.createScaledBitmap(image, width, height, true);

// Create a new bitmap that is the thumbnail size
Bitmap resultBitmap = Bitmap.createBitmap(size + borderSize * 2, size + borderSize * 2, Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(resultBitmap);

// Create a clipping path with rounded corners
if (cornerRadius > 0) {
final Rect rect = new Rect(borderSize, borderSize, size + borderSize, size + borderSize);
final RectF rectF = new RectF(rect);
final Rect rect = new Rect(borderSize, borderSize, size + borderSize, size + borderSize);
final RectF rectF = new RectF(rect);
Path path = new Path();
path.addRoundRect(rectF, (float)cornerRadius, (float)cornerRadius, Path.Direction.CCW);
path.addRoundRect(rectF, (float) cornerRadius, (float) cornerRadius, Path.Direction.CCW);
canvas.clipPath(path);
}

// Draw the image to the canvas (clipped to the path) and centered
int x = borderSize - (tempBitmap.getWidth() - size) / 2;
int y = borderSize - (tempBitmap.getHeight() - size) / 2;
int y = borderSize - (tempBitmap.getHeight() - size) / 2;
Paint paint = new Paint();
paint.setDither(dither);
canvas.drawBitmap(tempBitmap, (float)x, (float)y, paint);
canvas.drawBitmap(tempBitmap, (float) x, (float) y, paint);

// We're done with the tempBitmap
tempBitmap.recycle();
tempBitmap = null;
Expand All @@ -126,31 +134,31 @@ public static Bitmap imageThumbnail(Bitmap image, KrollDict args)
image = null;
}

return resultBitmap;
return resultBitmap;
}

return null;
}

public static Bitmap imageRoundedCorner(Bitmap image, KrollDict args)
{

public static Bitmap imageRoundedCorner(Bitmap image, KrollDict args) {
if (image != null) {
int borderSize = args.optInt("borderSize", 1);
int cornerRadius = args.optInt("cornerRadius", 0);

// Create a new bitmap that is the same size as the source bitmap
Bitmap resultBitmap = Bitmap.createBitmap(image.getWidth(), image.getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(resultBitmap);

// Create a clipping path with rounded corners
if (cornerRadius > 0) {
Path path = new Path();
final Rect rect = new Rect(borderSize, borderSize, image.getWidth() - borderSize, image.getHeight() - borderSize);
final RectF rectF = new RectF(rect);
path.addRoundRect(rectF, (float)cornerRadius, (float)cornerRadius, Path.Direction.CCW);
final Rect rect = new Rect(borderSize, borderSize, image.getWidth() - borderSize,
image.getHeight() - borderSize);
final RectF rectF = new RectF(rect);
path.addRoundRect(rectF, (float) cornerRadius, (float) cornerRadius, Path.Direction.CCW);
canvas.clipPath(path);
}

// Draw the image to the canvas (clipped to the path)
canvas.drawBitmap(image, 0, 0, null);

Expand All @@ -159,54 +167,53 @@ public static Bitmap imageRoundedCorner(Bitmap image, KrollDict args)
image = null;
}

return resultBitmap;
return resultBitmap;
}

return null;
}

public static Bitmap imageTransparentBorder(Bitmap image, KrollDict args)
{

public static Bitmap imageTransparentBorder(Bitmap image, KrollDict args) {
if (image != null) {
int borderSize = args.optInt("borderSize", 1);

// Create a bitmap that is the current size plus the size needed for the border
Bitmap resultBitmap = Bitmap.createBitmap(image.getWidth() + borderSize * 2, image.getHeight() + borderSize * 2, Bitmap.Config.ARGB_8888);
Bitmap resultBitmap = Bitmap.createBitmap(image.getWidth() + borderSize * 2, image.getHeight() + borderSize * 2,
Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(resultBitmap);

// Draw the image to the canvas (offset by the border size)
canvas.drawBitmap(image, (float)borderSize, (float)borderSize, null);
canvas.drawBitmap(image, (float) borderSize, (float) borderSize, null);

if (!image.isRecycled()) {
image.recycle();
image = null;
}

return resultBitmap;
}

return null;
}

public static Bitmap imageAlpha(Bitmap image, KrollDict args)
{

public static Bitmap imageAlpha(Bitmap image, KrollDict args) {
if (image != null) {
// If the image already has an alpha channel then just return
if (image.hasAlpha()) {
return image;
}

// Create a new bitmap that supports alpha
Bitmap resultBitmap = image.copy(Bitmap.Config.ARGB_8888, false);

if (resultBitmap != image && !image.isRecycled()) {
image.recycle();
image = null;
}

return resultBitmap;
}

return null;
}
}
31 changes: 21 additions & 10 deletions android/src/ti/imagefactory/ImageFactoryModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,18 @@
import java.lang.reflect.Field;
import java.util.HashMap;

import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.KrollDict;
import org.appcelerator.kroll.KrollModule;
import org.appcelerator.kroll.annotations.Kroll;
import org.appcelerator.titanium.TiApplication;

import org.appcelerator.titanium.TiBlob;
import org.appcelerator.titanium.io.TiBaseFile;
import org.appcelerator.titanium.io.TiFileFactory;
import org.appcelerator.titanium.view.TiDrawableReference;

import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
import android.support.media.ExifInterface;
import android.graphics.Bitmap.CompressFormat;
import android.util.Log;

@Kroll.module(name = "ImageFactory", id = "ti.imagefactory")
Expand Down Expand Up @@ -183,23 +181,36 @@ public TiBlob fixOrientation(TiBlob blob) {
KrollDict dict = new KrollDict();

switch (orientation) {
case ExifInterface.ORIENTATION_FLIP_HORIZONTAL:
dict.put("flipHorizontal", true);
break;
case ExifInterface.ORIENTATION_FLIP_VERTICAL:
dict.put("degrees", 180);
dict.put("flipHorizontal", true);
break;
case ExifInterface.ORIENTATION_TRANSPOSE:
dict.put("degrees", 270);
dict.put("flipHorizontal", true);
break;
case ExifInterface.ORIENTATION_TRANSVERSE:
dict.put("degrees", 90);
dict.put("flipHorizontal", true);
break;
case ExifInterface.ORIENTATION_ROTATE_90:
dict.put("degrees", "90");
dict.put("degrees", 90);
break;
case ExifInterface.ORIENTATION_ROTATE_180:
dict.put("degrees", "180");
dict.put("degrees", 180);
break;
case ExifInterface.ORIENTATION_ROTATE_270:
dict.put("degrees", "270");
dict.put("degrees", 270);
break;
default:
dict.put("degrees", "0");
}

blob = imageTransform(TRANSFORM_ROTATE, blob, dict);

} catch (IOException e) {
Log.e(LCAT, "IO Exception occured, file probably does not exist.");
e.printStackTrace();

} finally {
if (inputStream != null) {
Expand Down

0 comments on commit 322c607

Please sign in to comment.