[#4] Android UI doesn't support Portrait and is small - support Andro…

…id projects which have not set targetSDK (crashed without it)
phonegap · May 13, 2015 · f74da67 · f74da67
1 parent a250540
commit f74da67
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 44 deletions.
diff --git a/src/android/LibraryProject/src/com/google/zxing/client/android/CaptureActivity.java b/src/android/LibraryProject/src/com/google/zxing/client/android/CaptureActivity.java
@@ -16,6 +16,10 @@
 
 package com.google.zxing.client.android;
 
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.hardware.Camera;
+import android.widget.Button;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.ResultMetadataType;
@@ -28,6 +32,7 @@
 import com.google.zxing.client.android.result.ResultHandler;
 import com.google.zxing.client.android.result.ResultHandlerFactory;
 import com.google.zxing.client.android.result.supplement.SupplementalInfoRetriever;
+import com.google.zxing.client.android.share.BookmarkPickerActivity;
 import com.google.zxing.client.android.share.ShareActivity;
 
 import android.app.Activity;
@@ -110,6 +115,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
   private Result savedResultToShow;
   private ViewfinderView viewfinderView;
   private TextView statusView;
+  private Button flipButton;
   private View resultView;
   private Result lastResult;
   private boolean hasSurface;
@@ -136,6 +142,14 @@ CameraManager getCameraManager() {
     return cameraManager;
   }
 
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    // recreate is required for cases when no targetSdkVersion has been set in AndroidManifest.xml
+    // and the orientation has changed
+    recreate();
+  }
+
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);

diff --git a/...LibraryProject/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/...LibraryProject/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -16,28 +16,20 @@
 
 package com.google.zxing.client.android.camera;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Point;
-import android.graphics.Rect;
 import android.hardware.Camera;
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.Surface;
-import android.view.Window;
 import android.view.WindowManager;
-
 import com.google.zxing.client.android.PreferencesActivity;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 
 /**
  * A class which deals with reading, parsing, and setting the camera parameters which are used to
@@ -90,7 +82,7 @@ void initFromCameraParameters(Camera camera) {
       }
     }
 //    height -= statusBarHeight();
-//    height -= 40; // statusBarHeight();
+    height -= 50;
 
     screenResolution.set(width, height);
 
@@ -269,6 +261,15 @@ public int compare(Camera.Size a, Camera.Size b) {
       Log.i(TAG, "No suitable preview sizes, using default: " + bestSize);
     }
 
+    WindowManager manager = (WindowManager) this.context.getSystemService(Context.WINDOW_SERVICE);
+    int rotation = manager.getDefaultDisplay().getRotation();
+    // don't vertically stretch the camera view on portrait mode
+    if (rotation == Surface.ROTATION_0) {
+      if (bestSize.y <= bestSize.x) {
+        bestSize.y = (int) ((float)bestSize.y / screenAspectRatio * ((float)bestSize.x / (float)  bestSize.y));
+      }
+    }
+
     Log.i(TAG, "Found best approximate preview size: " + bestSize);
     return bestSize;
   }
@@ -288,12 +289,4 @@ private static String findSettableValue(Collection<String> supportedValues,
     Log.i(TAG, "Settable value: " + result);
     return result;
   }
-/*
-  private int statusBarHeight() {
-    Window window = this.activity.getWindow();
-    Rect rect = new Rect();
-    window.getDecorView().getWindowVisibleDisplayFrame(rect);
-    return rect.top;
-  }
-  */
 }
diff --git a/src/android/LibraryProject/src/com/google/zxing/client/android/camera/CameraManager.java b/src/android/LibraryProject/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -44,8 +44,8 @@ public final class CameraManager {
 
   private static final int MIN_FRAME_WIDTH = 240;
   private static final int MIN_FRAME_HEIGHT = 240;
-  private static final int MAX_FRAME_WIDTH = 960;
-  private static final int MAX_FRAME_HEIGHT = 700;
+  private static final int MAX_FRAME_WIDTH = 880;
+  private static final int MAX_FRAME_HEIGHT = 680;
 
   private final Context context;
   private final CameraConfigurationManager configManager;
@@ -255,10 +255,6 @@ public synchronized Rect getFramingRectInPreview() {
         // Called early, before init even finished
         return null;
       }
-//      rect.left = rect.left * cameraResolution.x / screenResolution.x;
-//      rect.right = rect.right * cameraResolution.x / screenResolution.x;
-//      rect.top = rect.top * cameraResolution.y / screenResolution.y;
-//      rect.bottom = rect.bottom * cameraResolution.y / screenResolution.y;
 
       Display display = windowManager.getDefaultDisplay();
       int rotation = display.getRotation();
@@ -307,30 +303,12 @@ public synchronized void setManualFramingRect(int width, int height) {
    * @return A PlanarYUVLuminanceSource instance.
    */
   public PlanarYUVLuminanceSource buildLuminanceSource(byte[] data, int width, int height) {
-    // Hack of orientation
-    Display display = windowManager.getDefaultDisplay();
-    int rotation = display.getRotation();
-
-    byte[] rotatedData = new byte[data.length];
-    if (rotation == Surface.ROTATION_0) {
-      for (int y = 0; y < height; y++) {
-        for (int x = 0; x < width; x++) {
-          rotatedData[x * height + height - y - 1] = data[x + y * width];
-        }
-      }
-      int tmp = width;
-      width = height;
-      height = tmp;
-    } else {
-      rotatedData = null;
-    }
-
     Rect rect = getFramingRectInPreview();
     if (rect == null) {
       return null;
     }
     // Go ahead and assume it's YUV rather than die.
-    return new PlanarYUVLuminanceSource(rotation == Surface.ROTATION_0 ? rotatedData: data, width, height, rect.left, rect.top,
-                                         rect.width(), rect.height(), false);
+    return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top,
+        rect.width(), rect.height(), false);
   }
 }