Minor updates for IO 2018. Happy Codelabbing, all.

Author: Ben Johns

visionSamples/ocr-codelab/ocr-reader-complete/app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 24
- buildToolsVersion '25.0.0'
+ compileSdkVersion 27
+ buildToolsVersion '27.0.3'
 
  defaultConfig {
- applicationId "com.google.android.gms.samples.vision.barcodereader"
+ applicationId "com.google.android.gms.samples.vision.ocrreader"
  minSdkVersion 21
- targetSdkVersion 23
+ targetSdkVersion 27
  versionCode 1
  versionName "1.0"
  }
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
- compile fileTree(dir: 'libs', include: ['*.jar'])
-compile 'com.android.support:support-v4:24.2.0'
- compile 'com.google.android.gms:play-services-vision:9.4.0+'
- compile 'com.android.support:design:24.2.0'
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'com.android.support:support-v4:27.1.1'
+ implementation 'com.android.support:design:27.1.1'
+ implementation 'com.google.android.gms:play-services-vision:15.0.0'
 }

visionSamples/ocr-codelab/ocr-reader-complete/app/src/main/java/com/google/android/gms/samples/vision/ocrreader/OcrCaptureActivity.java

@@ -26,7 +26,6 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.hardware.Camera;
-import android.os.Build;
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
 import android.support.annotation.NonNull;
@@ -42,7 +41,6 @@
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.samples.vision.ocrreader.ui.camera.CameraSource;
 import com.google.android.gms.samples.vision.ocrreader.ui.camera.CameraSourcePreview;
 import com.google.android.gms.samples.vision.ocrreader.ui.camera.GraphicOverlay;
