Fix aspect ratio of taken pictures

Fixes google#127 Fixes google#78 Fixes google#46 Fixes google#20 Change-Id: I93f62823f3c1fd8a28ee4b659a9a5b7c81f183fc
oyindonesia · Apr 13, 2017 · 9bbe07b · 9bbe07b
1 parent 0c87b4e
commit 9bbe07b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/demo/src/main/java/com/google/android/cameraview/demo/AspectRatioFragment.java b/demo/src/main/java/com/google/android/cameraview/demo/AspectRatioFragment.java
@@ -31,6 +31,7 @@
 
 import com.google.android.cameraview.AspectRatio;
 
+import java.util.Arrays;
 import java.util.Set;
 
 
@@ -75,6 +76,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         if (ratios == null) {
             throw new RuntimeException("No ratios");
         }
+        Arrays.sort(ratios);
         final AspectRatio current = args.getParcelable(ARG_CURRENT_ASPECT_RATIO);
         final AspectRatioAdapter adapter = new AspectRatioAdapter(ratios, current);
         return new AlertDialog.Builder(getActivity())

diff --git a/demo/src/main/java/com/google/android/cameraview/demo/MainActivity.java b/demo/src/main/java/com/google/android/cameraview/demo/MainActivity.java
@@ -30,6 +30,7 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
@@ -188,30 +189,32 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.aspect_ratio:
-                if (mCameraView != null) {
+                FragmentManager fragmentManager = getSupportFragmentManager();
+                if (mCameraView != null
+                        && fragmentManager.findFragmentByTag(FRAGMENT_DIALOG) == null) {
                     final Set<AspectRatio> ratios = mCameraView.getSupportedAspectRatios();
                     final AspectRatio currentRatio = mCameraView.getAspectRatio();
                     AspectRatioFragment.newInstance(ratios, currentRatio)
-                            .show(getSupportFragmentManager(), FRAGMENT_DIALOG);
+                            .show(fragmentManager, FRAGMENT_DIALOG);
                 }
-                break;
+                return true;
             case R.id.switch_flash:
                 if (mCameraView != null) {
                     mCurrentFlash = (mCurrentFlash + 1) % FLASH_OPTIONS.length;
                     item.setTitle(FLASH_TITLES[mCurrentFlash]);
                     item.setIcon(FLASH_ICONS[mCurrentFlash]);
                     mCameraView.setFlash(FLASH_OPTIONS[mCurrentFlash]);
                 }
-                break;
+                return true;
             case R.id.switch_camera:
                 if (mCameraView != null) {
                     int facing = mCameraView.getFacing();
                     mCameraView.setFacing(facing == CameraView.FACING_FRONT ?
                             CameraView.FACING_BACK : CameraView.FACING_FRONT);
                 }
-                break;
+                return true;
         }
-        return false;
+        return super.onOptionsItemSelected(item);
     }
 
     @Override

diff --git a/demo/src/main/res/layout-land/activity_main.xml b/demo/src/main/res/layout-land/activity_main.xml
@@ -46,8 +46,8 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_margin="16dp"
         app:srcCompat="@drawable/ic_camera"
+        app:useCompatPadding="true"
         tools:ignore="RelativeOverlap"/>
 
 </RelativeLayout>
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
@@ -45,7 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_camera"/>
+        app:srcCompat="@drawable/ic_camera"
+        app:useCompatPadding="true"/>
 
 </RelativeLayout>
diff --git a/library/src/main/api21/com/google/android/cameraview/Camera2.java b/library/src/main/api21/com/google/android/cameraview/Camera2.java
@@ -269,6 +269,7 @@ boolean setAspectRatio(AspectRatio ratio) {
             return false;
         }
         mAspectRatio = ratio;
+        prepareImageReader();
         if (mCaptureSession != null) {
             mCaptureSession.close();
             mCaptureSession = null;
@@ -443,6 +444,9 @@ protected void collectPictureSizes(SizeMap sizes, StreamConfigurationMap map) {
     }
 
     private void prepareImageReader() {
+        if (mImageReader != null) {
+            mImageReader.close();
+        }
         Size largest = mPictureSizes.sizes(mAspectRatio).last();
         mImageReader = ImageReader.newInstance(largest.getWidth(), largest.getHeight(),
                 ImageFormat.JPEG, /* maxImages */ 2);