Skip to content

Commit 3bd826d

Browse files
committed
Merge branch 'release/v1.2.1'
2 parents 3ac6d50 + 174e501 commit 3bd826d

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.2.0
2-
VERSION_CODE=8
1+
VERSION_NAME=1.2.1
2+
VERSION_CODE=9
33
GROUP=com.naver.android.helloyako
44

55
POM_DESCRIPTION=Android Image Crop View

imagecropview/src/main/java/com/naver/android/helloyako/imagecrop/view/ImageCropView.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import android.os.Handler;
3333
import android.util.AttributeSet;
3434
import android.util.Log;
35+
import android.util.TypedValue;
3536
import android.view.GestureDetector;
3637
import android.view.MotionEvent;
3738
import android.view.ScaleGestureDetector;
@@ -965,6 +966,20 @@ public void setGridOuterMode(int gridOuterMode) {
965966
invalidate();
966967
}
967968

969+
public void setGridLeftRightMargin(int marginDP) {
970+
this.gridLeftRightMargin = dpToPixel(marginDP);
971+
requestLayout();
972+
}
973+
974+
public void setGridTopBottomMargin(int marginDP) {
975+
this.gridTopBottomMargin = dpToPixel(marginDP);
976+
requestLayout();
977+
}
978+
979+
private int dpToPixel(int dp) {
980+
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics());
981+
}
982+
968983
public void saveState() {
969984
savedAspectRatioWidth = mAspectRatioWidth;
970985
savedAspectRatioHeight = mAspectRatioHeight;

0 commit comments

Comments
 (0)