Migrate to AndroidX

Signed-off-by: Syrone Wong <[email protected]>
trojan-gfw · Apr 11, 2020 · 75557b9 · 75557b9
1 parent 075d901
commit 75557b9
Show file tree

Hide file tree

Showing 36 changed files with 102 additions and 98 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86"
         }
@@ -39,16 +39,15 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-compat:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.core:core:1.2.0'
     implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.7'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     api(name: 'golibs', ext: 'aar')
 }
diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/MainActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/MainActivity.java
@@ -8,11 +8,11 @@
 import android.net.VpnService;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/ProxyService.java b/app/src/main/java/io/github/trojan_gfw/igniter/ProxyService.java
@@ -17,15 +17,14 @@
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.support.annotation.IntDef;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.IntDef;
+import androidx.core.app.NotificationCompat;
 
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.Set;
 
 import clash.Clash;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/TrojanConfig.java b/app/src/main/java/io/github/trojan_gfw/igniter/TrojanConfig.java
@@ -2,7 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.json.JSONArray;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/TrojanHelper.java b/app/src/main/java/io/github/trojan_gfw/igniter/TrojanHelper.java
@@ -1,7 +1,7 @@
 package io.github.trojan_gfw.igniter;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -15,7 +15,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/app/BaseAppCompatActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/app/BaseAppCompatActivity.java
@@ -2,10 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 public abstract class BaseAppCompatActivity extends AppCompatActivity {
     protected Context mContext;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/app/BaseFragment.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/app/BaseFragment.java
@@ -2,11 +2,11 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import android.view.View;
 
 public abstract class BaseFragment extends Fragment {

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/dialog/LoadingDialog.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/dialog/LoadingDialog.java
@@ -5,9 +5,9 @@
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.ContentLoadingProgressBar;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.ContentLoadingProgressBar;
 import android.view.Window;
 import android.widget.TextView;
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/os/Task.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/os/Task.java
@@ -2,7 +2,7 @@
 
 
 import android.os.Process;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 
 /**
  * A wrapper of Runnable.

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/PermissionUtils.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/PermissionUtils.java
@@ -3,7 +3,7 @@
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 public abstract class PermissionUtils {
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/ProcessUtils.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/ProcessUtils.java
@@ -2,8 +2,8 @@
 
 import android.app.ActivityManager;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/SnackbarUtils.java b/app/src/main/java/io/github/trojan_gfw/igniter/common/utils/SnackbarUtils.java
@@ -1,7 +1,7 @@
 package io.github.trojan_gfw.igniter.common.utils;
 
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.StringRes;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.View;
 
 public class SnackbarUtils {

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/connection/TestConnection.java b/app/src/main/java/io/github/trojan_gfw/igniter/connection/TestConnection.java
@@ -1,7 +1,7 @@
 package io.github.trojan_gfw.igniter.connection;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.net.InetSocketAddress;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/connection/TrojanConnection.java b/app/src/main/java/io/github/trojan_gfw/igniter/connection/TrojanConnection.java
@@ -8,7 +8,8 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import io.github.trojan_gfw.igniter.ProxyService;
 import io.github.trojan_gfw.igniter.R;
@@ -98,6 +99,7 @@ public void connect(Context context, Callback callback) {
             throw new IllegalStateException("Required to call disconnect(Context) first.");
         }
         mCallback = callback;
+
         // todo: choose the service class dynamically.
         Intent intent = new Intent(context, ProxyService.class);
         intent.setAction(context.getString(R.string.bind_service));

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/activity/ExemptAppActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/activity/ExemptAppActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.Window;
 
 import io.github.trojan_gfw.igniter.Globals;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/adapter/AppInfoAdapter.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/adapter/AppInfoAdapter.java
@@ -2,15 +2,13 @@
 
 import android.content.res.Resources;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.widget.RecyclerView;
-import android.util.TypedValue;
+import androidx.annotation.NonNull;
+import androidx.core.widget.TextViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/contract/ExemptAppContract.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/contract/ExemptAppContract.java
@@ -1,7 +1,7 @@
 package io.github.trojan_gfw.igniter.exempt.contract;
 
-import android.support.annotation.AnyThread;
-import android.support.annotation.UiThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.UiThread;
 
 import java.util.List;
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/data/ExemptAppDataManager.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/data/ExemptAppDataManager.java
@@ -4,7 +4,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.io.BufferedReader;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/data/ExemptAppDataSource.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/data/ExemptAppDataSource.java
@@ -1,7 +1,6 @@
 package io.github.trojan_gfw.igniter.exempt.data;
 
-import android.content.pm.ResolveInfo;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 
 import java.util.List;
 import java.util.Set;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/exempt/fragment/ExemptAppFragment.java b/app/src/main/java/io/github/trojan_gfw/igniter/exempt/fragment/ExemptAppFragment.java
@@ -3,16 +3,19 @@
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/qrcode/ScanQRCodeActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/qrcode/ScanQRCodeActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.widget.Toast;
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/servers/activity/ServerListActivity.java b/app/src/main/java/io/github/trojan_gfw/igniter/servers/activity/ServerListActivity.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 
 import io.github.trojan_gfw.igniter.Globals;
 import io.github.trojan_gfw.igniter.R;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/servers/data/ServerListDataSource.java b/app/src/main/java/io/github/trojan_gfw/igniter/servers/data/ServerListDataSource.java
@@ -1,6 +1,6 @@
 package io.github.trojan_gfw.igniter.servers.data;
 
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 
 import java.util.List;
 

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/servers/fragment/ServerListAdapter.java b/app/src/main/java/io/github/trojan_gfw/igniter/servers/fragment/ServerListAdapter.java
@@ -1,8 +1,8 @@
 package io.github.trojan_gfw.igniter.servers.fragment;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/servers/fragment/ServerListFragment.java b/app/src/main/java/io/github/trojan_gfw/igniter/servers/fragment/ServerListFragment.java
@@ -10,16 +10,16 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/tile/IgniterTileService.java b/app/src/main/java/io/github/trojan_gfw/igniter/tile/IgniterTileService.java
@@ -5,8 +5,8 @@
 import android.os.RemoteException;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import io.github.trojan_gfw.igniter.LogHelper;
 import io.github.trojan_gfw.igniter.MainActivity;

diff --git a/app/src/main/java/io/github/trojan_gfw/igniter/tile/ProxyHelper.java b/app/src/main/java/io/github/trojan_gfw/igniter/tile/ProxyHelper.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.VpnService;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import io.github.trojan_gfw.igniter.BuildConfig;
 import io.github.trojan_gfw.igniter.Globals;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -182,5 +182,5 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/saveConfigBtn" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>