Merge pull request #5 from stone-ton/feat/13250/selfie-frame

feat: add selfie frame
stone-ton · Oct 13, 2021 · 48dbffc · 48dbffc
2 parents 3c80a0f + e8074cc
commit 48dbffc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.example.camerabioexample_android"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 3
-        versionName "2.2.0"
+        versionCode 4
+        versionName "2.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/example/camerabioexample_android/camerabiomanager/SelfieActivity.java b/app/src/main/java/com/example/camerabioexample_android/camerabiomanager/SelfieActivity.java
@@ -72,6 +72,8 @@ public class SelfieActivity extends Camera2Base implements ImageProcessor, Captu
     private ImageButton takePictureImageButton;
     private Toast toast;
 
+    private ImageView ivMask;
+
     private float posVerticalLineLeft = 0.0f;
     private float posVerticalLineRight = 0.0f;
     private float posHorizontalLineBottom = 0.0f;
@@ -177,6 +179,10 @@ protected void onCreate(Bundle savedInstanceState) {
         autoCapture = true;
         countRegressive = true;
 
+        ivMask  = findViewById(R.id.iv_mask);
+        ivMask.setImageResource(R.drawable.frame_selfie);
+        ivMask.setVisibility(View.VISIBLE);
+
         setMaxSizes();
 
         FirebaseVisionFaceDetectorOptions options =

diff --git a/app/src/main/res/drawable/frame_selfie.png b/app/src/main/res/drawable/frame_selfie.png
diff --git a/...ioandroid/src/main/java/com/example/camerabioandroid/camerabiomanager/SelfieActivity.java b/...ioandroid/src/main/java/com/example/camerabioandroid/camerabiomanager/SelfieActivity.java
@@ -69,6 +69,8 @@ public class SelfieActivity extends Camera2Base implements ImageProcessor, Captu
     private ImageButton takePictureImageButton;
     private Toast toast;
 
+    private ImageView ivMask;
+
     private float posVerticalLineLeft = 0.0f;
     private float posVerticalLineRight = 0.0f;
     private float posHorizontalLineBottom = 0.0f;
@@ -174,6 +176,10 @@ protected void onCreate(Bundle savedInstanceState) {
         autoCapture = true;
         countRegressive = true;
 
+        ivMask  = findViewById(R.id.iv_mask);
+        ivMask.setImageResource(R.drawable.frame_selfie);
+        ivMask.setVisibility(View.VISIBLE);
+
         setMaxSizes();
 
         FirebaseVisionFaceDetectorOptions options =

diff --git a/camerabioandroid/src/main/res/drawable/frame_selfie.png b/camerabioandroid/src/main/res/drawable/frame_selfie.png