Merge pull request #18 from PhenoApps/misc-updates

Misc updates

.gitignore

@@ -1,9 +1,10 @@
 *.iml
 .gradle
+.idea
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
 /build
 /captures
-.externalNativeBuild
+.externalNativeBuild

app/build.gradle

@@ -1,19 +1,22 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 34
     buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "org.phenoapps.verify"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 34
         versionCode 2
         versionName "1.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
     }
+    namespace "org.phenoapps.verify"
     buildTypes {
         release {
             shrinkResources false
@@ -41,17 +44,17 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:support-vector-drawable:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'com.github.apl-devs:appintro:v4.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     implementation files('libs/poi-3.12-android-a.jar')
     implementation files('libs/poi-ooxml-schemas-3.12-20150511-a.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

app/src/main/AndroidManifest.xml

@@ -2,9 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.phenoapps.verify">
 
-    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -16,24 +16,26 @@
         <activity
             android:name="org.phenoapps.verify.MainActivity"
             android:configChanges="keyboardHidden|screenSize|keyboard"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustPan"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".CompareActivity"/>
+        <activity android:name=".CompareActivity" android:exported="true"/>
 
         <activity
-            android:name="org.phenoapps.verify.ScanActivity" />
+            android:name="org.phenoapps.verify.ScanActivity"
+            android:exported="true"/>
 
-        <activity android:name="org.phenoapps.verify.LoaderDBActivity"
+        <activity android:name="org.phenoapps.verify.LoaderDBActivity" android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize|keyboard"/>
 
-        <activity android:name="org.phenoapps.verify.SettingsActivity" />
+        <activity android:name="org.phenoapps.verify.SettingsActivity" android:exported="true"/>
 
-        <activity android:name="org.phenoapps.verify.IntroActivity"
+        <activity android:name="org.phenoapps.verify.IntroActivity" android:exported="true"
             android:theme = "@style/AppThemeNoActionBar"/>
     </application>
 

app/src/main/java/org/phenoapps/verify/CompareActivity.kt

@@ -2,8 +2,8 @@ package org.phenoapps.verify
 
 import android.app.Activity
 import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.LayoutDirection

app/src/main/java/org/phenoapps/verify/IntroActivity.java

@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import com.github.paolorotolo.appintro.AppIntro2;
 import com.github.paolorotolo.appintro.AppIntroFragment;