Tweak live ODT code.

Change-Id: I1c23ab8b523404a054525c0e8ac7cbb54897abb0

Author: zhouyiself

mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/java/objectdetection/ObjectDetectorProcessor.java

@@ -36,7 +36,7 @@ public void stop() {
  try {
  detector.close();
  } catch (IOException e) {
- Log.e(TAG, "Exception thrown while trying to close Face Contour Detector: " + e);
+ Log.e(TAG, "Exception thrown while trying to close object detector!", e);
  }
  }
 
@@ -65,7 +65,6 @@ protected void onSuccess(
 
  @Override
  protected void onFailure(@NonNull Exception e) {
- Log.e(TAG, "Object detection failed " + e);
+ Log.e(TAG, "Object detection failed!", e);
  }
 }
-

mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/java/objectdetection/ObjectGraphic.java

@@ -13,42 +13,26 @@
 /** Draw the detected object info in preview. */
 public class ObjectGraphic extends Graphic {
 
- private static final int TEXT_COLOR = Color.WHITE;
  private static final float TEXT_SIZE = 54.0f;
  private static final float STROKE_WIDTH = 4.0f;
 
- private final Paint rectPaint;
- private final Paint labelPaint;
- private final Paint idPaint;
- private final Paint scorePaint;
- private final Paint entityIdPaint;
  private final FirebaseVisionObject object;
+ private final Paint boxPaint;
+ private final Paint textPaint;
 
  ObjectGraphic(GraphicOverlay overlay, FirebaseVisionObject object) {
  super(overlay);
 
  this.object = object;
 
- rectPaint = new Paint();
- rectPaint.setColor(TEXT_COLOR);
- rectPaint.setStyle(Style.STROKE);
- rectPaint.setStrokeWidth(STROKE_WIDTH);
+ boxPaint = new Paint();
+ boxPaint.setColor(Color.WHITE);
+ boxPaint.setStyle(Style.STROKE);
+ boxPaint.setStrokeWidth(STROKE_WIDTH);
 
- labelPaint = new Paint();
- labelPaint.setColor(TEXT_COLOR);
- labelPaint.setTextSize(TEXT_SIZE);
-
- idPaint = new Paint();
- idPaint.setColor(TEXT_COLOR);
- idPaint.setTextSize(TEXT_SIZE);
-
- scorePaint = new Paint();
- scorePaint.setColor(TEXT_COLOR);
- scorePaint.setTextSize(TEXT_SIZE);
-
- entityIdPaint = new Paint();
- entityIdPaint.setColor(TEXT_COLOR);
- entityIdPaint.setTextSize(TEXT_SIZE);
+ textPaint = new Paint();
+ textPaint.setColor(Color.WHITE);
+ textPaint.setTextSize(TEXT_SIZE);
  }
 
  @Override
@@ -59,19 +43,18 @@ public void draw(Canvas canvas) {
  rect.top = translateY(rect.top);
  rect.right = translateX(rect.right);
  rect.bottom = translateY(rect.bottom);
- canvas.drawRect(rect, rectPaint);
-
- // Renders the label at the bottom of the box.
+ canvas.drawRect(rect, boxPaint);
 
+ // Draws other object info.
  canvas.drawText(
- getLabel(object.getClassificationCategory()), rect.left, rect.bottom, labelPaint);
- canvas.drawText("id: " + object.getTrackingId(), rect.left, rect.top, idPaint);
+ getCategoryName(object.getClassificationCategory()), rect.left, rect.bottom, textPaint);
+ canvas.drawText("trackingId: " + object.getTrackingId(), rect.left, rect.top, textPaint);
  canvas.drawText(
- "confidence: " + object.getClassificationConfidence(), rect.right, rect.bottom, idPaint);
- canvas.drawText("eid:" + object.getEntityId(), rect.right, rect.top, labelPaint);
+ "confidence: " + object.getClassificationConfidence(), rect.right, rect.bottom, textPaint);
+ canvas.drawText("eid:" + object.getEntityId(), rect.right, rect.top, textPaint);
  }
 
- private static String getLabel(@FirebaseVisionObject.Category int category) {
+ private static String getCategoryName(@FirebaseVisionObject.Category int category) {
  switch (category) {
  case FirebaseVisionObject.CATEGORY_UNKNOWN:
  return "Unknown";