重构 使用AndroidX代替android.support库

Author: hyb1996

.idea/caches/build_file_checksums.ser

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.jakewharton.butterknife'
 
 def AAVersion = '4.5.2'
 def SupportLibVersion = '28.0.0'
@@ -21,7 +22,7 @@ android {
         targetSdkVersion versions.target
         versionCode versions.appVersionCode
         versionName versions.appVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
             abiFilters 'armeabi-v7a', 'x86'
@@ -82,23 +83,23 @@ repositories {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     testImplementation 'junit:junit:4.12'
     // Android Annotations
     annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
     implementation "org.androidannotations:androidannotations-api:$AAVersion"
     // ButterKnife
-    implementation('com.jakewharton:butterknife:8.8.1', {
+    implementation('com.jakewharton:butterknife:9.0.0-rc2', {
         exclude group: 'com.android.support'
     })
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
     // Android supports
-    implementation "com.android.support:appcompat-v7:${SupportLibVersion}"
-    implementation "com.android.support:cardview-v7:${SupportLibVersion}"
-    implementation "com.android.support:design:${SupportLibVersion}"
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'androidx.multidex:multidex:2.0.0'
     // Personal libraries
     implementation 'com.github.hyb1996:MutableTheme:0.2.2'
     // Material Dialogs

app/build.gradle

@@ -6,10 +6,10 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.support.multidex.MultiDexApplication
-import android.support.v4.content.LocalBroadcastManager
+import androidx.multidex.MultiDexApplication
 import android.view.View
 import android.widget.ImageView
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition

app/src/main/java/org/autojs/autojs/App.kt

@@ -6,7 +6,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Looper;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.stardust.app.GlobalAppContext;
 import com.stardust.autojs.core.console.GlobalConsole;

app/src/main/java/org/autojs/autojs/autojs/AutoJs.java

@@ -2,7 +2,7 @@
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Created by Stardust on 2017/5/15.

app/src/main/java/org/autojs/autojs/external/ScriptExecutionIntentService.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 

app/src/main/java/org/autojs/autojs/external/fileprovider/AppFileProvider.java

@@ -9,16 +9,13 @@
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 
 import org.autojs.autojs.R;
 import org.autojs.autojs.ui.main.MainActivity_;
 
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
 public class ForegroundService extends Service {
 
 

app/src/main/java/org/autojs/autojs/external/foreground/ForegroundService.java

@@ -5,7 +5,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 

app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java

@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.Toast;
 
@@ -15,9 +15,6 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import io.reactivex.annotations.NonNull;
-import io.reactivex.functions.Consumer;
-
 /**
  * Created by Stardust on 2017/2/2.
  */

app/src/main/java/org/autojs/autojs/external/open/ImportIntentActivity.java

@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.stardust.autojs.script.StringScriptSource;

app/src/main/java/org/autojs/autojs/external/open/RunIntentActivity.java

@@ -2,10 +2,9 @@
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import org.autojs.autojs.timing.IntentTask;

app/src/main/java/org/autojs/autojs/external/receiver/DynamicBroadcastReceivers.java

@@ -1,23 +1,17 @@
 package org.autojs.autojs.external.shortcut;
 
 import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.ShortcutInfo;
 import android.graphics.drawable.Icon;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import java.util.Collections;
 import java.util.List;
 
-import io.reactivex.Observable;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.Subject;
-
 /**
  * Created by Stardust on 2017/10/25.
  */

app/src/main/java/org/autojs/autojs/external/shortcut/ShortcutManager.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.autojs.autojs.external.ScriptIntents;
 import org.autojs.autojs.external.open.RunIntentActivity;

app/src/main/java/org/autojs/autojs/external/tasker/FireSettingReceiver.java

@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/org/autojs/autojs/external/tasker/TaskPrefEditActivity.java

@@ -1,7 +1,7 @@
 package org.autojs.autojs.external.tile;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.view.accessibility.NodeInfo;
 

app/src/main/java/org/autojs/autojs/external/tile/LayoutBoundsTile.java

@@ -1,7 +1,7 @@
 package org.autojs.autojs.external.tile;
 
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.view.accessibility.NodeInfo;
 

app/src/main/java/org/autojs/autojs/external/tile/LayoutHierarchyTile.java

@@ -4,7 +4,7 @@
 import android.os.Build;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.widget.Toast;
 

app/src/main/java/org/autojs/autojs/external/tile/LayoutInspectTileService.java

@@ -4,7 +4,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/org/autojs/autojs/external/widget/ScriptWidgetSettingsActivity.java

@@ -1,10 +1,9 @@
 package org.autojs.autojs.model.autocomplete;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;

app/src/main/java/org/autojs/autojs/model/autocomplete/DictionaryTree.java

@@ -1,6 +1,6 @@
 package org.autojs.autojs.model.explorer;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.LruCache;
 
 import com.stardust.pio.PFile;

app/src/main/java/org/autojs/autojs/model/explorer/Explorer.java

@@ -1,8 +1,8 @@
 package org.autojs.autojs.model.explorer;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.pio.PFile;
 

app/src/main/java/org/autojs/autojs/model/explorer/ExplorerDirPage.java

@@ -1,6 +1,6 @@
 package org.autojs.autojs.model.indices;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 public abstract class ClassSearchingItem implements Comparable<ClassSearchingItem> {

app/src/main/java/org/autojs/autojs/model/indices/ClassSearchingItem.java

@@ -1,8 +1,8 @@
 package org.autojs.autojs.model.sample;
 
 import android.content.res.AssetManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.JavaScriptSource;
 import com.stardust.autojs.script.ScriptSource;

app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java

@@ -1,18 +1,13 @@
 package org.autojs.autojs.model.script;
 
-import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.AutoFileSource;
 import com.stardust.autojs.script.JavaScriptFileSource;
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.pio.PFile;
-import com.stardust.pio.PFiles;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
 
 /**
  * Created by Stardust on 2017/1/23.

app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java

@@ -1,10 +1,9 @@
 package org.autojs.autojs.model.script;
 
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.Toast;
 
 import com.stardust.app.GlobalAppContext;

app/src/main/java/org/autojs/autojs/model/script/Scripts.java

@@ -4,9 +4,9 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.AnyThread;
-import android.support.annotation.MainThread;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
 import android.util.Log;
 import android.util.Pair;
 

app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java

@@ -3,12 +3,11 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import com.stardust.app.GlobalAppContext;
 
-import org.autojs.autojs.*;
 import org.autojs.autojs.R;
 
 import com.stardust.theme.ThemeColor;

app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java

@@ -1,7 +1,7 @@
 package org.autojs.autojs.theme.dialog;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.stardust.theme.ThemeColor;

app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import com.stardust.theme.ThemeColor;

app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java

@@ -1,7 +1,7 @@
 package org.autojs.autojs.theme.widget;
 
 import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.AttributeSet;
 
 import com.stardust.theme.ThemeColor;

app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java

@@ -19,7 +19,6 @@ public static boolean isRootAvailable() {
     }
 
     private static final String cmd = "enabled=$(settings get system pointer_location)\n" +
-            "pkg=%s\n" +
             "if [[ $enabled == 1 ]]\n" +
             "then\n" +
             "settings put system pointer_location 0\n" +