From 77a99be2ddbc9fe2cbdc1e3fcc93fa30e66ac0c7 Mon Sep 17 00:00:00 2001
From: hungngo97 <hung.ngovinh97@gmail.com>
Date: Tue, 2 Jul 2019 19:44:54 -0700
Subject: [PATCH 1/2] Added minor UI fixes

---
 .../rdt_reader/ImageQualityActivity.java         | 13 +------------
 app/src/main/res/drawable/rounded_button.xml     | 16 ++++++++++++++++
 .../res/layout/activity_image_quality_opencv.xml | 14 +++++++-------
 app/src/main/res/layout/activity_main.xml        |  4 ++++
 app/src/main/res/values/colors.xml               |  2 +-
 app/src/main/res/values/strings.xml              | 14 +++++++-------
 app/src/main/res/values/styles.xml               |  2 +-
 build.gradle                                     |  2 +-
 openCVLibrary341/build.gradle                    |  2 +-
 openCVLibrary341/src/main/AndroidManifest.xml    |  2 +-
 10 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_button.xml

diff --git a/app/src/main/java/edu/washington/cs/ubicomplab/rdt_reader/ImageQualityActivity.java b/app/src/main/java/edu/washington/cs/ubicomplab/rdt_reader/ImageQualityActivity.java
index 00344d79..4be85f8a 100644
--- a/app/src/main/java/edu/washington/cs/ubicomplab/rdt_reader/ImageQualityActivity.java
+++ b/app/src/main/java/edu/washington/cs/ubicomplab/rdt_reader/ImageQualityActivity.java
@@ -1302,25 +1302,14 @@ private void displayQualityResult (boolean[] isCorrectPosSize, boolean isBlur, b
             }
 
             mImageQualityFeedbackView.setText(Html.fromHtml(message));
-            if (isCorrectPosSize[0] && isCorrectPosSize[1] && isCorrectPosSize[2] && !isBlur && !isOverExposed && !isUnderExposed && !isShadow) {
-                if (mViewport.getBackgroundColorId() != R.color.green_overlay) {
-                    mViewport.setBackgroundColoId(R.color.green_overlay);
-                }
-            } else {
-                if (mViewport.getBackgroundColorId() != R.color.red_overlay) {
-                    mViewport.setBackgroundColoId(R.color.red_overlay);
-                }
-            }
         } else if (currFocusState == FocusState.INACTIVE) {
             mInstructionText.setText(getResources().getString(R.string.instruction_pos));
-            mViewport.setBackgroundColoId(R.color.red_overlay);
         } else if (currFocusState == FocusState.UNFOCUSED) {
             mInstructionText.setText(getResources().getString(R.string.instruction_unfocused));
-            mViewport.setBackgroundColoId(R.color.red_overlay);
         } else if (currFocusState == FocusState.FOCUSING) {
             mInstructionText.setText(getResources().getString(R.string.instruction_focusing));
-            mViewport.setBackgroundColoId(R.color.red_overlay);
         }
+        mViewport.setBackgroundColoId(R.color.black_overlay);
     }
 
 
diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml
new file mode 100644
index 00000000..654ce9fb
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_button.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 University of Washington Ubicomp Lab
+  ~ All rights reserved.
+  ~
+  ~ This software may be modified and distributed under the terms
+  ~ of a BSD-style license that can be found in the LICENSE file.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="150dp"></corners>
+    <solid android:color="@color/colorPrimaryDark" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_image_quality_opencv.xml b/app/src/main/res/layout/activity_image_quality_opencv.xml
index 35071704..f5d3f086 100644
--- a/app/src/main/res/layout/activity_image_quality_opencv.xml
+++ b/app/src/main/res/layout/activity_image_quality_opencv.xml
@@ -56,12 +56,12 @@
         style="?android:attr/progressBarStyle"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:indeterminate="true"
-        android:visibility="visible"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/img_quality_check_viewport"
         app:layout_constraintEnd_toEndOf="@+id/img_quality_check_viewport"
         app:layout_constraintStart_toStartOf="@+id/img_quality_check_viewport"
@@ -71,9 +71,9 @@
         android:id="@+id/progressText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
         android:text="@string/progress_initialization"
         android:textAlignment="center"
         android:textAppearance="@android:style/TextAppearance.Material.Medium"
@@ -106,10 +106,10 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:background="@drawable/circular_shape"
         android:indeterminate="false"
         android:max="10"
@@ -120,6 +120,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="invisible" />
 
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 48b7f52c..0049e634 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,6 +15,7 @@
         android:layout_marginTop="16dp"
         android:text="@string/exp_date_check"
         android:theme="@style/PrimaryButton"
+        android:background="@drawable/rounded_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -28,6 +29,7 @@
         android:layout_marginTop="8dp"
         android:text="@string/image_quality"
         android:theme="@style/PrimaryButton"
+        android:background="@drawable/rounded_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/expdateButton" />
@@ -41,6 +43,7 @@
         android:layout_marginStart="8dp"
         android:text="@string/settings"
         android:theme="@style/PrimaryButton"
+        android:background="@drawable/rounded_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -54,6 +57,7 @@
         android:layout_marginTop="8dp"
         android:text="Test Camera2"
         android:theme="@style/PrimaryButton"
