Migrated to AndroidX

vdeconinck · Aug 2, 2021 · 15fea01 · 15fea01
1 parent 4f1592f
commit 15fea01
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 27 deletions.
diff --git a/BT901/build.gradle b/BT901/build.gradle
@@ -21,6 +21,6 @@ android {
 dependencies {
     implementation files('libs/CH34xUARTDriver.jar')
     implementation files('libs/MPAndroidChart-v3.0.2.jar')
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation project(':Util')
 }
diff --git a/BT901/src/main/java/com/bt901/DataMonitorActivity.java b/BT901/src/main/java/com/bt901/DataMonitorActivity.java
@@ -20,8 +20,8 @@
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.widget.DrawerLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;

diff --git a/BT901/src/main/java/com/bt901/dialog/AddressDialog.java b/BT901/src/main/java/com/bt901/dialog/AddressDialog.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/java/com/bt901/dialog/AlarmDialog.java b/BT901/src/main/java/com/bt901/dialog/AlarmDialog.java
@@ -1,7 +1,7 @@
 package com.bt901.dialog;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/java/com/bt901/dialog/BDialog.java b/BT901/src/main/java/com/bt901/dialog/BDialog.java
@@ -5,9 +5,9 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/java/com/bt901/dialog/DevDialog.java b/BT901/src/main/java/com/bt901/dialog/DevDialog.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/java/com/bt901/dialog/PwmCycleDialog.java b/BT901/src/main/java/com/bt901/dialog/PwmCycleDialog.java
@@ -1,7 +1,7 @@
 package com.bt901.dialog;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/java/com/bt901/dialog/PwmDialog.java b/BT901/src/main/java/com/bt901/dialog/PwmDialog.java
@@ -1,7 +1,7 @@
 package com.bt901.dialog;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BT901/src/main/res/layout/lay_data.xml b/BT901/src/main/res/layout/lay_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/drawerLayout"
@@ -207,13 +207,13 @@
     </ScrollView>
     </LinearLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nv_layout"
         android:layout_width="200dp"
         android:layout_height="match_parent"
         android:layout_gravity="start">
 
         <include layout="@layout/lay_draw"></include>
 
-</android.support.design.widget.NavigationView>
-    </android.support.v4.widget.DrawerLayout>
+</com.google.android.material.navigation.NavigationView>
+    </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/Main/build.gradle b/Main/build.gradle
@@ -24,7 +24,7 @@ android {
         versionName "1.0"
         resConfigs "en"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -43,7 +43,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation project(':BT901')
     implementation project(':Util')
 

diff --git a/Main/src/main/java/com/wtzn/wtapp/DeviceSelectionActivity.java b/Main/src/main/java/com/wtzn/wtapp/DeviceSelectionActivity.java
@@ -5,9 +5,9 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;

diff --git a/Main/src/main/java/com/wtzn/wtapp/SplashActivity.java b/Main/src/main/java/com/wtzn/wtapp/SplashActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 public class SplashActivity extends AppCompatActivity {

diff --git a/Util/build.gradle b/Util/build.gradle
@@ -22,6 +22,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
 }
diff --git a/Util/src/main/AndroidManifest.xml b/Util/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <!-- Create and delete file permissions in SDCard -->
     <application>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="info.deconinck.fileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/Util/src/main/java/com/wtzn/wtfile/util/MyFile.java b/Util/src/main/java/com/wtzn/wtfile/util/MyFile.java
@@ -4,11 +4,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 
-import com.wtzn.wtfile.util.MyMimeMap;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true