重构 使用AndroidX代替android.support库

autojs/src/main/java/com/stardust/autojs/AutoJs.java

@@ -5,8 +5,8 @@ import android.app.Application;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.app.SimpleActivityLifecycleCallbacks;

autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.engine.JavaScriptEngine;
 import com.stardust.autojs.engine.ScriptEngine;
@@ -24,14 +24,7 @@ import com.stardust.util.UiHandler;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.mozilla.javascript.RhinoException;
-import org.mozilla.javascript.ScriptStackElement;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;

autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.codegeneration;
 
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 
 import com.stardust.automator.UiGlobalSelector;
 import com.stardust.automator.UiObject;

autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java

@@ -1,9 +1,9 @@
 package com.stardust.autojs.codegeneration;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 
 import com.stardust.automator.UiObject;
 import com.stardust.view.accessibility.NodeInfo;

autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java

@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.accessibility;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityWindowInfo;
 

autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java

@@ -5,7 +5,7 @@ import android.accessibilityservice.GestureDescription;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.view.accessibility.AccessibilityNodeInfo;
 

autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.accessibility;
 
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -17,37 +17,37 @@ import com.stardust.automator.filter.DfsFilter;
 import com.stardust.concurrent.VolatileBox;
 import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
 
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
-import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS;
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN;
 
 /**
  * Created by Stardust on 2017/3/9.

autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.view.WindowManager;

autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java

@@ -2,8 +2,8 @@ package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.WindowManager;
 
 import com.stardust.autojs.R;

autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java

@@ -2,9 +2,10 @@ package com.stardust.autojs.core.console;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;
@@ -17,8 +18,8 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.stardust.autojs.R;
 import com.stardust.enhancedfloaty.ResizableExpandableFloatyWindow;
+import com.stardust.autojs.R;
 import com.stardust.util.MapBuilder;
 import com.stardust.util.SparseArrayEntries;
 

autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.console;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.runtime.api.Console;
 

autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java

@@ -1,9 +1,6 @@
 package com.stardust.autojs.core.eventloop;
 
-import android.support.annotation.NonNull;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
+import androidx.annotation.NonNull;
 
 
 import com.stardust.autojs.core.looper.Timer;

autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java

@@ -1,20 +1,17 @@
 package com.stardust.autojs.core.floaty;
 
 import android.content.Context;
-import android.graphics.PixelFormat;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.view.Gravity;
+
+import androidx.annotation.Nullable;
+
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.inflaters.Exceptions;
 import com.stardust.autojs.runtime.exception.ScriptInterruptedException;
-import com.stardust.concurrent.VolatileBox;
 import com.stardust.concurrent.VolatileDispose;
 import com.stardust.enhancedfloaty.FloatyService;
 import com.stardust.enhancedfloaty.ResizableFloaty;

autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java

@@ -12,9 +12,9 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.autojs.core.image.ImageWrapper;
 import com.stardust.autojs.runtime.ScriptRuntime;

autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.image;
 
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.autojs.core.opencv.MatOfPoint;
 import com.stardust.autojs.core.opencv.OpenCVHelper;

autojs/src/main/java/com/stardust/autojs/core/image/Colors.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.image;
 
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 /**
  * Created by Stardust on 2017/12/31.

autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java

@@ -4,7 +4,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.media.Image;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.autojs.core.opencv.OpenCVHelper;
 import com.stardust.pio.UncheckedIOException;

autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 import com.stardust.util.IntentExtras;

autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.media.projection.MediaProjectionManager;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.stardust.app.OnActivityResultDelegate;
 

autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java

@@ -14,8 +14,8 @@ import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import android.view.OrientationEventListener;
 

autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.InputDevice;
 

autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.inputevent;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.stardust.autojs.core.record.inputevent.EventFormatException;

autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.inputevent;
 
 import android.content.Context;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.ViewConfiguration;

autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.SparseArray;
 
 import java.lang.reflect.Field;

autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import static com.stardust.autojs.core.record.inputevent.InputEventRecorder.parseDeviceNumber;
 

autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.looper;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 
 import com.stardust.autojs.engine.RhinoJavaScriptEngine;
 import com.stardust.autojs.runtime.ScriptRuntime;

autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.opencv;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.afollestad.materialdialogs.MaterialDialog;

autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.permission;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface OnRequestPermissionsResultCallback {
 

autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java

@@ -1,12 +1,11 @@
 package com.stardust.autojs.core.permission;
 
-import android.Manifest;
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 public class PermissionRequestActivity extends Activity {
 

autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java

@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.permission;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 public interface PermissionRequestProxyActivity {
 

autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java

@@ -3,13 +3,11 @@ package com.stardust.autojs.core.permission;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
 public class Permissions {
 

autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.permission;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 import java.util.ArrayList;

autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventObserver;
 import com.stardust.autojs.core.record.Recorder;

autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.record.inputevent;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.stardust.autojs.core.inputevent.InputEventCodes;

autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventCodes;
 import com.stardust.autojs.core.inputevent.InputEventObserver;

autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.record.inputevent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.inputevent.InputEventObserver;
 

autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java

@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.support.design.widget.AppBarLayout;
 import android.view.View;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 public class AppbarAttributes extends ViewAttributes {

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java

@@ -1,12 +1,13 @@
 package com.stardust.autojs.core.ui.attribute;
 
 import android.graphics.Color;
-import android.support.v7.widget.CardView;
 import android.view.View;
 
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.util.Dimensions;
 
+import androidx.cardview.widget.CardView;
+
 public class CardAttributes extends ViewAttributes {
 
     public CardAttributes(ResourceParser resourceParser, View view) {

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java

@@ -1,10 +1,9 @@
 package com.stardust.autojs.core.ui.attribute;
 
 import android.graphics.Color;
-import android.support.design.widget.FloatingActionButton;
 import android.view.View;
-import android.widget.ImageView;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 public class FabViewAttributes extends ImageViewAttributes {

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java

@@ -1,10 +1,9 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.Build;
-import android.support.v4.widget.ImageViewCompat;
+
+import androidx.core.widget.ImageViewCompat;
 import android.view.View;
 import android.widget.ImageView;
 

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java

@@ -6,28 +6,23 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.CallSuper;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.CallSuper;
+import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.widget.CompoundButton;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.stardust.autojs.core.internal.Functions;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
-import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater;
 import com.stardust.autojs.core.ui.inflater.util.Dimensions;
 import com.stardust.autojs.core.ui.inflater.util.Drawables;
 import com.stardust.autojs.core.ui.inflater.util.Gravities;
 import com.stardust.autojs.core.ui.inflater.util.Ids;
 import com.stardust.autojs.core.ui.inflater.util.Strings;
-import com.stardust.autojs.rhino.debug.Dim;
 import com.stardust.util.BiMap;
-import com.stardust.util.Supplier;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java

@@ -1,17 +1,18 @@
 package com.stardust.autojs.core.ui.attribute;
 
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.widget.CardView;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 
 import java.util.HashMap;
 
+import androidx.cardview.widget.CardView;
+
+
 public class ViewAttributesFactory {
 
     interface ViewAttributesCreator {

autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java

@@ -3,11 +3,10 @@ package com.stardust.autojs.core.ui.dialog;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.location.LocationManager;
 import android.os.Build;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.view.Window;
+import androidx.annotation.Nullable;
+
 import android.view.WindowManager;
 
 import com.afollestad.materialdialogs.DialogAction;

autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java

@@ -11,11 +11,12 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.UiThread;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.UiThread;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.ActionMode;
 import android.view.ContextMenu;
 import android.view.KeyEvent;

autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java

@@ -1,15 +1,8 @@
 package com.stardust.autojs.core.ui.dialog;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.ColorStateList;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.CompoundButton;
+
+
 import android.widget.EditText;
 
 import com.afollestad.materialdialogs.DialogAction;
@@ -20,15 +13,9 @@ import com.afollestad.materialdialogs.Theme;
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;
 import com.stardust.autojs.core.looper.Timer;
-import com.stardust.autojs.core.looper.TimerThread;
-import com.stardust.autojs.runtime.ScriptBridges;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.util.ArrayUtils;
 import com.stardust.util.UiHandler;
 
-import java.text.NumberFormat;
-import java.util.Collection;
-
 /**
  * Created by Stardust on 2018/4/17.
  */

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java