@@ -71,9 +69,9 @@ public final class OcrCaptureActivity extends AppCompatActivity {
  public static final String UseFlash = "UseFlash";
  public static final String TextBlockObject = "String";
 
- private CameraSource mCameraSource;
- private CameraSourcePreview mPreview;
- private GraphicOverlay<OcrGraphic> mGraphicOverlay;
+ private CameraSource cameraSource;
+ private CameraSourcePreview preview;
+ private GraphicOverlay<OcrGraphic> graphicOverlay;
 
  // Helper objects for detecting taps and pinches.
  private ScaleGestureDetector scaleGestureDetector;
@@ -90,8 +88,8 @@ public void onCreate(Bundle bundle) {
  super.onCreate(bundle);
  setContentView(R.layout.ocr_capture);
 
- mPreview = (CameraSourcePreview) findViewById(R.id.preview);
- mGraphicOverlay = (GraphicOverlay<OcrGraphic>) findViewById(R.id.graphicOverlay);
+ preview = (CameraSourcePreview) findViewById(R.id.preview);
+ graphicOverlay = (GraphicOverlay<OcrGraphic>) findViewById(R.id.graphicOverlay);
 
  // Set good defaults for capturing text.
  boolean autoFocus = true;
@@ -109,7 +107,7 @@ public void onCreate(Bundle bundle) {
  gestureDetector = new GestureDetector(this, new CaptureGestureListener());
  scaleGestureDetector = new ScaleGestureDetector(this, new ScaleListener());
 
- Snackbar.make(mGraphicOverlay, "Tap to Speak. Pinch/Stretch to zoom",
+ Snackbar.make(graphicOverlay, "Tap to Speak. Pinch/Stretch to zoom",
  Snackbar.LENGTH_LONG)
  .show();
 
@@ -155,7 +153,7 @@ public void onClick(View view) {
  }
  };
 
- Snackbar.make(mGraphicOverlay, R.string.permission_camera_rationale,
+ Snackbar.make(graphicOverlay, R.string.permission_camera_rationale,
  Snackbar.LENGTH_INDEFINITE)
  .setAction(R.string.ok, listener)
  .show();
@@ -187,7 +185,7 @@ private void createCameraSource(boolean autoFocus, boolean useFlash) {
  // graphics for each text block on screen. The factory is used by the multi-processor to
  // create a separate tracker instance for each text block.
  TextRecognizer textRecognizer = new TextRecognizer.Builder(context).build();
- textRecognizer.setProcessor(new OcrDetectorProcessor(mGraphicOverlay));
+ textRecognizer.setProcessor(new OcrDetectorProcessor(graphicOverlay));
 
  if (!textRecognizer.isOperational()) {
  // Note: The first time that an app using a Vision API is installed on a
@@ -214,7 +212,7 @@ private void createCameraSource(boolean autoFocus, boolean useFlash) {
 
  // Creates and starts the camera. Note that this uses a higher resolution in comparison
  // to other detection examples to enable the text recognizer to detect small pieces of text.
- mCameraSource =
+ cameraSource =
  new CameraSource.Builder(getApplicationContext(), textRecognizer)
  .setFacing(CameraSource.CAMERA_FACING_BACK)
  .setRequestedPreviewSize(1280, 1024)
@@ -239,8 +237,8 @@ protected void onResume() {
  @Override
  protected void onPause() {
  super.onPause();
- if (mPreview != null) {
- mPreview.stop();
+ if (preview != null) {
+ preview.stop();
  }
  }
 
@@ -251,8 +249,8 @@ protected void onPause() {
  @Override
  protected void onDestroy() {
  super.onDestroy();
- if (mPreview != null) {
- mPreview.release();
+ if (preview != null) {
+ preview.release();
  }
  }
 
@@ -285,7 +283,7 @@ public void onRequestPermissionsResult(int requestCode,
  if (grantResults.length != 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
  Log.d(TAG, "Camera permission granted - initialize the camera source");
  // we have permission, so create the camerasource
- boolean autoFocus = getIntent().getBooleanExtra(AutoFocus,false);
+ boolean autoFocus = getIntent().getBooleanExtra(AutoFocus,true);
  boolean useFlash = getIntent().getBooleanExtra(UseFlash, false);
  createCameraSource(autoFocus, useFlash);
  return;
@@ -322,13 +320,13 @@ private void startCameraSource() throws SecurityException {
  dlg.show();
  }
 
- if (mCameraSource != null) {
+ if (cameraSource != null) {
  try {
- mPreview.start(mCameraSource, mGraphicOverlay);
+ preview.start(cameraSource, graphicOverlay);
  } catch (IOException e) {
  Log.e(TAG, "Unable to start camera source.", e);
- mCameraSource.release();
- mCameraSource = null;
+ cameraSource.release();
+ cameraSource = null;
  }
  }
  }
@@ -341,7 +339,7 @@ private void startCameraSource() throws SecurityException {
  * @return true if the tap was on a TextBlock
  */
  private boolean onTap(float rawX, float rawY) {
- OcrGraphic graphic = mGraphicOverlay.getGraphicAtLocation(rawX, rawY);
+ OcrGraphic graphic = graphicOverlay.getGraphicAtLocation(rawX, rawY);
  TextBlock text = null;
  if (graphic != null) {
  text = graphic.getTextBlock();
@@ -418,8 +416,8 @@ public boolean onScaleBegin(ScaleGestureDetector detector) {
  */
  @Override
  public void onScaleEnd(ScaleGestureDetector detector) {
- if (mCameraSource != null) {
- mCameraSource.doZoom(detector.getScaleFactor());
+ if (cameraSource != null) {
+ cameraSource.doZoom(detector.getScaleFactor());
  }
  }
  }

visionSamples/ocr-codelab/ocr-reader-complete/app/src/main/java/com/google/android/gms/samples/vision/ocrreader/OcrDetectorProcessor.java

@@ -28,10 +28,10 @@
  */
 public class OcrDetectorProcessor implements Detector.Processor<TextBlock> {
 
- private GraphicOverlay<OcrGraphic> mGraphicOverlay;
+ private GraphicOverlay<OcrGraphic> graphicOverlay;
 
  OcrDetectorProcessor(GraphicOverlay<OcrGraphic> ocrGraphicOverlay) {
- mGraphicOverlay = ocrGraphicOverlay;
+ graphicOverlay = ocrGraphicOverlay;
  }
 
  /**
@@ -43,15 +43,15 @@ public class OcrDetectorProcessor implements Detector.Processor<TextBlock> {
  */
  @Override
  public void receiveDetections(Detector.Detections<TextBlock> detections) {
- mGraphicOverlay.clear();
+ graphicOverlay.clear();
  SparseArray<TextBlock> items = detections.getDetectedItems();
  for (int i = 0; i < items.size(); ++i) {
  TextBlock item = items.valueAt(i);
  if (item != null && item.getValue() != null) {
  Log.d("OcrDetectorProcessor", "Text detected! " + item.getValue());
+ OcrGraphic graphic = new OcrGraphic(graphicOverlay, item);
+ graphicOverlay.add(graphic);
  }
- OcrGraphic graphic = new OcrGraphic(mGraphicOverlay, item);
- mGraphicOverlay.add(graphic);
  }
  }
 
@@ -60,6 +60,6 @@ public void receiveDetections(Detector.Detections<TextBlock> detections) {
  */
  @Override
  public void release() {
- mGraphicOverlay.clear();
+ graphicOverlay.clear();
  }
 }

visionSamples/ocr-codelab/ocr-reader-complete/app/src/main/java/com/google/android/gms/samples/vision/ocrreader/OcrGraphic.java

@@ -32,45 +32,45 @@
  */
 public class OcrGraphic extends GraphicOverlay.Graphic {
 
- private int mId;
+ private int id;
 
  private static final int TEXT_COLOR = Color.WHITE;
 
- private static Paint sRectPaint;
- private static Paint sTextPaint;
- private final TextBlock mText;
+ private static Paint rectPaint;
+ private static Paint textPaint;
+ private final TextBlock textBlock;
 
  OcrGraphic(GraphicOverlay overlay, TextBlock text) {
  super(overlay);
 
- mText = text;
+ textBlock = text;
 
- if (sRectPaint == null) {
- sRectPaint = new Paint();
- sRectPaint.setColor(TEXT_COLOR);
- sRectPaint.setStyle(Paint.Style.STROKE);
- sRectPaint.setStrokeWidth(4.0f);
+ if (rectPaint == null) {
+ rectPaint = new Paint();
+ rectPaint.setColor(TEXT_COLOR);
+ rectPaint.setStyle(Paint.Style.STROKE);
+ rectPaint.setStrokeWidth(4.0f);
  }
 
- if (sTextPaint == null) {
- sTextPaint = new Paint();
- sTextPaint.setColor(TEXT_COLOR);
- sTextPaint.setTextSize(54.0f);
+ if (textPaint == null) {
+ textPaint = new Paint();
+ textPaint.setColor(TEXT_COLOR);
+ textPaint.setTextSize(54.0f);
  }
  // Redraw the overlay, as this graphic has been added.
  postInvalidate();
  }
 
  public int getId() {
- return mId;
+ return id;
  }
 
  public void setId(int id) {
- this.mId = id;
+ this.id = id;
  }
 
  public TextBlock getTextBlock() {
- return mText;
+ return textBlock;
  }
 
  /**
@@ -81,14 +81,11 @@ public TextBlock getTextBlock() {
  * @return True if the provided point is contained within this graphic's bounding box.
  */
  public boolean contains(float x, float y) {
- if (mText == null) {
+ if (textBlock == null) {
  return false;
  }
- RectF rect = new RectF(mText.getBoundingBox());
- rect.left = translateX(rect.left);
- rect.top = translateY(rect.top);
- rect.right = translateX(rect.right);
- rect.bottom = translateY(rect.bottom);
+ RectF rect = new RectF(textBlock.getBoundingBox());
+ rect = translateRect(rect);
  return (rect.left < x && rect.right > x && rect.top < y && rect.bottom > y);
  }
 
@@ -97,24 +94,21 @@ public boolean contains(float x, float y) {
  */
  @Override
  public void draw(Canvas canvas) {
- if (mText == null) {
+ if (textBlock == null) {
  return;
  }
 
  // Draws the bounding box around the TextBlock.
- RectF rect = new RectF(mText.getBoundingBox());
- rect.left = translateX(rect.left);
- rect.top = translateY(rect.top);
- rect.right = translateX(rect.right);
- rect.bottom = translateY(rect.bottom);
- canvas.drawRect(rect, sRectPaint);
+ RectF rect = new RectF(textBlock.getBoundingBox());
+ rect = translateRect(rect);
+ canvas.drawRect(rect, rectPaint);
 
  // Break the text into multiple lines and draw each one according to its own bounding box.
- List<? extends Text> textComponents = mText.getComponents();
+ List<? extends Text> textComponents = textBlock.getComponents();
  for(Text currentText : textComponents) {
  float left = translateX(currentText.getBoundingBox().left);
  float bottom = translateY(currentText.getBoundingBox().bottom);
- canvas.drawText(currentText.getValue(), left, bottom, sTextPaint);
+ canvas.drawText(currentText.getValue(), left, bottom, textPaint);
  }
  }
 }