Dev

yuriy-budiyev · Nov 19, 2017 · ff697d9 · ff697d9
1 parent f91104e
commit ff697d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
diff --git a/src/main/java/com/budiyev/android/codescanner/CodeScannerView.java b/src/main/java/com/budiyev/android/codescanner/CodeScannerView.java
@@ -191,12 +191,12 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
         int height = bottom - top;
         Point previewSize = mPreviewSize;
         if (previewSize == null) {
-            mPreviewView.layout(left, top, right, bottom);
+            mPreviewView.layout(0, 0, width, height);
         } else {
-            int frameLeft = left;
-            int frameTop = top;
-            int frameRight = right;
-            int frameBottom = bottom;
+            int frameLeft = 0;
+            int frameTop = 0;
+            int frameRight = width;
+            int frameBottom = height;
             int previewWidth = previewSize.getX();
             if (previewWidth > width) {
                 int d = (previewWidth - width) / 2;
@@ -211,10 +211,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
             }
             mPreviewView.layout(frameLeft, frameTop, frameRight, frameBottom);
         }
-        mViewFinderView.layout(left, top, right, bottom);
+        mViewFinderView.layout(0, 0, width, height);
         int buttonSize = mButtonSize;
-        mAutoFocusButton.layout(left, top, left + buttonSize, top + buttonSize);
-        mFlashButton.layout(right - buttonSize, top, right, top + buttonSize);
+        mAutoFocusButton.layout(0, 0, buttonSize, buttonSize);
+        mFlashButton.layout(width - buttonSize, 0, width, buttonSize);
         LayoutListener listener = mLayoutListener;
         if (listener != null) {
             listener.onLayout(width, height);