-> removed un used images

-> version 1.0.1 release
darwinfrancis · Jul 14, 2020 · 3162ae3 · 3162ae3
1 parent d330e48
commit 3162ae3
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 140 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,5 +36,4 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(path: ':still')
-    //implementation 'com.darwin.face.still:still:1.0.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".RegressionTestActivity"
+            android:name=".FaceCropSampleActivity"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>

diff --git a/app/src/main/java/com/darwin/facedetector/FaceCropSampleActivity.kt b/app/src/main/java/com/darwin/facedetector/FaceCropSampleActivity.kt
@@ -61,7 +61,7 @@ class FaceCropSampleActivity : AppCompatActivity() {
         options.inScaled = false
         bitmap = BitmapFactory.decodeResource(
             resources,
-            R.drawable.multi_face, options
+            R.drawable.po_single, options
         )
         iv_input_image.setImageBitmap(bitmap)
     }
@@ -70,7 +70,7 @@ class FaceCropSampleActivity : AppCompatActivity() {
         val faceOption =
             FaceOptions.Builder()
                 .cropAlgorithm(cropAlgorithm)
-                .setMinimumFaceSize(6)
+                .setMinimumFaceSize(15)
                 .enableDebug()
                 .build()
         viola.detectFace(bitmap!!, faceOption)

diff --git a/app/src/main/java/com/darwin/facedetector/FaceCropSampleJavaActivity.java b/app/src/main/java/com/darwin/facedetector/FaceCropSampleJavaActivity.java
@@ -96,15 +96,15 @@ private void prepareFaceCropper() {
         viola = new Viola(listener);
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inScaled = false;
-        bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.multi_face, options);
+        bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.po_single, options);
         ivInputImage.setImageBitmap(bitmap);
     }
 
     private void crop() {
         FaceOptions faceOption = new
                 FaceOptions.Builder()
                 .cropAlgorithm(cropAlgorithm)
-                .setMinimumFaceSize(6)
+                .setMinimumFaceSize(15)
                 .enableDebug()
                 .build();
         viola.detectFace(bitmap, faceOption);

diff --git a/app/src/main/java/com/darwin/facedetector/RegressionTestActivity.kt b/app/src/main/java/com/darwin/facedetector/RegressionTestActivity.kt
diff --git a/app/src/main/res/drawable/double_face.jpg b/app/src/main/res/drawable/double_face.jpg
diff --git a/app/src/main/res/drawable/double_no_bottom.jpg b/app/src/main/res/drawable/double_no_bottom.jpg
diff --git a/app/src/main/res/drawable/double_ro_right.jpg b/app/src/main/res/drawable/double_ro_right.jpg
diff --git a/app/src/main/res/drawable/ex_1.png b/app/src/main/res/drawable/ex_1.png
diff --git a/app/src/main/res/drawable/ex_2.jpg b/app/src/main/res/drawable/ex_2.jpg
diff --git a/app/src/main/res/drawable/groupfie.jpg b/app/src/main/res/drawable/groupfie.jpg
diff --git a/app/src/main/res/drawable/invalid_landscape.png b/app/src/main/res/drawable/invalid_landscape.png
diff --git a/app/src/main/res/drawable/invalid_portrait.jpeg b/app/src/main/res/drawable/invalid_portrait.jpeg
diff --git a/app/src/main/res/drawable/multi_face.jpg b/app/src/main/res/drawable/multi_face.jpg
diff --git a/app/src/main/res/drawable/multi_face_bottom.jpg b/app/src/main/res/drawable/multi_face_bottom.jpg
diff --git a/app/src/main/res/drawable/multi_face_no_right.jpg b/app/src/main/res/drawable/multi_face_no_right.jpg
diff --git a/app/src/main/res/drawable/no_face_image.jpg b/app/src/main/res/drawable/no_face_image.jpg
diff --git a/app/src/main/res/drawable/po_multi.jpg b/app/src/main/res/drawable/po_multi.jpg
diff --git a/app/src/main/res/drawable/po_single.jpg b/app/src/main/res/drawable/po_single.jpg
diff --git a/app/src/main/res/drawable/single.jpg b/app/src/main/res/drawable/single.jpg
diff --git a/app/src/main/res/layout/activity_face_crop_sample.xml b/app/src/main/res/layout/activity_face_crop_sample.xml
@@ -49,7 +49,7 @@
             android:id="@+id/iv_input_image"
             android:layout_width="250dp"
             android:layout_height="175dp"
-            android:background="#FFFFFF" />
+            android:background="#000000" />
 
         <Button
             android:id="@+id/btCrop"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Face Detector</string>
+    <string name="app_name">Viola Detector</string>
     <string name="rb_three_by_four">Three by Four</string>
     <string name="rb_square">Square</string>
     <string name="rb_least">Least</string>

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-version=1.0.0
+version=1.0.1
diff --git a/still/build.gradle b/still/build.gradle
@@ -19,7 +19,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -53,7 +53,7 @@ ext {
     siteUrl = 'https://github.com/darwinfrancis/viola'    // git repo url
     gitUrl = 'https://github.com/darwinfrancis/viola.git' // git repo vcs url
 
-    libraryVersion = '1.0.0'      // library version
+    libraryVersion = '1.0.1'      // library version
 
     developerId = 'darwinfrancis'                // This is your bintray username
     developerName = 'Darwin Francis'              // Developer's name