@@ -2,9 +2,8 @@ package com.stardust.autojs.core.ui.inflater;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.InflateException;
@@ -20,6 +19,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.core.ui.inflater.inflaters.AppBarInflater;
 import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater;
 import com.stardust.autojs.core.ui.inflater.inflaters.DatePickerInflater;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java

@@ -1,11 +1,10 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.appbar.AppBarLayout;
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java

@@ -3,8 +3,7 @@ package com.stardust.autojs.core.ui.inflater.inflaters;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
 import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.InflateException;
 import android.view.View;
 import android.view.ViewGroup;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java

@@ -1,7 +1,8 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+
 import android.view.ViewGroup;
 
 import com.stardust.autojs.core.ui.inflater.ResourceParser;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.ImageView.ScaleType;
 

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java

@@ -1,9 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import com.stardust.autojs.core.ui.inflater.DynamicLayoutInflater;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java

@@ -1,16 +1,11 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.TypedValue;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.SimpleAdapter;
 import android.widget.Spinner;
 
-import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;
 import com.stardust.autojs.core.ui.inflater.util.Colors;
@@ -19,7 +14,6 @@ import com.stardust.autojs.core.ui.inflater.util.Strings;
 import com.stardust.autojs.core.ui.inflater.util.ValueMapper;
 import com.stardust.autojs.core.ui.widget.JsSpinner;
 
