From f4868aefa68f52621b2fe49429adf7d165e8d9c9 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 27 Aug 2017 15:55:27 +0200 Subject: [PATCH 1/3] Fix vertical scrolls, removed some logs (#7) --- .../java/com/otaliastudios/cameraview/CameraView.java | 10 +++++----- .../otaliastudios/cameraview/ScrollGestureLayout.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 8450ce9a..471eee2d 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -412,13 +412,13 @@ public class CameraView extends FrameLayout { // Pass to our own GestureLayouts CameraOptions options = mCameraController.getCameraOptions(); // Non null if (mPinchGestureLayout.onTouchEvent(event)) { - Log.e(TAG, "pinch!"); + // Log.e(TAG, "pinch!"); onGesture(mPinchGestureLayout, options); } else if (mScrollGestureLayout.onTouchEvent(event)) { - Log.e(TAG, "scroll!"); + // Log.e(TAG, "scroll!"); onGesture(mScrollGestureLayout, options); } else if (mTapGestureLayout.onTouchEvent(event)) { - Log.e(TAG, "tap!"); + // Log.e(TAG, "tap!"); onGesture(mTapGestureLayout, options); } return true; @@ -1252,8 +1252,8 @@ public class CameraView extends FrameLayout { int w = consistentWithView ? getWidth() : getHeight(); int h = consistentWithView ? getHeight() : getWidth(); AspectRatio targetRatio = AspectRatio.of(w, h); - Log.e(TAG, "is Consistent? " + consistentWithView); - Log.e(TAG, "viewWidth? " + getWidth() + ", viewHeight? " + getHeight()); + // Log.e(TAG, "is Consistent? " + consistentWithView); + // Log.e(TAG, "viewWidth? " + getWidth() + ", viewHeight? " + getHeight()); jpeg2 = CropHelper.cropToJpeg(jpeg, targetRatio, mJpegQuality); } dispatchOnPictureTaken(jpeg2); diff --git a/cameraview/src/main/views/com/otaliastudios/cameraview/ScrollGestureLayout.java b/cameraview/src/main/views/com/otaliastudios/cameraview/ScrollGestureLayout.java index aa401b8e..c221150b 100644 --- a/cameraview/src/main/views/com/otaliastudios/cameraview/ScrollGestureLayout.java +++ b/cameraview/src/main/views/com/otaliastudios/cameraview/ScrollGestureLayout.java @@ -33,7 +33,7 @@ class ScrollGestureLayout extends GestureLayout { @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { boolean horizontal; - Log.e("ScrollGestureLayout", "onScroll, distanceX="+distanceX+", distanceY="+distanceY); + // Log.e("ScrollGestureLayout", "onScroll, distanceX="+distanceX+", distanceY="+distanceY); if (e1.getX() != mPoints[0].x || e1.getY() != mPoints[0].y) { // First step. We choose now if it's a vertical or horizontal scroll, and // stick to it for the whole gesture. @@ -46,7 +46,7 @@ class ScrollGestureLayout extends GestureLayout { } mPoints[1].set(e2.getX(), e2.getY()); mDistance = horizontal ? (distanceX / getWidth()) : (distanceY / getHeight()); - mDistance = -mDistance; // they are provided inverted. + mDistance = horizontal ? -mDistance : mDistance; // When vertical, up = positive mNotify = true; return true; } @@ -71,7 +71,7 @@ class ScrollGestureLayout extends GestureLayout { mDetector.onTouchEvent(event); // Keep notifying CameraView as long as the gesture goes. - if (mNotify) Log.e("ScrollGestureLayout", "notifying a gesture "+mType.name()); + // if (mNotify) Log.e("ScrollGestureLayout", "notifying a gesture "+mType.name()); return mNotify; } @@ -91,7 +91,7 @@ class ScrollGestureLayout extends GestureLayout { float newValue = currValue + delta; if (newValue < minValue) newValue = minValue; if (newValue > maxValue) newValue = maxValue; - Log.e("ScrollGestureLayout", "curr="+currValue+", min="+minValue+", max="+maxValue+", out="+newValue); + // Log.e("ScrollGestureLayout", "curr="+currValue+", min="+minValue+", max="+maxValue+", out="+newValue); return newValue; } From 2fe72577aa4845b3294cbc685699ec6d214c9cfb Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 27 Aug 2017 16:01:07 +0200 Subject: [PATCH 2/3] Fix bug with measuring behavior (#8) * Code regions * Fix bug with measuring behavior --- .../otaliastudios/cameraview/CameraView.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 471eee2d..f820f300 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -94,6 +94,8 @@ public class CameraView extends FrameLayout { init(context, attrs); } + //region Init + @SuppressWarnings("WrongConstant") private void init(@NonNull Context context, @Nullable AttributeSet attrs) { TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.CameraView, 0, 0); @@ -200,10 +202,9 @@ public class CameraView extends FrameLayout { super.onDetachedFromWindow(); } + //endregion - // Smart measuring behavior - // ------------------------ - + //region Measuring behavior private String ms(int mode) { switch (mode) { @@ -249,7 +250,7 @@ public class CameraView extends FrameLayout { final float previewHeight = flip ? previewSize.getWidth() : previewSize.getHeight(); // If MATCH_PARENT is interpreted as AT_MOST, transform to EXACTLY - // to be consistent with our semantics. + // to be consistent with our semantics (and our docs). final ViewGroup.LayoutParams lp = getLayoutParams(); if (widthMode == AT_MOST && lp.width == MATCH_PARENT) widthMode = EXACTLY; if (heightMode == AT_MOST && lp.height == MATCH_PARENT) heightMode = EXACTLY; @@ -261,7 +262,7 @@ public class CameraView extends FrameLayout { // If we have fixed dimensions (either 300dp or MATCH_PARENT), there's nothing we should do, // other than respect it. The preview will eventually be cropped at the sides (by PreviewImpl scaling) - // except the case in which these fixed dimensions somehow fit exactly the preview aspect ratio. + // except the case in which these fixed dimensions manage to fit exactly the preview aspect ratio. if (widthMode == EXACTLY && heightMode == EXACTLY) { Log.e(TAG, "onMeasure, both are MATCH_PARENT or fixed value. We adapt. This means CROP_INSIDE. " + "(" + widthValue + "x" + heightValue + ")"); @@ -272,17 +273,20 @@ public class CameraView extends FrameLayout { // If both dimensions are free, with no limits, then our size will be exactly the // preview size. This can happen rarely, for example in scrollable containers. if (widthMode == UNSPECIFIED && heightMode == UNSPECIFIED) { - Log.e(TAG, "onMeasure, both are completely free. We respect that and extend to the whole preview size. " + + Log.e(TAG, "onMeasure, both are completely free. " + + "We respect that and extend to the whole preview size. " + "(" + previewWidth + "x" + previewHeight + ")"); - super.onMeasure(MeasureSpec.makeMeasureSpec((int) previewWidth, EXACTLY), + super.onMeasure( + MeasureSpec.makeMeasureSpec((int) previewWidth, EXACTLY), MeasureSpec.makeMeasureSpec((int) previewHeight, EXACTLY)); return; } - // It sure now that at least one dimension can be determined (either because EXACTLY or AT_MOST). + // It's sure now that at least one dimension can be determined (either because EXACTLY or AT_MOST). // This starts to seem a pleasant situation. - // If one of the dimension is completely free, take the other and fit the ratio. + // If one of the dimension is completely free (e.g. in a scrollable container), + // take the other and fit the ratio. // One of the two might be AT_MOST, but we use the value anyway. float ratio = previewHeight / previewWidth; if (widthMode == UNSPECIFIED || heightMode == UNSPECIFIED) { @@ -325,7 +329,7 @@ public class CameraView extends FrameLayout { // Last case, AT_MOST and AT_MOST. Here we can SURELY fit the aspect ratio by filling one // dimension and adapting the other. int height, width; - float atMostRatio = heightValue / widthValue; + float atMostRatio = (float) heightValue / (float) widthValue; if (atMostRatio >= ratio) { // We must reduce height. width = widthValue; @@ -340,10 +344,9 @@ public class CameraView extends FrameLayout { MeasureSpec.makeMeasureSpec(height, EXACTLY)); } + //endregion - // Gesture APIs and touch control - // ------------------------------ - + //region Gesture APIs /** * Maps a {@link Gesture} to a certain gesture action. @@ -468,10 +471,9 @@ public class CameraView extends FrameLayout { return false; } + //endregion - // Lifecycle APIs - // -------------- - + //region Lifecycle APIs /** * Returns whether the camera has started showing its preview. @@ -586,10 +588,9 @@ public class CameraView extends FrameLayout { mWorkerHandler = null; } + //endregion - // Public APIs for parameters and controls - // --------------------------------------- - + //region Public APIs for controls /** * Returns a {@link CameraOptions} instance holding supported options for this camera @@ -1158,10 +1159,9 @@ public class CameraView extends FrameLayout { } } + //endregion - // Callbacks and dispatch - // ---------------------- - + //region Callbacks and dispatching private MediaActionSound mSound; private final boolean mUseSounds = Build.VERSION.SDK_INT >= 16; @@ -1394,10 +1394,9 @@ public class CameraView extends FrameLayout { } } + //endregion - // Deprecated stuff - // ---------------- - + //region Deprecated /** * This does nothing. @@ -1459,4 +1458,5 @@ public class CameraView extends FrameLayout { return 0; } + //endregion } From 3c564d0c1d34d1780b872e366dce01f6b80561a7 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 27 Aug 2017 16:09:25 +0200 Subject: [PATCH 3/3] Bump version --- README.md | 2 +- cameraview/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13cbcc08..e6c7fde1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ CameraView is a well documented, high-level library that makes capturing pictures and videos easy, addressing most of the common issues and needs, and still leaving you with flexibility where needed. ```groovy -compile 'com.otaliastudios:cameraview:1.1.3' +compile 'com.otaliastudios:cameraview:1.1.4' ```

diff --git a/cameraview/build.gradle b/cameraview/build.gradle index f8ae70cc..c64ea93a 100644 --- a/cameraview/build.gradle +++ b/cameraview/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' // Required by bintray -version = '1.1.3' +version = '1.1.4' group = 'com.otaliastudios' android {