From 09a5facc62acd23877225d0a7b0a768e53cf4e86 Mon Sep 17 00:00:00 2001
From: reizamv <rezarahmad@gmail.com>
Date: Mon, 16 Mar 2020 23:13:14 +0800
Subject: [PATCH 1/2] update to android 4.0 update androidx

---
 build.gradle                                  |  4 +++-
 facerecognition/build.gradle                  | 20 +++++++++----------
 facerecognition/src/main/AndroidManifest.xml  |  2 --
 .../cultoftheunicorn/marvel/MainActivity.java |  4 ++--
 .../cultoftheunicorn/marvel/NameActivity.java |  2 +-
 .../cultoftheunicorn/marvel/Recognize.java    |  2 +-
 .../marvel/ReviewListAdapter.java             |  2 +-
 .../marvel/ReviewResults.java                 |  8 ++++----
 .../cultoftheunicorn/marvel/Training.java     |  2 +-
 .../res/layout/activity_review_results.xml    |  2 +-
 .../src/main/res/layout/home_app_bar.xml      |  2 +-
 gradle.properties                             |  2 ++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 openCVLibrary2410/build.gradle                |  8 ++++----
 .../src/main/AndroidManifest.xml              |  1 -
 15 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index 4e554c8..c67ebbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:4.0.0-beta02'
 //        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
