diff --git a/build.gradle b/build.gradle
index 4e554c8..91702e1 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.1'
// 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..521c04f 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 30
+ buildToolsVersion "29.0.3"
defaultConfig {
applicationId "cultoftheunicorn.marvel"
- minSdkVersion 15
- targetSdkVersion 22
+ minSdkVersion 19
+ targetSdkVersion 30
}
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')
+ 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 b19ab30..bbdbf69 100644
--- a/facerecognition/src/main/AndroidManifest.xml
+++ b/facerecognition/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
android:versionCode="24"
android:versionName="2.4">
-
+
diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
index 2fd55c5..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 android.support.v7.app.AppCompatActivity;
+
import android.os.Bundle;
-import android.support.v7.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 43b87d0..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 android.support.v7.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 fe88933..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 android.support.v7.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 4c57091..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 android.support.v7.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 ed7db26..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 android.support.v7.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 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 6ed800c..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 android.support.v7.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">
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" />
-
-
-
+