-import java.util.List;
 import java.util.Map;
 
 /**

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java

@@ -2,11 +2,11 @@ package com.stardust.autojs.core.ui.inflater.inflaters;
 
 import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.tabs.TabLayout;
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.ui.inflater.ResourceParser;
 import com.stardust.autojs.core.ui.inflater.ViewCreator;

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.TimePicker;
 

autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java

@@ -1,8 +1,7 @@
 package com.stardust.autojs.core.ui.inflater.inflaters;
 
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 

autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java

@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.nativeview;
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Looper;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CompoundButton;
@@ -18,7 +18,6 @@ import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.Undefined;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java

@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.Button;
 

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java

@@ -3,7 +3,7 @@ package com.stardust.autojs.core.ui.widget;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.EditText;
 

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java

@@ -2,11 +2,11 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StyleRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java

@@ -1,10 +1,12 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
 
 import com.stardust.autojs.runtime.ScriptRuntime;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2018/3/30.
  */
@@ -20,7 +22,7 @@ public class JsGridView extends JsListView {
         super.init();
         setLayoutManager(new GridLayoutManager(getContext(), 1){
             @Override
-            public void onLayoutChildren(Recycler recycler, State state) {
+            public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
                 try {
                     super.onLayoutChildren(recycler, state);
                 } catch (IndexOutOfBoundsException e) {

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java

@@ -1,8 +1,8 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v4.widget.ImageViewCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.core.widget.ImageViewCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import com.makeramen.roundedimageview.RoundedImageView;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java

@@ -2,8 +2,8 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java

@@ -1,7 +1,6 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -16,6 +15,8 @@ import org.w3c.dom.NodeList;
 
 import com.stardust.autojs.workground.WrapContentLinearLayoutManager;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2018/3/28.
  */

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.RelativeLayout;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java

@@ -2,17 +2,16 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 import android.widget.TextView;
 
-public class JsSpinner extends android.support.v7.widget.AppCompatSpinner {
+public class JsSpinner extends androidx.appcompat.widget.AppCompatSpinner {
 
     private float mTextSize = -1;
     private int mTextStyle = -1;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java

@@ -1,16 +1,9 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
 import android.util.AttributeSet;
-import android.view.Gravity;
 
-import com.stardust.autojs.runtime.api.UI;
-
-import org.mozilla.javascript.NativeObject;
+import com.google.android.material.tabs.TabLayout;
 
 public class JsTabLayout extends TabLayout {
 

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java

@@ -2,12 +2,11 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.AppCompatTextView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
-import android.widget.TextView;
 
 /**
  * Created by Stardust on 2017/5/15.

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java

@@ -3,10 +3,11 @@ package com.stardust.autojs.core.ui.widget;
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import android.util.AttributeSet;
 
 import com.stardust.autojs.R;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java

@@ -1,17 +1,16 @@
 package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+
 import android.util.AttributeSet;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.stardust.autojs.core.ui.inflater.ShouldCallOnFinishInflate;
 
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 public class JsViewPager extends ViewPager implements ShouldCallOnFinishInflate {
 
     private String[] mTitles;

autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.core.ui.widget;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;

autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java

@@ -1,13 +1,9 @@
 package com.stardust.autojs.core.ui.xml;
 
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.webkit.WebView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import android.widget.CheckBox;
 import android.widget.DatePicker;
 import android.widget.ProgressBar;
@@ -15,9 +11,10 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.ScrollView;
 import android.widget.SeekBar;
-import android.widget.Spinner;
 import android.widget.TimePicker;
 
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.widget.JsButton;
 import com.stardust.autojs.core.ui.widget.JsEditText;
@@ -43,7 +40,6 @@ import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.Date;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java

@@ -1,8 +1,7 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 
-import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.runtime.ScriptRuntime;
 import com.stardust.autojs.script.JavaScriptSource;
 import com.stardust.autojs.script.ScriptSource;

autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java

@@ -1,13 +1,12 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
 
 import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.script.ScriptSource;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.engine;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.script.ScriptSource;
 import com.stardust.util.Supplier;

autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java

@@ -1,8 +1,8 @@
 package com.stardust.autojs.engine;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.execution.ScriptExecution;
 import com.stardust.autojs.script.ScriptSource;

autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java

@@ -1,8 +1,6 @@
 package com.stardust.autojs.engine.preprocess;
 
-import android.support.annotation.VisibleForTesting;
-
-import com.stardust.autojs.engine.preprocess.AbstractProcessor;
+import androidx.annotation.VisibleForTesting;
 
 import java.io.Reader;
 import java.io.StringReader;

autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java

@@ -4,9 +4,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -21,11 +21,8 @@ import com.stardust.autojs.engine.LoopBasedJavaScriptEngine;
 import com.stardust.autojs.engine.ScriptEngine;
 import com.stardust.autojs.engine.ScriptEngineManager;
 import com.stardust.autojs.runtime.ScriptRuntime;
-import com.stardust.autojs.runtime.api.UI;
 import com.stardust.autojs.script.ScriptSource;
 
-import org.mozilla.javascript.NativeObject;
-
 /**
  * Created by Stardust on 2017/2/5.
  */

autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java

@@ -1,17 +1,15 @@
 package com.stardust.autojs.project;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
 import com.stardust.pio.PFiles;
-import com.stardust.pio.UncheckedIOException;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.rhino;
 
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.VisibleForTesting;
 
 
 import org.mozilla.javascript.Context;

autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java

@@ -2,7 +2,7 @@ package com.stardust.autojs.rhino.debug;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.stardust.autojs.ScriptEngineService;

autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java

@@ -1,12 +1,10 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.stardust.autojs.runtime.exception.ScriptException;
 
-import java.util.Formatter;
-
 /**
  * Created by Stardust on 2017/5/1.
  */

autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java

@@ -6,16 +6,14 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.util.Log;
 
 import com.stardust.autojs.annotation.ScriptInterface;
 import com.stardust.util.IntentUtil;
-import com.stardust.util.MimeTypes;
 
-import java.io.File;
 import java.lang.ref.WeakReference;
 import java.util.List;
 

autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.annotation.ScriptInterface;
 

autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java

@@ -15,11 +15,9 @@ import android.os.Build;
 import android.os.PowerManager;
 import android.os.Vibrator;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
-import android.view.Display;
-import android.view.WindowManager;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.runtime.exception.ScriptException;

autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java

@@ -7,12 +7,11 @@ import android.graphics.Point;
 import android.os.Build;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.view.KeyEvent;
 
 import com.stardust.autojs.R;
 import com.stardust.autojs.core.accessibility.AccessibilityBridge;
-import com.stardust.autojs.core.boardcast.Broadcast;
 import com.stardust.autojs.core.boardcast.BroadcastEmitter;
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;

autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java

@@ -12,7 +12,7 @@ import android.media.Image;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Base64;
 import android.view.Gravity;
 

autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java

@@ -5,7 +5,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.eventloop.EventEmitter;
 import com.stardust.autojs.core.looper.Loopers;

autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.runtime.api;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.autojs.core.looper.MainThreadProxy;
 import com.stardust.autojs.core.looper.TimerThread;

autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java

@@ -2,8 +2,7 @@ package com.stardust.autojs.runtime.api;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.view.View;
+import androidx.annotation.Nullable;
 
 import com.stardust.autojs.core.graphics.ScriptCanvasView;
 import com.stardust.autojs.core.ui.inflater.DynamicLayoutInflater;
@@ -18,9 +17,7 @@ import com.stardust.autojs.core.ui.widget.JsListView;
 import com.stardust.autojs.rhino.ProxyObject;
 import com.stardust.autojs.runtime.ScriptRuntime;
 
-import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.UniqueTag;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java

@@ -1,6 +1,6 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stardust.pio.PFiles;
 import com.stardust.pio.UncheckedIOException;

autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java

@@ -1,13 +1,10 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.stardust.autojs.rhino.TokenStream;
 import com.stardust.util.MapBuilder;
 
-import org.mozilla.javascript.Token;
-
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Map;

autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.script;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.stardust.io.ConcatReader;
 

autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java

@@ -1,7 +1,7 @@
 package com.stardust.autojs.script;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Reader;
 

autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java

@@ -7,7 +7,7 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.widget.Toast;
 

autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java

@@ -1,11 +1,12 @@
 package com.stardust.autojs.workground;
 
 import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.util.Log;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Stardust on 2017/2/13.
  * http://stackoverflow.com/questions/31759171/recyclerview-and-java-lang-indexoutofboundsexception-inconsistency-detected-in

autojs/src/main/res/layout/console_view.xml

@@ -6,7 +6,7 @@
               android:animateLayoutChanges="true"
               android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/log_list"
         android:layout_width="match_parent"
         android:layout_height="0dp"