@@ -12,5 +13,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/facerecognition/build.gradle b/facerecognition/build.gradle
index 1963b8f..474dec4 100644
--- a/facerecognition/build.gradle
+++ b/facerecognition/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 29
+    buildToolsVersion '30.0.0 rc1'
 
     defaultConfig {
         applicationId "cultoftheunicorn.marvel"
-        minSdkVersion 15
-        targetSdkVersion 22
+        minSdkVersion 19
+        targetSdkVersion 29
     }
 
     buildTypes {
@@ -19,12 +19,12 @@ android {
 }
 
 dependencies {
-    compile project(':openCVLibrary2410')
-    compile files('libs/javacpp.jar')
-    compile files('libs/javacv.jar')
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
-    compile 'com.android.support:recyclerview-v7:22.2.0'
+    implementation project(':openCVLibrary2410')
+    implementation files('libs/javacpp.jar')
+    implementation files('libs/javacv.jar')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 //    compile 'com.google.firebase:firebase-database:10.0.1'
 }
 
diff --git a/facerecognition/src/main/AndroidManifest.xml b/facerecognition/src/main/AndroidManifest.xml
index b19ab30..e13c3ff 100644
--- a/facerecognition/src/main/AndroidManifest.xml
+++ b/facerecognition/src/main/AndroidManifest.xml
@@ -5,8 +5,6 @@
     android:versionCode="24"
     android:versionName="2.4">
 
-    <uses-sdk android:minSdkVersion="9" />
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <supports-screens
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
index 2fd55c5..70904d2 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
@@ -1,9 +1,9 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
index 43b87d0..ecfed0f 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
@@ -1,7 +1,7 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
index fe88933..b51c139 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
index 4c57091..6f11e6d 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
@@ -1,7 +1,7 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
index ed7db26..95fe378 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
@@ -1,11 +1,11 @@
 package cultoftheunicorn.marvel;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 //import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
index 6ed800c..f3ca77a 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.CompoundButton;
diff --git a/facerecognition/src/main/res/layout/activity_review_results.xml b/facerecognition/src/main/res/layout/activity_review_results.xml
index c454d1d..8f47d62 100644
--- a/facerecognition/src/main/res/layout/activity_review_results.xml
+++ b/facerecognition/src/main/res/layout/activity_review_results.xml
@@ -17,7 +17,7 @@
         android:layout_centerHorizontal="true"
         android:textAllCaps="false" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/facerecognition/src/main/res/layout/home_app_bar.xml b/facerecognition/src/main/res/layout/home_app_bar.xml
index 982c57a..0fb434e 100644
--- a/facerecognition/src/main/res/layout/home_app_bar.xml
+++ b/facerecognition/src/main/res/layout/home_app_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..eaba979 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/openCVLibrary2410/build.gradle b/openCVLibrary2410/build.gradle
index bec2bd2..60a76ba 100644
--- a/openCVLibrary2410/build.gradle
+++ b/openCVLibrary2410/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 29
+    buildToolsVersion '30.0.0 rc1'
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 8
+        minSdkVersion 19
+        targetSdkVersion 29
     }
 
     buildTypes {
diff --git a/openCVLibrary2410/src/main/AndroidManifest.xml b/openCVLibrary2410/src/main/AndroidManifest.xml
index 0cbaa2e..e869bc1 100644
--- a/openCVLibrary2410/src/main/AndroidManifest.xml
+++ b/openCVLibrary2410/src/main/AndroidManifest.xml
@@ -4,5 +4,4 @@
       android:versionCode="24100"
       android:versionName="2.4.10">
 
-    <uses-sdk android:minSdkVersion="8" />
 </manifest>

From b1b181b63fd6a1f3f01edf18ba87f634392ccc9a Mon Sep 17 00:00:00 2001
From: reizamv <rezarahmad@gmail.com>
Date: Sat, 29 Aug 2020 22:35:23 +0800
Subject: [PATCH 2/2] update androidx

---
 build.gradle                                       |  2 +-
 facerecognition/build.gradle                       | 14 +++++++-------
 facerecognition/src/main/AndroidManifest.xml       |  2 ++
 .../java/cultoftheunicorn/marvel/MainActivity.java |  7 +++++--
 .../java/cultoftheunicorn/marvel/NameActivity.java |  4 +++-
 .../java/cultoftheunicorn/marvel/Recognize.java    |  4 +++-
 .../cultoftheunicorn/marvel/ReviewListAdapter.java |  4 +++-
 .../cultoftheunicorn/marvel/ReviewResults.java     | 11 +++++++----
 .../java/cultoftheunicorn/marvel/Training.java     |  4 +++-
 .../src/main/res/layout/activity_main.xml          |  2 +-
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 openCVLibrary2410/build.gradle                     |  6 +++---
 openCVLibrary2410/src/main/AndroidManifest.xml     |  1 +
 13 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index c67ebbb..91702e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-beta02'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 //        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
diff --git a/facerecognition/build.gradle b/facerecognition/build.gradle
index 474dec4..521c04f 100644
--- a/facerecognition/build.gradle
+++ b/facerecognition/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '30.0.0 rc1'
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "cultoftheunicorn.marvel"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 
     buildTypes {
@@ -20,10 +20,10 @@ android {
 
 dependencies {
     implementation project(':openCVLibrary2410')
-    implementation files('libs/javacpp.jar')
-    implementation files('libs/javacv.jar')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api files('libs/javacpp.jar')
+    api files('libs/javacv.jar')
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
 //    compile 'com.google.firebase:firebase-database:10.0.1'
 }
diff --git a/facerecognition/src/main/AndroidManifest.xml b/facerecognition/src/main/AndroidManifest.xml
index e13c3ff..bbdbf69 100644
--- a/facerecognition/src/main/AndroidManifest.xml
+++ b/facerecognition/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     android:versionCode="24"
     android:versionName="2.4">
 
+
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <supports-screens
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
index 70904d2..932be74 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
@@ -1,12 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
+
 import android.view.View;
 import android.widget.Button;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 public class MainActivity extends AppCompatActivity {
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
index ecfed0f..08605e6 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
@@ -1,13 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 public class NameActivity extends AppCompatActivity {
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
index b51c139..ee20ee4 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java
@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -17,6 +17,8 @@
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.LoaderCallbackInterface;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
index 6f11e6d..c691cda 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
@@ -1,13 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 import java.util.List;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
index 95fe378..c07be39 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
@@ -1,11 +1,9 @@
 package cultoftheunicorn.marvel;
 
-import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 //import android.support.v7.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
@@ -14,6 +12,11 @@
 //import com.google.firebase.database.DatabaseReference;
 //import com.google.firebase.database.FirebaseDatabase;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 import java.util.ArrayList;
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
index f3ca77a..253067a 100644
--- a/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
+++ b/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.CompoundButton;
@@ -14,6 +14,8 @@
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.LoaderCallbackInterface;
diff --git a/facerecognition/src/main/res/layout/activity_main.xml b/facerecognition/src/main/res/layout/activity_main.xml
index 45f5b19..33c9221 100644
--- a/facerecognition/src/main/res/layout/activity_main.xml
+++ b/facerecognition/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.opencv.cultoftheunicorn.marvel.cultoftheunicorn.marvel.MainActivity"
+
     android:background="@android:color/white">
 
     <include android:id="@+id/app_bar" layout="@layout/home_app_bar"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eaba979..cf9ebc4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Aug 29 21:59:52 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/openCVLibrary2410/build.gradle b/openCVLibrary2410/build.gradle
index 60a76ba..15ce9ee 100644
--- a/openCVLibrary2410/build.gradle
+++ b/openCVLibrary2410/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '30.0.0 rc1'
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 
     buildTypes {
diff --git a/openCVLibrary2410/src/main/AndroidManifest.xml b/openCVLibrary2410/src/main/AndroidManifest.xml
index e869bc1..bc21595 100644
--- a/openCVLibrary2410/src/main/AndroidManifest.xml
+++ b/openCVLibrary2410/src/main/AndroidManifest.xml
@@ -4,4 +4,5 @@
       android:versionCode="24100"
       android:versionName="2.4.10">
 
+
 </manifest>