Skip to content

Fix image position for android #18

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix image position for android #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions android/src/main/java/com/wwimmo/imageeditor/ImageEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ protected void startMeasurementToolEntity(String imageShapeAsset) {
if (mDrawingCanvas.getWidth() > mSketchCanvas.getWidth() || mDrawingCanvas.getHeight() > mSketchCanvas.getHeight()) {
measurementEntity = new MeasureToolEntity(layer, mDrawingCanvas.getWidth(), mDrawingCanvas.getHeight(), imageShapeAsset, dm);
} else {
measurementEntity = new MeasureToolEntity(layer, mSketchCanvas.getWidth(), mSketchCanvas.getHeight(), imageShapeAsset, dm);
measurementEntity = new MeasureToolEntity(layer, getWidth(), getHeight(), imageShapeAsset, dm);
}
if (imageShapeAsset != null) {
getBitmap(prepareUri(imageShapeAsset), 0, 0, new BaseBitmapDataSubscriber() {
Expand All @@ -1011,8 +1011,10 @@ protected void onFailureImpl(@NonNull DataSource<CloseableReference<CloseableIma
});
}
addEntityAndPosition(measurementEntity);
measurementEntity.addPoint(measurementEntity.getWidth() * 0.35f, measurementEntity.getHeight() / 2);
measurementEntity.addPoint(measurementEntity.getWidth() * 0.65f, measurementEntity.getHeight() / 2);
float width = getWidth();
float height = getHeight();
measurementEntity.addPoint(width * 0.35f, height / 2);
measurementEntity.addPoint(width * 0.65f, height / 2);
}

protected void addSquareEntity(int width) {
Expand Down
6 changes: 4 additions & 2 deletions android/src/main/java/com/wwimmo/imageeditor/utils/entities/MeasureToolEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,13 @@ float getTouchRadius() {
}

float limitX (float x) {
return Math.max(Math.min(x, getWidth()), 0);
float minWidth = Math.min(getWidth(), getMeasuredWidth());
return Math.max(Math.min(x, minWidth), 0);
}

float limitY (float y) {
return Math.max(Math.min(y, getHeight()), 0);
float minHeight = Math.min(getHeight(), getMeasuredHeight());
return Math.max(Math.min(y, minHeight), 0);
}

public boolean handleTranslate(PointF delta) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "git",
"url": "https://github.com/hoverinc/react-native-sketch-image"
},
"version": "0.8.49",
"version": "0.8.50",
"description": "react-native-sketch-canvas allows you to draw / sketch on both iOS and Android devices and sync the drawing data between users. Of course you can save as image.",
"author": "Terry Lin, Thomas Steinbrüchel",
"main": "index.js",
Expand Down