+        android:background="@drawable/rounded_button"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4855240a..4e8cb8db 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,7 +9,7 @@
     <color name="transparent_overlay">#00000000</color>
     <color name="gray_overlay">#33000000</color>
     <color name="red_overlay">#66FF0000</color>
-    <color name="green_overlay">#6600FF00</color>
+    <color name="green_overlay">#662ead2e</color>
 
     <color name="control_background">#cc4285f4</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0109cf0..2873dda4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,19 +4,19 @@
     <string name="title_activity_camera2_test">Camera2TestActivity</string>
     <string name="progress_initialization">Stay still…</string>
     <string name="progress_final">Captured! Analyzing the image…</string>
-    <string name="instruction">Place the RDT inside the rectangle.</string>
+    <string name="instruction">Fit RDT in the rectangle. Hold still...</string>
     <string name="instruction_detected"><![CDATA[RDT detected at the center!]]></string>
     <string name="instruction_pos"><![CDATA[Place RDT at the center.\nFit RDT to the rectangle.]]></string>
     <string name="instruction_too_small"><![CDATA[Place RDT at the center.\nFit RDT to the rectangle.\nMove closer.]]></string>
     <string name="instruction_too_large"><![CDATA[Place RDT at the center.\nFit RDT to the rectangle.\nMove further away.]]></string>
     <string name="instruction_focusing"><![CDATA[Place RDT at the center.\nFit RDT to the rectangle.\nCamera is focusing. \nStay still.]]></string>
     <string name="instruction_unfocused"><![CDATA[Place RDT at the center.\n Fit RDT to the rectangle.\nCamera is not focused. \nMove further away.]]></string>
-    <string name="over_exposed_msg">TOO BRIGHT </string>
-    <string name="under_exposed_msg">TOO DARK </string>
-    <string name="quality_msg_format"> <![CDATA[POSITION/SIZE: %s <br> SHARPNESS: %s <br> BRIGHTNESS: %s <br> NO SHADOW: %s]]></string>
-    <string name="exp_date_undetected"><![CDATA[EXP DATE NOT DETECTED.\n ]]></string>
-    <string name="exp_date_expired"><![CDATA[EXPIRED!\n DO NOT USE THIS RDT! ]]></string>
-    <string name="exp_date_valid"><![CDATA[VALID!\n YOU CAN USE THIS RDT. ]]></string>
+    <string name="over_exposed_msg">Too bright </string>
+    <string name="under_exposed_msg">Too dark </string>
+    <string name="quality_msg_format"> <![CDATA[%s Position/size <br><br>  %s Sharpness <br><br>  %s Brightness <br><br>  %s No shadow]]></string>
+    <string name="exp_date_undetected"><![CDATA[Exp date not detected.\n ]]></string>
+    <string name="exp_date_expired"><![CDATA[Expired!\n Do not use this RDT! ]]></string>
+    <string name="exp_date_valid"><![CDATA[Valid!\n You can use this RDT. ]]></string>
     <string name="settings_strict">Strict</string>
     <string name="settings_loose">Loose</string>
     <string name="exp_date_check">Expiration Date</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f84b855f..e59f4b94 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 410bffa3..3996ad71 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/openCVLibrary341/build.gradle b/openCVLibrary341/build.gradle
index aea47fc2..6f827fcf 100644
--- a/openCVLibrary341/build.gradle
+++ b/openCVLibrary341/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 8
diff --git a/openCVLibrary341/src/main/AndroidManifest.xml b/openCVLibrary341/src/main/AndroidManifest.xml
index a95ba9db..45ff81b9 100644
--- a/openCVLibrary341/src/main/AndroidManifest.xml
+++ b/openCVLibrary341/src/main/AndroidManifest.xml
@@ -4,5 +4,5 @@
       android:versionCode="3410"
       android:versionName="3.4.1">
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />
+    <uses-sdk android:targetSdkVersion="21" />
 </manifest>

From 715f62175d182f8a0fc139018584b9e4c81ad4a3 Mon Sep 17 00:00:00 2001
From: hungngo97 <hung.ngovinh97@gmail.com>
Date: Mon, 15 Jul 2019 22:34:35 -0700
Subject: [PATCH 2/2] Fixes 2 line break

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2873dda4..4999a2c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="instruction_unfocused"><![CDATA[Place RDT at the center.\n Fit RDT to the rectangle.\nCamera is not focused. \nMove further away.]]></string>
     <string name="over_exposed_msg">Too bright </string>
     <string name="under_exposed_msg">Too dark </string>
-    <string name="quality_msg_format"> <![CDATA[%s Position/size <br><br>  %s Sharpness <br><br>  %s Brightness <br><br>  %s No shadow]]></string>
+    <string name="quality_msg_format"> <![CDATA[%s Position/size <br>  %s Sharpness <br>  %s Brightness <br>  %s No shadow]]></string>
     <string name="exp_date_undetected"><![CDATA[Exp date not detected.\n ]]></string>
     <string name="exp_date_expired"><![CDATA[Expired!\n Do not use this RDT! ]]></string>
     <string name="exp_date_valid"><![CDATA[Valid!\n You can use this RDT. ]]></string>