From 9d30996ae8525337a9f8ea2c195d4d450400779f Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Fri, 30 Nov 2018 13:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=20=E4=BD=BF=E7=94=A8AndroidX?= =?UTF-8?q?=E4=BB=A3=E6=9B=BFandroid.support=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 733 -> 733 bytes app/build.gradle | 17 ++--- app/src/main/java/org/autojs/autojs/App.kt | 4 +- .../java/org/autojs/autojs/autojs/AutoJs.java | 2 +- .../ScriptExecutionIntentService.java | 2 +- .../fileprovider/AppFileProvider.java | 2 +- .../foreground/ForegroundService.java | 9 +-- .../external/open/EditIntentActivity.java | 2 +- .../external/open/ImportIntentActivity.java | 5 +- .../external/open/RunIntentActivity.java | 2 +- .../receiver/DynamicBroadcastReceivers.java | 3 +- .../external/shortcut/ShortcutManager.java | 10 +-- .../external/tasker/FireSettingReceiver.java | 2 +- .../external/tasker/TaskPrefEditActivity.java | 4 +- .../external/tile/LayoutBoundsTile.java | 2 +- .../external/tile/LayoutHierarchyTile.java | 2 +- .../tile/LayoutInspectTileService.java | 2 +- .../widget/ScriptWidgetSettingsActivity.java | 2 +- .../model/autocomplete/DictionaryTree.java | 3 +- .../autojs/model/explorer/Explorer.java | 2 +- .../model/explorer/ExplorerDirPage.java | 4 +- .../model/indices/ClassSearchingItem.java | 2 +- .../autojs/model/sample/SampleFile.java | 4 +- .../autojs/model/script/ScriptFile.java | 7 +- .../autojs/autojs/model/script/Scripts.java | 3 +- .../autojs/pluginclient/DevPluginService.java | 6 +- .../autojs/theme/ThemeColorManagerCompat.java | 5 +- .../ThemeColorMaterialDialogBuilder.java | 2 +- .../widget/ThemeColorImageViewCompat.java | 2 +- .../widget/ThemeColorSwipeRefreshLayout.java | 2 +- .../java/org/autojs/autojs/tool/RootTool.java | 1 - .../org/autojs/autojs/ui/BaseActivity.java | 16 ++--- .../ui/codegeneration/CodeGenerateDialog.java | 8 +-- .../autojs/ui/common/FileNameInputDialog.java | 2 +- .../autojs/ui/common/NotAskAgainDialog.java | 2 +- .../ui/common/OperationDialogBuilder.java | 7 +- .../autojs/ui/common/OptionListView.java | 6 +- .../autojs/ui/common/ScriptLoopDialog.java | 2 +- .../autojs/ui/common/ScriptOperations.java | 9 +-- .../autojs/autojs/ui/doc/DocsFragment.java | 6 +- .../ui/edit/ClassSearchDialogBuilder.java | 6 +- .../autojs/autojs/ui/edit/EditActivity.java | 8 +-- .../org/autojs/autojs/ui/edit/EditorMenu.java | 2 +- .../org/autojs/autojs/ui/edit/EditorView.java | 24 ++++--- .../ui/edit/FindOrReplaceDialogBuilder.java | 2 +- .../ui/edit/TextSizeSettingDialogBuilder.java | 2 +- .../autojs/ui/edit/ViewSampleActivity.java | 5 +- .../ui/edit/completion/CodeCompletionBar.java | 4 +- .../edit/debug/CodeEvaluateDialogBuilder.java | 2 +- .../autojs/autojs/ui/edit/debug/DebugBar.java | 8 +-- .../autojs/ui/edit/editor/CodeEditText.java | 5 +- .../autojs/ui/edit/editor/CodeEditor.java | 2 +- .../edit/keyboard/FunctionsKeyboardView.java | 15 ++-- .../ui/edit/toolbar/DebugToolbarFragment.java | 4 +- .../edit/toolbar/SearchToolbarFragment.java | 4 +- .../ui/edit/toolbar/ToolbarFragment.java | 8 +-- .../error/AbstractIssueReporterActivity.java | 18 +++-- .../autojs/ui/error/ErrorReportActivity.java | 6 +- .../ui/explorer/ExplorerProjectToolbar.java | 4 +- .../autojs/ui/explorer/ExplorerView.java | 14 ++-- .../ui/explorer/ExplorerViewHelper.java | 2 +- .../ui/filechooser/FileChooseListView.java | 4 +- .../filechooser/FileChooserDialogBuilder.java | 4 +- .../ui/floating/CircularActionMenu.java | 9 ++- .../ui/floating/gesture/DragGesture.java | 2 +- .../layoutinspector/LayoutBoundsView.java | 5 +- .../floating/layoutinspector/NodeInfoView.kt | 6 +- .../org/autojs/autojs/ui/log/LogActivity.java | 2 +- .../autojs/ui/main/FloatingActionMenu.java | 12 ++-- .../autojs/autojs/ui/main/MainActivity.java | 21 +++--- .../autojs/ui/main/ViewPagerFragment.java | 9 ++- .../ui/main/community/CommunityFragment.java | 4 +- .../ui/main/community/CommunityWebView.java | 7 +- .../autojs/ui/main/drawer/DrawerFragment.java | 11 ++- .../ui/main/drawer/DrawerMenuAdapter.java | 3 +- .../drawer/DrawerMenuGroupViewHolder.java | 2 +- .../autojs/ui/main/sample/MarketFragment.java | 4 +- .../ui/main/scripts/MyScriptListFragment.java | 4 +- .../ui/main/task/TaskListRecyclerView.java | 13 ++-- .../ui/main/task/TaskManagerFragment.java | 4 +- .../autojs/ui/project/BuildActivity.java | 7 +- .../ui/project/ProjectConfigActivity.java | 4 +- .../ui/settings/ScriptDirPathPreference.java | 2 +- .../autojs/ui/settings/SettingsActivity.java | 4 +- .../ui/shortcut/ShortcutCreateActivity.java | 6 +- .../shortcut/ShortcutIconSelectActivity.java | 6 +- .../autojs/ui/splash/SplashActivity.java | 2 +- .../ui/timing/TimedTaskSettingActivity.java | 5 +- .../ui/update/UpdateInfoDialogBuilder.java | 2 +- .../autojs/autojs/ui/update/VersionGuard.java | 5 +- .../autojs/autojs/ui/user/WebActivity.java | 2 +- .../ui/widget/AppWithStatusBarLayout.java | 9 +-- .../autojs/autojs/ui/widget/AutoAdapter.java | 4 +- .../autojs/autojs/ui/widget/AvatarView.java | 6 +- .../autojs/ui/widget/BindableViewHolder.java | 2 +- .../autojs/ui/widget/BubblePopupMenu.java | 2 +- .../autojs/ui/widget/CheckBoxCompat.java | 2 +- .../autojs/ui/widget/CommonMarkdownView.java | 4 +- .../org/autojs/autojs/ui/widget/EWebView.java | 4 +- .../ui/widget/ExpandableRecyclerView.java | 6 +- .../ui/widget/GridDividerDecoration.java | 5 +- .../widget/ItemTouchHelperSimpleCallback.java | 4 +- .../autojs/ui/widget/NestedWebView.java | 8 +-- .../autojs/ui/widget/OnItemClickListener.java | 2 +- .../ui/widget/ScrollAwareFABBehavior.java | 7 +- .../autojs/ui/widget/SearchViewItem.java | 6 +- .../ui/widget/SimpleAdapterDataObserver.java | 2 +- .../ui/widget/SimpleRecyclerViewAdapter.java | 2 +- .../autojs/autojs/ui/widget/SwitchCompat.java | 3 +- .../autojs/ui/widget/ToolbarMenuItem.java | 2 +- .../ui/widget/ViewHolderMutableAdapter.java | 2 +- .../autojs/ui/widget/ViewHolderSupplier.java | 2 +- .../WrapContentGridLayoutManger.java | 5 +- app/src/main/res/layout/activity_about.xml | 8 +-- app/src/main/res/layout/activity_build.xml | 36 +++++----- .../res/layout/activity_documentation.xml | 4 +- .../main/res/layout/activity_error_report.xml | 4 +- app/src/main/res/layout/activity_log.xml | 4 +- app/src/main/res/layout/activity_login.xml | 12 ++-- app/src/main/res/layout/activity_main.xml | 30 ++++---- .../res/layout/activity_project_config.xml | 36 +++++----- app/src/main/res/layout/activity_register.xml | 16 ++--- .../activity_script_widget_settings.xml | 4 +- app/src/main/res/layout/activity_settings.xml | 4 +- .../layout/activity_shortcut_icon_select.xml | 6 +- .../main/res/layout/activity_tasker_edit.xml | 4 +- .../layout/activity_timed_task_setting.xml | 12 ++-- .../main/res/layout/activity_view_sample.xml | 4 +- app/src/main/res/layout/activity_web.xml | 4 +- .../layout/air_activity_issue_reporter.xml | 8 +-- .../main/res/layout/air_card_login_compat.xml | 16 ++--- .../res/layout/air_card_report_compat.xml | 14 ++-- app/src/main/res/layout/bubble_popup_menu.xml | 4 +- app/src/main/res/layout/debug_bar.xml | 2 +- .../main/res/layout/dialog_class_search.xml | 6 +- .../main/res/layout/dialog_code_generate.xml | 2 +- .../res/layout/dialog_find_or_replace.xml | 8 +-- .../main/res/layout/dialog_script_loop.xml | 12 ++-- .../res/layout/dialog_text_size_setting.xml | 2 +- app/src/main/res/layout/editor_view.xml | 8 +-- app/src/main/res/layout/explorer_view.xml | 2 +- .../res/layout/file_choose_list_directory.xml | 4 +- .../res/layout/floating_manual_dialog.xml | 4 +- app/src/main/res/layout/fragment_drawer.xml | 2 +- .../res/layout/functions_keyboard_view.xml | 4 +- app/src/main/res/layout/option_list_view.xml | 2 +- .../res/layout/script_file_list_directory.xml | 4 +- .../res/layout/shortcut_create_dialog.xml | 4 +- app/src/main/res/menu/menu_main.xml | 2 +- autojs/build.gradle | 6 +- .../autojs/ExampleInstrumentedTest.java | 15 +--- .../main/java/com/stardust/autojs/AutoJs.java | 4 +- .../stardust/autojs/ScriptEngineService.java | 9 +-- .../autojs/codegeneration/CodeGenerator.java | 2 +- .../codegeneration/ReadOnlyUiObject.java | 6 +- .../accessibility/AccessibilityBridge.java | 4 +- .../accessibility/SimpleActionAutomator.java | 2 +- .../autojs/core/accessibility/UiSelector.java | 64 +++++++++--------- .../autojs/core/console/ConsoleFloaty.java | 2 +- .../autojs/core/console/ConsoleImpl.java | 4 +- .../autojs/core/console/ConsoleView.java | 9 +-- .../autojs/core/console/NoOpConsole.java | 2 +- .../autojs/core/eventloop/EventEmitter.java | 5 +- .../floaty/BaseResizableFloatyWindow.java | 9 +-- .../autojs/core/graphics/ScriptCanvas.java | 6 +- .../autojs/core/image/ColorFinder.java | 2 +- .../stardust/autojs/core/image/Colors.java | 2 +- .../autojs/core/image/ImageWrapper.java | 2 +- .../capture/ScreenCaptureRequestActivity.java | 4 +- .../image/capture/ScreenCaptureRequester.java | 2 +- .../core/image/capture/ScreenCapturer.java | 4 +- .../autojs/core/inputevent/InputDevices.java | 2 +- .../core/inputevent/InputEventObserver.java | 2 +- .../autojs/core/inputevent/RootAutomator.java | 2 +- .../core/inputevent/ShellKeyObserver.java | 2 +- .../autojs/core/inputevent/TouchObserver.java | 2 +- .../autojs/core/looper/TimerThread.java | 2 +- .../autojs/core/opencv/OpenCVHelper.java | 2 +- .../OnRequestPermissionsResultCallback.java | 2 +- .../permission/PermissionRequestActivity.java | 7 +- .../PermissionRequestProxyActivity.java | 4 +- .../autojs/core/permission/Permissions.java | 4 +- .../RequestPermissionCallbacks.java | 2 +- .../record/inputevent/InputEventRecorder.java | 2 +- .../InputEventToAutoFileRecorder.java | 2 +- .../InputEventToRootAutomatorRecorder.java | 2 +- .../InputEventToSendEventJsRecorder.java | 2 +- .../stardust/autojs/core/ui/JsViewHelper.java | 2 +- .../core/ui/attribute/AppbarAttributes.java | 2 +- .../core/ui/attribute/CardAttributes.java | 3 +- .../core/ui/attribute/FabViewAttributes.java | 3 +- .../ui/attribute/ImageViewAttributes.java | 5 +- .../core/ui/attribute/ViewAttributes.java | 9 +-- .../ui/attribute/ViewAttributesFactory.java | 9 +-- .../core/ui/dialog/BlockedMaterialDialog.java | 5 +- .../autojs/core/ui/dialog/JsDialog.java | 11 +-- .../core/ui/dialog/JsDialogBuilder.java | 17 +---- .../ui/inflater/DynamicLayoutInflater.java | 6 +- .../autojs/core/ui/inflater/ViewInflater.java | 2 +- .../ui/inflater/inflaters/AppBarInflater.java | 5 +- .../inflater/inflaters/BaseViewInflater.java | 3 +- .../inflaters/CanvasViewInflater.java | 2 +- .../inflaters/DatePickerInflater.java | 2 +- .../inflaters/JsGridViewInflater.java | 5 +- .../inflaters/JsImageViewInflater.java | 2 +- .../inflaters/JsListViewInflater.java | 4 +- .../inflater/inflaters/SpinnerInflater.java | 12 +--- .../inflater/inflaters/TabLayoutInflater.java | 4 +- .../inflaters/TimePickerInflater.java | 2 +- .../inflater/inflaters/ToolbarInflater.java | 5 +- .../core/ui/nativeview/ViewPrototype.java | 3 +- .../autojs/core/ui/widget/JsButton.java | 2 +- .../autojs/core/ui/widget/JsEditText.java | 2 +- .../autojs/core/ui/widget/JsFrameLayout.java | 10 +-- .../autojs/core/ui/widget/JsGridView.java | 6 +- .../autojs/core/ui/widget/JsImageView.java | 4 +- .../autojs/core/ui/widget/JsLinearLayout.java | 4 +- .../autojs/core/ui/widget/JsListView.java | 3 +- .../core/ui/widget/JsRelativeLayout.java | 2 +- .../autojs/core/ui/widget/JsSpinner.java | 7 +- .../autojs/core/ui/widget/JsTabLayout.java | 9 +-- .../autojs/core/ui/widget/JsTextView.java | 9 ++- .../autojs/core/ui/widget/JsToolbar.java | 9 +-- .../autojs/core/ui/widget/JsViewPager.java | 9 ++- .../autojs/core/ui/widget/JsWebView.java | 2 +- .../autojs/core/ui/xml/XmlConverter.java | 16 ++--- .../autojs/engine/JavaScriptEngine.java | 3 +- .../stardust/autojs/engine/ScriptEngine.java | 3 +- .../autojs/engine/ScriptEngineFactory.java | 4 +- .../autojs/engine/ScriptEngineManager.java | 4 +- .../preprocess/MultiLinePreprocessor.java | 4 +- .../execution/ScriptExecuteActivity.java | 9 +-- .../autojs/project/ProjectConfig.java | 4 +- .../autojs/rhino/RhinoAndroidHelper.java | 2 +- .../stardust/autojs/rhino/debug/Debugger.java | 2 +- .../autojs/runtime/api/AbstractConsole.java | 4 +- .../stardust/autojs/runtime/api/AppUtils.java | 8 +-- .../stardust/autojs/runtime/api/Console.java | 2 +- .../stardust/autojs/runtime/api/Device.java | 6 +- .../stardust/autojs/runtime/api/Events.java | 3 +- .../stardust/autojs/runtime/api/Images.java | 2 +- .../stardust/autojs/runtime/api/Sensors.java | 2 +- .../stardust/autojs/runtime/api/Threads.java | 2 +- .../com/stardust/autojs/runtime/api/UI.java | 5 +- .../autojs/script/JavaScriptFileSource.java | 2 +- .../autojs/script/JavaScriptSource.java | 7 +- .../autojs/script/SequenceScriptSource.java | 4 +- .../autojs/script/StringScriptSource.java | 2 +- .../autojs/util/FloatingPermission.java | 2 +- .../WrapContentLinearLayoutManager.java | 5 +- autojs/src/main/res/layout/console_view.xml | 2 +- autojs/src/main/res/layout/js_appbar.xml | 4 +- automator/build.gradle | 6 +- .../automator/GlobalActionAutomator.kt | 2 +- .../java/com/stardust/automator/UiObject.kt | 20 +++--- .../stardust/automator/UiObjectCollection.kt | 62 ++++++++--------- .../automator/filter/BooleanFilter.kt | 2 +- .../stardust/automator/filter/DfsFilter.kt | 2 +- .../stardust/automator/filter/ListFilter.kt | 11 ++- .../stardust/automator/filter/TextFilter.kt | 1 - .../automator/simple_action/ActionFactory.kt | 2 +- .../automator/simple_action/ActionTarget.kt | 2 +- .../com/stardust/notification/Notification.kt | 2 +- .../NotificationListenerService.kt | 2 +- .../AccessibilityNodeInfoAllocator.kt | 4 +- .../AccessibilityNodeInfoHelper.kt | 2 +- .../view/accessibility/LayoutInspector.kt | 4 +- .../stardust/view/accessibility/NodeInfo.kt | 2 +- build.gradle | 1 + common/build.gradle | 6 +- .../com/stardust/ExampleInstrumentedTest.java | 4 +- .../main/java/com/stardust/app/Fragment.java | 6 +- .../app/FragmentPagerAdapterBuilder.java | 8 +-- .../com/stardust/app/GlobalAppContext.java | 2 +- .../main/java/com/stardust/app/MenuUtils.java | 2 +- .../app/OnActivityResultDelegate.java | 2 +- .../src/main/java/com/stardust/io/EFile.java | 2 +- .../src/main/java/com/stardust/pio/PFile.java | 5 +- .../main/java/com/stardust/util/BiMaps.java | 4 +- .../java/com/stardust/util/ClipboardUtil.java | 4 +- .../main/java/com/stardust/util/Consumer.java | 2 +- .../com/stardust/util/DeveloperUtils.java | 7 +- .../com/stardust/util/DrawerAutoClose.java | 4 +- .../java/com/stardust/util/IntentUtil.java | 4 +- .../java/com/stardust/util/MimeTypes.java | 4 +- .../com/stardust/util/SparseArrayEntries.java | 2 +- .../java/com/stardust/util/TextUtils.java | 2 +- .../main/java/com/stardust/util/ViewUtil.java | 3 +- gradle.properties | 2 + inrt/build.gradle | 5 +- .../auojs/inrt/ExampleInstrumentedTest.java | 4 +- inrt/src/main/AndroidManifest.xml | 2 +- .../com/stardust/auojs/inrt/LogActivity.java | 4 +- .../stardust/auojs/inrt/SettingsActivity.java | 8 +-- .../stardust/auojs/inrt/SplashActivity.java | 8 +-- inrt/src/main/res/layout/activity_main.xml | 4 +- .../src/main/res/layout/activity_settings.xml | 4 +- 297 files changed, 749 insertions(+), 888 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 4ddecf6c310a34e95d99a0317df6b64c15b094e6..6ebf142a06ca8365a969258293af7262e4fa5c61 100644 GIT binary patch delta 178 zcmV;j08Rhh1>FUZm;_?}<0g@ucM$o3w-iF3^yLJdwhx$qxtfzB0Zb5_*Nfnt(~e`a z9s%;OV delta 178 zcmV;j08Rhh1>FUZm;_T6C=-#KcM!+Z_&D(Zhi+{5IO;Az5P6d$0Zb4Q(Wp_sPQwQW z{1F`vh}> { diff --git a/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java b/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java index 083dd646..07d38f5d 100644 --- a/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.java +++ b/app/src/main/java/org/autojs/autojs/model/sample/SampleFile.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; diff --git a/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java b/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java index 60062f45..2cf2b6b5 100644 --- a/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.java +++ b/app/src/main/java/org/autojs/autojs/model/script/ScriptFile.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. diff --git a/app/src/main/java/org/autojs/autojs/model/script/Scripts.java b/app/src/main/java/org/autojs/autojs/model/script/Scripts.java index c323d22f..903fcce6 100644 --- a/app/src/main/java/org/autojs/autojs/model/script/Scripts.java +++ b/app/src/main/java/org/autojs/autojs/model/script/Scripts.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; diff --git a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java index 381654f2..1da3449b 100644 --- a/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java +++ b/app/src/main/java/org/autojs/autojs/pluginclient/DevPluginService.java @@ -4,9 +4,9 @@ import android.annotation.SuppressLint; 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; diff --git a/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java b/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java index c8056641..ed75fab3 100644 --- a/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java +++ b/app/src/main/java/org/autojs/autojs/theme/ThemeColorManagerCompat.java @@ -3,12 +3,11 @@ package org.autojs.autojs.theme; 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; diff --git a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java index add6b009..f132049d 100644 --- a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.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; diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java index 5ef27f1f..3faf1eeb 100644 --- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java +++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorImageViewCompat.java @@ -2,7 +2,7 @@ package org.autojs.autojs.theme.widget; 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; diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java index 7ee92daa..057a23f4 100644 --- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java +++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.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; diff --git a/app/src/main/java/org/autojs/autojs/tool/RootTool.java b/app/src/main/java/org/autojs/autojs/tool/RootTool.java index 37aac3b3..f3d05a9d 100644 --- a/app/src/main/java/org/autojs/autojs/tool/RootTool.java +++ b/app/src/main/java/org/autojs/autojs/tool/RootTool.java @@ -19,7 +19,6 @@ public class RootTool { } 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" + diff --git a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java index ad86aecb..746f4aff 100644 --- a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.java @@ -4,14 +4,14 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java b/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java index ce448544..3287dd16 100644 --- a/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java +++ b/app/src/main/java/org/autojs/autojs/ui/codegeneration/CodeGenerateDialog.java @@ -1,10 +1,10 @@ package org.autojs.autojs.ui.codegeneration; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java index f8dd7c71..9cb451ba 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/FileNameInputDialog.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.common; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.widget.EditText; diff --git a/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java index 0526a2c9..5c646858 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/NotAskAgainDialog.java @@ -2,7 +2,7 @@ package org.autojs.autojs.ui.common; import android.content.Context; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.afollestad.materialdialogs.MaterialDialog; diff --git a/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java index f3aaac1d..5f857c7e 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/OperationDialogBuilder.java @@ -1,9 +1,9 @@ package com.stardust.app; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,7 +17,6 @@ import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.OnClick; /** * Created by Stardust on 2017/6/26. diff --git a/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java b/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java index 17d51b58..8e1414a8 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/OptionListView.java @@ -1,9 +1,9 @@ package org.autojs.autojs.ui.common; import android.content.Context; -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.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java index 647532d5..286d6fc6 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.common; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.Window; import android.widget.EditText; diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java index b5ca170e..5a6ec020 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptOperations.java @@ -5,13 +5,12 @@ import android.content.Context; import android.content.Intent; import android.os.Environment; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; import android.text.Editable; import android.text.InputType; import android.view.View; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.Toast; @@ -19,7 +18,6 @@ import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.app.DialogUtils; import com.stardust.app.GlobalAppContext; -import com.stardust.pio.PFile; import com.stardust.pio.PFiles; import com.stardust.pio.UncheckedIOException; import com.tencent.bugly.crashreport.BuglyLog; @@ -30,7 +28,6 @@ import org.autojs.autojs.external.ScriptIntents; import org.autojs.autojs.model.explorer.Explorer; import org.autojs.autojs.model.explorer.ExplorerDirPage; import org.autojs.autojs.model.explorer.ExplorerFileItem; -import org.autojs.autojs.model.explorer.ExplorerItem; import org.autojs.autojs.model.explorer.ExplorerPage; import org.autojs.autojs.model.explorer.Explorers; import org.autojs.autojs.storage.file.TmpScriptFiles; diff --git a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java index 86914a6c..1c57f4d9 100644 --- a/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/doc/DocsFragment.java @@ -2,9 +2,9 @@ package org.autojs.autojs.ui.doc; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.text.TextUtils; import android.webkit.WebView; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java index e241bb8a..6d2723ff 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/ClassSearchDialogBuilder.java @@ -3,9 +3,9 @@ package org.autojs.autojs.ui.edit; import android.annotation.SuppressLint; import android.content.Context; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.ContextThemeWrapper; import android.view.View; import android.widget.EditText; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java index 04833873..f6efb489 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import android.view.ActionMode; import android.view.Menu; @@ -158,14 +158,14 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega } @Override - public void onSupportActionModeStarted(@NonNull android.support.v7.view.ActionMode mode) { + public void onSupportActionModeStarted(@NonNull androidx.appcompat.view.ActionMode mode) { Log.d(LOG_TAG, "onSupportActionModeStarted: mode = " + mode); super.onSupportActionModeStarted(mode); } @Nullable @Override - public android.support.v7.view.ActionMode onWindowStartingSupportActionMode(@NonNull android.support.v7.view.ActionMode.Callback callback) { + public androidx.appcompat.view.ActionMode onWindowStartingSupportActionMode(@NonNull androidx.appcompat.view.ActionMode.Callback callback) { Log.d(LOG_TAG, "onWindowStartingSupportActionMode: callback = " + callback); return super.onWindowStartingSupportActionMode(callback); } diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java index c603f8bf..cf724352 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditorMenu.java @@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit; import android.annotation.SuppressLint; import android.content.Context; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.text.InputType; import android.text.TextUtils; import android.view.MenuItem; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java index db2db7c5..2b225aba 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/EditorView.java @@ -10,12 +10,17 @@ import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.widget.DrawerLayout; + +import androidx.annotation.Nullable; + +import com.google.android.material.snackbar.Snackbar; + +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; + import android.text.TextUtils; import android.util.AttributeSet; import android.util.SparseBooleanArray; @@ -32,7 +37,6 @@ import com.stardust.autojs.execution.ScriptExecution; import com.stardust.pio.PFiles; import com.stardust.util.BackPressedHandler; import com.stardust.util.Callback; -import com.stardust.util.IntentUtil; import com.stardust.util.ViewUtils; import org.androidannotations.annotations.AfterViews; @@ -349,11 +353,11 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC } public boolean onBackPressed() { - if (mDrawerLayout.isDrawerOpen(Gravity.START)) { + if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) { if (mDocsWebView.getWebView().canGoBack()) { mDocsWebView.getWebView().goBack(); } else { - mDrawerLayout.closeDrawer(Gravity.START); + mDrawerLayout.closeDrawer(GravityCompat.START); } return true; } @@ -625,7 +629,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC .url(absUrl) .pinToLeft(v -> { mDocsWebView.getWebView().loadUrl(absUrl); - mDrawerLayout.openDrawer(Gravity.START); + mDrawerLayout.openDrawer(GravityCompat.START); }) .show(); } diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java index a86704bd..632d0b6f 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/FindOrReplaceDialogBuilder.java @@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit; import android.content.Context; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java index 9440d5fc..3ffff96a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/TextSizeSettingDialogBuilder.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.edit; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java index e553e15c..1f803adc 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AppCompatActivity; import android.util.SparseArray; import android.view.Menu; import android.view.MenuItem; @@ -21,7 +21,6 @@ import org.autojs.autojs.model.sample.SampleFile; import org.autojs.autojs.ui.BaseActivity; import org.autojs.autojs.ui.common.ScriptOperations; import com.stardust.theme.ThemeColorManager; -import com.stardust.util.AssetsCache; import com.stardust.util.SparseArrayEntries; import org.autojs.autojs.ui.widget.ToolbarMenuItem; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java b/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java index 65547f61..9553f5e5 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/completion/CodeCompletionBar.java @@ -2,8 +2,8 @@ package org.autojs.autojs.ui.edit.completion; import android.content.Context; import android.os.Looper; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java index 53b82815..7da4da6b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/debug/CodeEvaluateDialogBuilder.java @@ -3,7 +3,7 @@ package org.autojs.autojs.ui.edit.debug; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.TextUtils; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java b/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java index 30b667bb..63dd608c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/debug/DebugBar.java @@ -1,10 +1,10 @@ package org.autojs.autojs.ui.edit.debug; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java index 8f27a861..88f317cc 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditText.java @@ -25,8 +25,8 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.RequiresApi; -import android.support.v7.widget.AppCompatEditText; +import androidx.annotation.RequiresApi; +import androidx.appcompat.widget.AppCompatEditText; import android.text.Editable; import android.text.Layout; import android.util.AttributeSet; @@ -40,7 +40,6 @@ import android.widget.TextViewHelper; import org.autojs.autojs.ui.edit.theme.Theme; import org.autojs.autojs.ui.edit.theme.TokenMapping; -import com.stardust.util.ClipboardUtil; import com.stardust.util.TextUtils; import org.mozilla.javascript.Token; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java index 463e09c6..1d56fa3b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/editor/CodeEditor.java @@ -2,7 +2,7 @@ package org.autojs.autojs.ui.edit.editor; import android.content.Context; import android.graphics.Canvas; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.text.Layout; import android.util.AttributeSet; import android.widget.Toast; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java b/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java index 466296e2..5b4a2f36 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/keyboard/FunctionsKeyboardView.java @@ -5,14 +5,13 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java index f43b26e4..bafff140 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/DebugToolbarFragment.java @@ -2,8 +2,8 @@ package org.autojs.autojs.ui.edit.toolbar; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java index ac947588..9c3a43dd 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/SearchToolbarFragment.java @@ -1,8 +1,8 @@ package org.autojs.autojs.ui.edit.toolbar; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import org.androidannotations.annotations.EFragment; diff --git a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java index c531971f..c9969f0b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/edit/toolbar/ToolbarFragment.java @@ -1,10 +1,10 @@ package org.autojs.autojs.ui.edit.toolbar; import android.os.Bundle; -import android.os.Parcelable; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.util.SparseBooleanArray; + +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import android.view.View; import org.autojs.autojs.ui.edit.EditorView; diff --git a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java index 355cabd0..e0e9adcd 100644 --- a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java @@ -3,22 +3,20 @@ package org.autojs.autojs.ui.error; import android.app.Activity; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringDef; -import android.support.annotation.StringRes; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TextInputLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringDef; +import androidx.annotation.StringRes; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.textfield.TextInputLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.Log; -import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; import android.widget.EditText; diff --git a/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java index 1c4bc350..829ec800 100644 --- a/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/error/ErrorReportActivity.java @@ -2,15 +2,13 @@ package org.autojs.autojs.ui.error; import android.content.ClipData; import android.content.ClipboardManager; -import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.util.SparseIntArray; -import android.widget.TextView; import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java index 2f01565e..9d3b7357 100644 --- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java +++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerProjectToolbar.java @@ -1,8 +1,8 @@ package org.autojs.autojs.ui.explorer; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.CardView; +import androidx.annotation.Nullable; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.widget.TextView; import android.widget.Toast; diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java index 0db17a49..0f9ef5e7 100644 --- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java +++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerView.java @@ -3,13 +3,13 @@ package org.autojs.autojs.ui.explorer; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java index c1719b0b..a4d05fbe 100644 --- a/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java +++ b/app/src/main/java/org/autojs/autojs/ui/explorer/ExplorerViewHelper.java @@ -12,7 +12,7 @@ import org.autojs.autojs.model.explorer.ExplorerPage; import org.autojs.autojs.model.explorer.ExplorerProjectPage; import org.autojs.autojs.model.explorer.ExplorerSamplePage; -import static android.support.v4.content.ContextCompat.getColor; +import static androidx.core.content.ContextCompat.getColor; import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_AUTO_FILE; import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_JAVASCRIPT; import static org.autojs.autojs.model.explorer.ExplorerItem.TYPE_UNKNOWN; diff --git a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java index 92d252e8..4606c115 100644 --- a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java +++ b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooseListView.java @@ -2,8 +2,7 @@ package org.autojs.autojs.ui.filechooser; import android.content.Context; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.Nullable; -import android.support.v7.widget.SimpleItemAnimator; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -28,6 +27,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import androidx.recyclerview.widget.SimpleItemAnimator; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnCheckedChanged; diff --git a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java index 9ed471b3..bcf5ab81 100644 --- a/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/filechooser/FileChooserDialogBuilder.java @@ -1,8 +1,8 @@ package org.autojs.autojs.ui.filechooser; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.pio.PFile; diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java b/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java index 0128bad5..0ce1db60 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/floating/CircularActionMenu.java @@ -5,12 +5,11 @@ import android.animation.AnimatorListenerAdapter; import android.content.Context; import android.content.res.TypedArray; import android.graphics.PointF; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; -import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.view.animation.Animation; diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java b/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java index 144e755d..f128ff74 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java +++ b/app/src/main/java/org/autojs/autojs/ui/floating/gesture/DragGesture.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.floating.gesture; -import android.support.v4.view.GestureDetectorCompat; +import androidx.core.view.GestureDetectorCompat; import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java index ee9f547b..3d3e247e 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java +++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/LayoutBoundsView.java @@ -7,8 +7,8 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.Region; 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.MotionEvent; import android.view.View; @@ -18,7 +18,6 @@ import com.stardust.util.ViewUtil; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt index 191bf883..54835071 100644 --- a/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt +++ b/app/src/main/java/org/autojs/autojs/ui/floating/layoutinspector/NodeInfoView.kt @@ -1,15 +1,15 @@ package org.autojs.autojs.ui.floating.layoutinspector import android.content.Context -import android.support.design.widget.Snackbar -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import butterknife.BindView +import com.google.android.material.snackbar.Snackbar import com.stardust.util.ClipboardUtil import com.stardust.util.sortedArrayOf import com.stardust.view.accessibility.NodeInfo diff --git a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java index e87c45fc..c022b8a7 100644 --- a/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/log/LogActivity.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.log; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; import com.stardust.autojs.core.console.ConsoleView; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java b/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java index e4c746fe..81526eec 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/FloatingActionMenu.java @@ -3,11 +3,11 @@ package org.autojs.autojs.ui.main; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.Context; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -16,9 +16,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import org.autojs.autojs.R; -import org.autojs.autojs.ui.common.ScriptOperations; -import io.reactivex.Observable; import io.reactivex.subjects.PublishSubject; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java index 1827429f..38d6b9c6 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java @@ -4,19 +4,22 @@ import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + +import androidx.core.view.GravityCompat; +import androidx.fragment.app.Fragment; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.viewpager.widget.ViewPager; + import android.view.Gravity; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import com.google.android.material.tabs.TabLayout; import com.stardust.app.FragmentPagerAdapterBuilder; import com.stardust.app.OnActivityResultDelegate; import com.stardust.autojs.core.permission.OnRequestPermissionsResultCallback; @@ -321,7 +324,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega @Subscribe public void onLoadUrl(CommunityFragment.LoadUrl loadUrl) { - mDrawerLayout.closeDrawer(Gravity.START); + mDrawerLayout.closeDrawer(GravityCompat.START); } diff --git a/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java index 068786c6..0cdd8441 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/ViewPagerFragment.java @@ -1,10 +1,9 @@ package org.autojs.autojs.ui.main; -import android.support.annotation.CallSuper; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.CallSuper; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.fragment.app.Fragment; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.view.View; import com.stardust.util.BackPressedHandler; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java index 159c04f6..9e9bbee4 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityFragment.java @@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.community; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.webkit.WebView; import org.autojs.autojs.R; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java index 4ccecd7e..de81a140 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/community/CommunityWebView.java @@ -3,8 +3,9 @@ package org.autojs.autojs.ui.main.community; import android.annotation.SuppressLint; import android.content.Context; import android.net.Uri; -import android.support.design.widget.BottomSheetDialog; -import android.support.design.widget.Snackbar; + +import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.google.android.material.snackbar.Snackbar; import android.util.AttributeSet; import android.webkit.ValueCallback; import android.webkit.WebView; @@ -78,7 +79,7 @@ public class CommunityWebView extends EWebView { .show(), error -> { error.printStackTrace(); - Snackbar.make(CommunityWebView.this, R.string.text_download_failed, Toast.LENGTH_SHORT).show(); + Snackbar.make(CommunityWebView.this, R.string.text_download_failed, Snackbar.LENGTH_SHORT).show(); }); } diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java index 906c2151..fea4ac2c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerFragment.java @@ -2,14 +2,13 @@ package org.autojs.autojs.ui.main.drawer; import android.annotation.SuppressLint; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.TextView; @@ -84,7 +83,7 @@ import io.reactivex.schedulers.Schedulers; * TODO these codes are so ugly!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ @EFragment(R.layout.fragment_drawer) -public class DrawerFragment extends android.support.v4.app.Fragment { +public class DrawerFragment extends androidx.fragment.app.Fragment { private static final String URL_DEV_PLUGIN = "https://www.autojs.org/topic/968/"; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java index c8e0c4ad..a4819dd0 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuAdapter.java @@ -1,13 +1,12 @@ package org.autojs.autojs.ui.main.drawer; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; import org.autojs.autojs.R; import org.autojs.autojs.ui.widget.BindableViewHolder; -import java.util.ArrayList; import java.util.List; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java index 71530dcf..2a0c4df9 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/drawer/DrawerMenuGroupViewHolder.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.main.drawer; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java index 5269ad05..5de77050 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/sample/MarketFragment.java @@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.sample; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.autojs.autojs.R; import org.autojs.autojs.ui.main.QueryEvent; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java index 559bf5aa..172a3a7f 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/scripts/MyScriptListFragment.java @@ -3,8 +3,8 @@ package org.autojs.autojs.ui.main.scripts; import android.app.Activity; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.stardust.app.GlobalAppContext; import com.stardust.util.IntentUtil; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java index 18123940..67344bcb 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskListRecyclerView.java @@ -2,10 +2,10 @@ package org.autojs.autojs.ui.main.task; import android.content.Context; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.ThemeColorRecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.appcompat.widget.ThemeColorRecyclerView; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; @@ -17,7 +17,6 @@ import android.widget.TextView; import com.bignerdranch.expandablerecyclerview.ChildViewHolder; import com.bignerdranch.expandablerecyclerview.ExpandableRecyclerAdapter; import com.bignerdranch.expandablerecyclerview.ParentViewHolder; -import com.stardust.autojs.ScriptEngineService; import com.stardust.autojs.execution.ScriptExecution; import com.stardust.autojs.execution.ScriptExecutionListener; import com.stardust.autojs.execution.SimpleScriptExecutionListener; @@ -27,11 +26,7 @@ import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import org.autojs.autojs.R; import org.autojs.autojs.autojs.AutoJs; -import org.autojs.autojs.external.tasker.TaskerScriptEditActivity; import org.autojs.autojs.storage.database.ModelChange; -import org.autojs.autojs.timing.IntentTask; -import org.autojs.autojs.timing.TaskReceiver; -import org.autojs.autojs.timing.TimedTask; import org.autojs.autojs.timing.TimedTaskManager; import org.autojs.autojs.ui.timing.TimedTaskSettingActivity; import org.autojs.autojs.ui.timing.TimedTaskSettingActivity_; diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java index d6ffb284..425a8d1a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java +++ b/app/src/main/java/org/autojs/autojs/ui/main/task/TaskManagerFragment.java @@ -2,8 +2,8 @@ package org.autojs.autojs.ui.main.task; import android.app.Activity; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.widget.SwipeRefreshLayout; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import android.view.View; import org.autojs.autojs.R; diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java index 46dabb53..928583d3 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java @@ -5,9 +5,8 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v7.widget.CardView; +import androidx.annotation.Nullable; +import androidx.cardview.widget.CardView; import android.text.Editable; import android.text.TextUtils; import android.util.Log; @@ -17,6 +16,7 @@ import android.widget.ImageView; import android.widget.Toast; import com.afollestad.materialdialogs.MaterialDialog; +import com.google.android.material.textfield.TextInputLayout; import com.stardust.autojs.project.ProjectConfig; import com.stardust.util.IntentUtil; @@ -43,6 +43,7 @@ import java.util.Locale; import java.util.concurrent.Callable; import java.util.regex.Pattern; +import androidx.cardview.widget.CardView; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java index 60b7ddf1..704113ae 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java @@ -4,8 +4,7 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextUtils; import android.view.View; @@ -14,6 +13,7 @@ import android.widget.ImageView; import android.widget.Toast; import com.bumptech.glide.Glide; +import com.google.android.material.textfield.TextInputLayout; import com.stardust.autojs.project.ProjectConfig; import com.stardust.pio.PFiles; diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java index f308dc4a..eb56979c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java +++ b/app/src/main/java/org/autojs/autojs/ui/settings/ScriptDirPathPreference.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.settings; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java index a8423d6d..177805de 100644 --- a/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/settings/SettingsActivity.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceScreen; -import android.support.v4.util.Pair; -import android.support.v7.widget.Toolbar; +import androidx.core.util.Pair; +import androidx.appcompat.widget.Toolbar; import android.view.View; import com.stardust.theme.app.ColorSelectActivity; diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java index 67716426..2aec7e0a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutCreateActivity.java @@ -10,9 +10,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; -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.util.Log; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java index c83c05ce..78dbaccd 100644 --- a/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/shortcut/ShortcutIconSelectActivity.java @@ -5,13 +5,12 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.content.pm.ShortcutManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -30,7 +29,6 @@ import org.autojs.autojs.workground.WrapContentGridLayoutManger; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.Callable; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java b/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java index 2cdeb58a..aec2b8fc 100644 --- a/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/splash/SplashActivity.java @@ -2,7 +2,7 @@ package org.autojs.autojs.ui.splash; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.autojs.autojs.R; import org.autojs.autojs.ui.BaseActivity; diff --git a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java index bf9efd8c..345b1e04 100644 --- a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java @@ -4,15 +4,14 @@ import android.app.DatePickerDialog; import android.app.TimePickerDialog; import android.content.ActivityNotFoundException; import android.content.Intent; -import android.graphics.ColorFilter; import android.net.ConnectivityManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.PowerManager; import android.provider.Settings; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.Log; import android.view.Menu; diff --git a/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java b/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java index 413913e2..8fa166fe 100644 --- a/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/ui/update/UpdateInfoDialogBuilder.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java index 588ed99c..57796b4a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java +++ b/app/src/main/java/org/autojs/autojs/ui/update/VersionGuard.java @@ -1,8 +1,8 @@ package org.autojs.autojs.ui.update; import android.app.Activity; -import android.content.DialogInterface; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; @@ -13,7 +13,6 @@ import org.autojs.autojs.network.entity.VersionInfo; import org.autojs.autojs.tool.SimpleObserver; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; /** * Created by Stardust on 2017/4/12. diff --git a/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java b/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java index 4cd4d720..28bbb16a 100644 --- a/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/user/WebActivity.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.user; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.stardust.app.OnActivityResultDelegate; import org.autojs.autojs.R; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java b/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java index 237e73bf..4addc273 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/AppWithStatusBarLayout.java @@ -5,17 +5,14 @@ import android.content.Context; import android.content.ContextWrapper; import android.content.res.Configuration; import android.graphics.Rect; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; import android.util.AttributeSet; import android.util.TypedValue; -import android.view.View; import android.view.ViewTreeObserver; import android.view.Window; -import com.stardust.util.ViewUtil; - /** * Created by Stardust on 2017/8/22. */ diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java index 285db8cf..4761b67e 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/AutoAdapter.java @@ -1,10 +1,8 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; -import org.autojs.autojs.model.indices.ClassSearchingItem; - import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java b/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java index e375e778..f5ed2b82 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/AvatarView.java @@ -3,9 +3,9 @@ package org.autojs.autojs.ui.widget; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java b/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java index d2c3e667..f5b828be 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/BindableViewHolder.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java b/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java index 74c5f448..3e007f09 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/BubblePopupMenu.java @@ -3,7 +3,7 @@ package org.autojs.autojs.ui.widget; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java b/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java index aaf0160d..f248a218 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/CheckBoxCompat.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.widget; import android.content.Context; -import android.support.v7.widget.AppCompatCheckBox; +import androidx.appcompat.widget.AppCompatCheckBox; import android.util.AttributeSet; import android.widget.CompoundButton; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java b/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java index 05b8709f..de9d80fb 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/CommonMarkdownView.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.webkit.WebResourceRequest; import android.webkit.WebView; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java index dc60cca5..0ca3fb2b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/EWebView.java @@ -8,8 +8,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.webkit.ValueCallback; import android.webkit.WebChromeClient; @@ -29,6 +28,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java b/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java index 2b973343..36069254 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ExpandableRecyclerView.java @@ -1,9 +1,9 @@ package org.autojs.autojs.ui.widget; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.ThemeColorRecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.ThemeColorRecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java b/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java index 0d383c6a..d7f6e198 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/GridDividerDecoration.java @@ -5,12 +5,11 @@ package org.autojs.autojs.ui.widget; */ import android.content.Context; -import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.RecyclerView; -import android.util.TypedValue; +import androidx.recyclerview.widget.RecyclerView; + import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java b/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java index d74ace07..1eba36c1 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ItemTouchHelperSimpleCallback.java @@ -1,7 +1,7 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; /** * Created by Stardust on 2017/4/6. diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java b/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java index 7197d4f1..553f7ecc 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/NestedWebView.java @@ -16,10 +16,10 @@ package org.autojs.autojs.ui.widget;/* import android.content.Context; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.NestedScrollingChild; -import android.support.v4.view.NestedScrollingChildHelper; -import android.support.v4.view.ViewCompat; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.NestedScrollingChild; +import androidx.core.view.NestedScrollingChildHelper; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.webkit.WebView; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java b/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java index 3f81384a..88b13a59 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/OnItemClickListener.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java b/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java index b5cce217..7a2c1088 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ScrollAwareFABBehavior.java @@ -4,9 +4,10 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.content.Context; -import android.support.design.widget.CoordinatorLayout; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.coordinatorlayout.widget.CoordinatorLayout; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java b/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java index 76e2329b..d574e19c 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/SearchViewItem.java @@ -3,12 +3,10 @@ package org.autojs.autojs.ui.widget; import android.app.Activity; import android.app.SearchManager; import android.content.Context; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.widget.SearchView; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.widget.SearchView; import android.view.MenuItem; -import org.autojs.autojs.ui.main.MainActivity; - /** * Created by Stardust on 2017/10/25. */ diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java index 65e01347..daff64fb 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleAdapterDataObserver.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; /** * Created by Stardust on 2017/3/14. diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java index 03ddbab2..1e5a94bd 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/SimpleRecyclerViewAdapter.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java b/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java index f3788e0b..b8af035f 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/SwitchCompat.java @@ -2,13 +2,12 @@ package org.autojs.autojs.ui.widget; import android.content.Context; import android.util.AttributeSet; -import android.widget.CompoundButton; /** * Created by Stardust on 2017/9/18. */ -public class SwitchCompat extends android.support.v7.widget.SwitchCompat { +public class SwitchCompat extends androidx.appcompat.widget.SwitchCompat { private boolean mIgnoreCheckedChange = false; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java b/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java index 728feb60..593f9445 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ToolbarMenuItem.java @@ -7,7 +7,7 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java index 07317872..03449b1b 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderMutableAdapter.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; /** diff --git a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java index 6178ac27..c9bc4c09 100644 --- a/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java +++ b/app/src/main/java/org/autojs/autojs/ui/widget/ViewHolderSupplier.java @@ -1,6 +1,6 @@ package org.autojs.autojs.ui.widget; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java b/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java index a8045f8d..013448c2 100644 --- a/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java +++ b/app/src/main/java/org/autojs/autojs/workground/WrapContentGridLayoutManger.java @@ -1,10 +1,9 @@ package org.autojs.autojs.workground; import android.content.Context; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; -import android.util.Log; import com.tencent.bugly.crashreport.BuglyLog; diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index fdcfda3f..e5fb4498 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -1,5 +1,5 @@ - - @@ -27,7 +27,7 @@ app:popupTheme="@style/AppTheme.PopupOverlay" app:title="@string/text_about"/> - + - + diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml index 7af0c83a..824a7586 100644 --- a/app/src/main/res/layout/activity_build.xml +++ b/app/src/main/res/layout/activity_build.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:theme="@style/ToolBarStyle"/> - + - - - + - - + - + - - @@ -151,9 +151,9 @@ android:id="@+id/app_name" android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - - + - - + - - + - + diff --git a/app/src/main/res/layout/activity_documentation.xml b/app/src/main/res/layout/activity_documentation.xml index 9052b6e0..8b855b4a 100644 --- a/app/src/main/res/layout/activity_documentation.xml +++ b/app/src/main/res/layout/activity_documentation.xml @@ -6,7 +6,7 @@ android:fitsSystemWindows="true" android:orientation="vertical"> - @@ -19,7 +19,7 @@ android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay"/> - + - @@ -20,7 +20,7 @@ app:popupTheme="@style/AppTheme.PopupOverlay"> - + - @@ -19,7 +19,7 @@ android:theme="@style/ToolBarStyle" app:popupTheme="@style/AppTheme.PopupOverlay"/> - + - - + - - + - - + - + - - - - - + - - + - + diff --git a/app/src/main/res/layout/activity_project_config.xml b/app/src/main/res/layout/activity_project_config.xml index d8efde92..595913fc 100644 --- a/app/src/main/res/layout/activity_project_config.xml +++ b/app/src/main/res/layout/activity_project_config.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:theme="@style/ToolBarStyle"/> - + - - @@ -65,9 +65,9 @@ android:id="@+id/app_name" android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - - + - - + - - + - @@ -158,13 +158,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="number"/> - + - + - - @@ -198,7 +198,7 @@ android:layout_height="wrap_content" android:text="@string/default_main_file_name"/> - + - + diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index df99b8c5..f1f975d9 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + - - + - - + - - + diff --git a/app/src/main/res/layout/activity_script_widget_settings.xml b/app/src/main/res/layout/activity_script_widget_settings.xml index 4c43c0f1..d2e55e0e 100644 --- a/app/src/main/res/layout/activity_script_widget_settings.xml +++ b/app/src/main/res/layout/activity_script_widget_settings.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - @@ -20,7 +20,7 @@ android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay"/> - + - - + - diff --git a/app/src/main/res/layout/activity_tasker_edit.xml b/app/src/main/res/layout/activity_tasker_edit.xml index 496a4b28..a4ba7b13 100644 --- a/app/src/main/res/layout/activity_tasker_edit.xml +++ b/app/src/main/res/layout/activity_tasker_edit.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - @@ -19,7 +19,7 @@ android:theme="@style/ToolBarStyle" app:popupTheme="@style/AppTheme.PopupOverlay"/> - + - - - + @@ -432,7 +432,7 @@ - + diff --git a/app/src/main/res/layout/activity_view_sample.xml b/app/src/main/res/layout/activity_view_sample.xml index 574fb643..ce9f3ab3 100644 --- a/app/src/main/res/layout/activity_view_sample.xml +++ b/app/src/main/res/layout/activity_view_sample.xml @@ -8,7 +8,7 @@ android:orientation="vertical" tools:context="org.autojs.autojs.ui.edit.EditActivity"> - @@ -50,7 +50,7 @@ - + - - + - @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - @@ -76,7 +76,7 @@ - - - - + - - + @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + @@ -153,4 +153,4 @@ - + diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml index af08b9a0..b73b6f4f 100644 --- a/app/src/main/res/layout/air_card_report_compat.xml +++ b/app/src/main/res/layout/air_card_report_compat.xml @@ -22,7 +22,7 @@ ~ SOFTWARE. --> - - - + - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/bubble_popup_menu.xml b/app/src/main/res/layout/bubble_popup_menu.xml index 55d605ca..d104cdd4 100644 --- a/app/src/main/res/layout/bubble_popup_menu.xml +++ b/app/src/main/res/layout/bubble_popup_menu.xml @@ -13,11 +13,11 @@ android:layout_gravity="center_horizontal" android:background="@drawable/little_triangle"/> - + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/> \ No newline at end of file diff --git a/app/src/main/res/layout/debug_bar.xml b/app/src/main/res/layout/debug_bar.xml index 66b9f8f1..26fa2ab9 100644 --- a/app/src/main/res/layout/debug_bar.xml +++ b/app/src/main/res/layout/debug_bar.xml @@ -46,7 +46,7 @@ android:tint="@android:color/white"/> - diff --git a/app/src/main/res/layout/dialog_class_search.xml b/app/src/main/res/layout/dialog_class_search.xml index 77c10bd5..ca4617e7 100644 --- a/app/src/main/res/layout/dialog_class_search.xml +++ b/app/src/main/res/layout/dialog_class_search.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - @@ -13,13 +13,13 @@ android:id="@+id/keywords" android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - diff --git a/app/src/main/res/layout/dialog_code_generate.xml b/app/src/main/res/layout/dialog_code_generate.xml index 0e77b3ae..ed932412 100644 --- a/app/src/main/res/layout/dialog_code_generate.xml +++ b/app/src/main/res/layout/dialog_code_generate.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/dialog_find_or_replace.xml b/app/src/main/res/layout/dialog_find_or_replace.xml index 2cc2841b..bc922df2 100644 --- a/app/src/main/res/layout/dialog_find_or_replace.xml +++ b/app/src/main/res/layout/dialog_find_or_replace.xml @@ -8,7 +8,7 @@ android:paddingRight="16dp" android:paddingTop="16dp"> - @@ -17,7 +17,7 @@ android:id="@+id/keywords" android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - @@ -34,7 +34,7 @@ android:id="@+id/replacement" android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - @@ -21,7 +21,7 @@ android:text="0" tools:ignore="HardcodedText"/> - + - @@ -45,9 +45,9 @@ android:text="1.0" tools:ignore="HardcodedText"/> - + - @@ -60,7 +60,7 @@ android:text="0.0" tools:ignore="HardcodedText"/> - + - - @@ -29,10 +29,10 @@ - + - @@ -103,6 +103,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="start"/> - + \ No newline at end of file diff --git a/app/src/main/res/layout/explorer_view.xml b/app/src/main/res/layout/explorer_view.xml index d0164e3c..6ddd6496 100644 --- a/app/src/main/res/layout/explorer_view.xml +++ b/app/src/main/res/layout/explorer_view.xml @@ -18,7 +18,7 @@ app:cardUseCompatPadding="true" android:layout_height="wrap_content"/> - diff --git a/app/src/main/res/layout/file_choose_list_directory.xml b/app/src/main/res/layout/file_choose_list_directory.xml index 0d3a9855..084abeb3 100644 --- a/app/src/main/res/layout/file_choose_list_directory.xml +++ b/app/src/main/res/layout/file_choose_list_directory.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/floating_manual_dialog.xml b/app/src/main/res/layout/floating_manual_dialog.xml index bd2fd1aa..3c05a15e 100644 --- a/app/src/main/res/layout/floating_manual_dialog.xml +++ b/app/src/main/res/layout/floating_manual_dialog.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_drawer.xml b/app/src/main/res/layout/fragment_drawer.xml index 36c2a51d..98d0f186 100644 --- a/app/src/main/res/layout/fragment_drawer.xml +++ b/app/src/main/res/layout/fragment_drawer.xml @@ -62,7 +62,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - diff --git a/app/src/main/res/layout/option_list_view.xml b/app/src/main/res/layout/option_list_view.xml index d4a9ee69..9db02643 100644 --- a/app/src/main/res/layout/option_list_view.xml +++ b/app/src/main/res/layout/option_list_view.xml @@ -19,7 +19,7 @@ tools:text="标题" tools:visibility="visible"/> - diff --git a/app/src/main/res/layout/script_file_list_directory.xml b/app/src/main/res/layout/script_file_list_directory.xml index 2a61d0d2..8640d038 100644 --- a/app/src/main/res/layout/script_file_list_directory.xml +++ b/app/src/main/res/layout/script_file_list_directory.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/shortcut_create_dialog.xml b/app/src/main/res/layout/shortcut_create_dialog.xml index 0618c0e1..e0fa1093 100644 --- a/app/src/main/res/layout/shortcut_create_dialog.xml +++ b/app/src/main/res/layout/shortcut_create_dialog.xml @@ -20,7 +20,7 @@ android:padding="12dp" android:src="@drawable/ic_add_white_48dp"/> - - + \ No newline at end of file diff --git a/autojs/build.gradle b/autojs/build.gradle index 083d7d54..58a0a2b9 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -12,7 +12,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -37,7 +37,7 @@ 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' @@ -47,7 +47,7 @@ dependencies { api('com.afollestad.material-dialogs:core:0.9.2.3', { exclude group: 'com.android.support' }) - api 'com.android.support:design:28.0.0' + api 'com.google.android.material:material:1.1.0-alpha01' api 'com.github.hyb1996:EnhancedFloaty:0.31' api 'com.github.hyb1996:OpenCvLib:2.4.13.4-imgproc' api 'com.makeramen:roundedimageview:2.3.0' diff --git a/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java b/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java index 4ad83ee2..dc8efbed 100644 --- a/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java +++ b/autojs/src/androidTest/java/com/stardust/autojs/ExampleInstrumentedTest.java @@ -1,22 +1,11 @@ package com.stardust.autojs; -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import java.io.File; -import java.io.IOException; - -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - import static org.junit.Assert.assertEquals; /** diff --git a/autojs/src/main/java/com/stardust/autojs/AutoJs.java b/autojs/src/main/java/com/stardust/autojs/AutoJs.java index 8ccab8ad..707eeaed 100644 --- a/autojs/src/main/java/com/stardust/autojs/AutoJs.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java b/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java index 19d0976e..5e6b691d 100644 --- a/autojs/src/main/java/com/stardust/autojs/ScriptEngineService.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java index efbe5dfa..2b00d410 100644 --- a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java index d449de40..bd3b2ec5 100644 --- a/autojs/src/main/java/com/stardust/autojs/codegeneration/ReadOnlyUiObject.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java index 4e59b109..abb61d7d 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/AccessibilityBridge.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java index a2b8c7d2..65c7c0e0 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/SimpleActionAutomator.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java index e6e4ea33..12aac731 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java +++ b/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. diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java index 54921452..9460619d 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleFloaty.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java index fe754359..65537a69 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleImpl.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java b/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java index 1ebb42f1..f4c9bb90 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/console/ConsoleView.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java b/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java index bab2b15c..4b23a60f 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/console/NoOpConsole.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java b/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java index e1c5d7f7..926aab58 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/eventloop/EventEmitter.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java b/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java index d527b6d6..b27b7503 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/floaty/BaseResizableFloatyWindow.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java b/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java index f135315b..f799a338 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java b/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java index dfb364b2..cbba493c 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/ColorFinder.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java b/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java index 7e66be4e..911476f3 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/Colors.java +++ b/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. diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java b/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java index f807723c..358d9771 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/ImageWrapper.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java index 103039bd..453e7dbd 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequestActivity.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java index d88d5fd9..0e276a43 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCaptureRequester.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java b/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java index 2be18f43..f4d60b90 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java index fecef13f..2d48a0ed 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputDevices.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java index bec3a46d..e30d4858 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/InputEventObserver.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java index 3bd30802..28aa16db 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/RootAutomator.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java index abd34349..707f55bb 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/ShellKeyObserver.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java b/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java index a7bd64b3..95a59426 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/inputevent/TouchObserver.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java b/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java index 4d453e31..61dbc7e7 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/looper/TimerThread.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java b/autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java index 80966232..05afece4 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/opencv/OpenCVHelper.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java b/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java index 20e79ec0..7a0f386f 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/permission/OnRequestPermissionsResultCallback.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java index 8e964178..56b3b77c 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestActivity.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java b/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java index 26ab78ff..d5fcce80 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/permission/PermissionRequestProxyActivity.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java b/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java index 6783dc41..dac73078 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/permission/Permissions.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java b/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java index cb8d18fa..cf11f92f 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/permission/RequestPermissionCallbacks.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java index e94c3d06..b93bb4e2 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventRecorder.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java index 1b81445d..d04c74e1 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToAutoFileRecorder.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java index 30fba9b0..ab45ae84 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToRootAutomatorRecorder.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java b/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java index 50e0bfb0..e62ca55c 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/record/inputevent/InputEventToSendEventJsRecorder.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java b/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java index d726db7d..b58b2172 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/JsViewHelper.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java index e04582ad..ffb4a1ac 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/AppbarAttributes.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java index 15d1b4e6..e8f622ca 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/CardAttributes.java +++ b/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) { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java index 5f1786ea..f015a985 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/FabViewAttributes.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java index 180f551b..292b1464 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ImageViewAttributes.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java index c2b17b9b..a3579668 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributes.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java b/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java index 25657256..c1db5335 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/attribute/ViewAttributesFactory.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java index 39e4d8d1..09156c02 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/BlockedMaterialDialog.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java index 15b94c4d..cbbcf64a 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialog.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java b/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java index 17d6fde0..e089536f 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/dialog/JsDialogBuilder.java +++ b/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. */ diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java index 299a13fb..37c0b4fb 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/DynamicLayoutInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java index 2e87e80d..e7abd6c8 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/ViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java index 279a5c82..ec1cbe58 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/AppBarInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java index 67bc354e..a4a24cdc 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/BaseViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java index 5fe1a47b..1c5309b7 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/CanvasViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java index b03f73f1..e09b8ca8 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/DatePickerInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java index 4ce3e610..6136d65e 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsGridViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java index 8fda1810..9e0a4e80 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsImageViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java index d4a12ad4..fab6ee1b 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/JsListViewInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java index 8c3a2a4a..bf6c486f 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/SpinnerInflater.java +++ b/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; /** diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java index cbb3d309..4b966dcb 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TabLayoutInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java index 1737f641..a6702c2b 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/TimePickerInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java b/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java index edb2d0e7..6ceccd4d 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/inflater/inflaters/ToolbarInflater.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java b/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java index 3d2ded89..fbd102b6 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/nativeview/ViewPrototype.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java index 89a1a8f5..126eec6d 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsButton.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java index a4e8bfb3..9c050659 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsEditText.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java index a72f141c..3cad32db 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsFrameLayout.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java index 48162f06..d4e5ebd4 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsGridView.java +++ b/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) { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java index 14e5603a..97b56860 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsImageView.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java index 04fc4ee9..1ec5ec79 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsLinearLayout.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java index 9bf3013a..0e849373 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsListView.java +++ b/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. */ diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java index e8335c18..703c3f6c 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsRelativeLayout.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java index 8649d7f4..ea77c62a 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsSpinner.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java index 9ae92acd..88f7aef3 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTabLayout.java +++ b/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 { diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java index 77ff12ac..9341b1d8 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextView.java +++ b/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. diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java index 5c9fe28d..95304c6e 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsToolbar.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java index 748a84ca..04fa1793 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsViewPager.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java index 510a2b0d..f629fa04 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsWebView.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java index 7b4f2efd..a39de109 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java index 957d4c69..0754d7e9 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/JavaScriptEngine.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java index 31ed06ac..ec26ea84 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngine.java +++ b/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; /** diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java index 34eedf72..f374f5de 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineFactory.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java b/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java index 91507838..6b89fc9f 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/ScriptEngineManager.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java b/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java index c8564e93..94d18b67 100644 --- a/autojs/src/main/java/com/stardust/autojs/engine/preprocess/MultiLinePreprocessor.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java b/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java index ccc5e862..93d29cf1 100644 --- a/autojs/src/main/java/com/stardust/autojs/execution/ScriptExecuteActivity.java +++ b/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. */ diff --git a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java b/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java index a2ac8061..3ec661dd 100644 --- a/autojs/src/main/java/com/stardust/autojs/project/ProjectConfig.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java b/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java index c56c0d08..b3ec0809 100644 --- a/autojs/src/main/java/com/stardust/autojs/rhino/RhinoAndroidHelper.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java b/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java index 05d3dcae..32b39bd4 100644 --- a/autojs/src/main/java/com/stardust/autojs/rhino/debug/Debugger.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java index 40a764b8..7ef7bb9e 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractConsole.java +++ b/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. */ diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java index f0b51ed9..b8c82982 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AppUtils.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java index 3a1c5fe1..bce8a902 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Console.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java index 5d9e58d9..bf2608f4 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Device.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java index a618f45e..9eb0177d 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Events.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java index 2b0ebb07..672d303b 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java index e011e6f4..f8075300 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Sensors.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java index 4b58d07a..23a04d54 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Threads.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java index 53e3b4ee..be8f6f01 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/UI.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java index 9459a131..82edcf49 100644 --- a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptFileSource.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java index 665ad06e..0dafcf1d 100644 --- a/autojs/src/main/java/com/stardust/autojs/script/JavaScriptSource.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java index fa37db35..f555d0bf 100644 --- a/autojs/src/main/java/com/stardust/autojs/script/SequenceScriptSource.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java b/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java index c8b672d5..f8b55778 100644 --- a/autojs/src/main/java/com/stardust/autojs/script/StringScriptSource.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java b/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java index d09ebd39..c4a4a33f 100644 --- a/autojs/src/main/java/com/stardust/autojs/util/FloatingPermission.java +++ b/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; diff --git a/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java b/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java index ffd19b4c..02bed10e 100644 --- a/autojs/src/main/java/com/stardust/autojs/workground/WrapContentLinearLayoutManager.java +++ b/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 diff --git a/autojs/src/main/res/layout/console_view.xml b/autojs/src/main/res/layout/console_view.xml index 1b497f74..9eb69f96 100644 --- a/autojs/src/main/res/layout/console_view.xml +++ b/autojs/src/main/res/layout/console_view.xml @@ -6,7 +6,7 @@ android:animateLayoutChanges="true" android:orientation="vertical"> - - - \ No newline at end of file + \ No newline at end of file diff --git a/automator/build.gradle b/automator/build.gradle index 1737e4be..bbc0f88f 100644 --- a/automator/build.gradle +++ b/automator/build.gradle @@ -12,7 +12,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { @@ -35,10 +35,10 @@ 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' - api 'com.android.support:appcompat-v7:28.0.0' + api 'androidx.appcompat:appcompat:1.0.2' api project(path: ':common') } diff --git a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt index dd807aff..79685976 100644 --- a/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt +++ b/automator/src/main/java/com/stardust/automator/GlobalActionAutomator.kt @@ -6,7 +6,7 @@ import android.graphics.Path import android.os.Build import android.os.Handler import android.os.Looper -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.view.ViewConfiguration import com.stardust.concurrent.VolatileBox diff --git a/automator/src/main/java/com/stardust/automator/UiObject.kt b/automator/src/main/java/com/stardust/automator/UiObject.kt index 661af33d..e5668710 100644 --- a/automator/src/main/java/com/stardust/automator/UiObject.kt +++ b/automator/src/main/java/com/stardust/automator/UiObject.kt @@ -1,27 +1,25 @@ package com.stardust.automator import android.graphics.Rect -import android.os.Build import android.os.Bundle -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat import android.util.Log import android.view.accessibility.AccessibilityNodeInfo import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator import com.stardust.view.accessibility.AccessibilityNodeInfoHelper -import com.stardust.view.accessibility.AccessibilityService import java.util.ArrayList import java.util.Arrays -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN /** * Created by Stardust on 2017/3/9. diff --git a/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt b/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt index 1356a3eb..712cccfa 100644 --- a/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt +++ b/automator/src/main/java/com/stardust/automator/UiObjectCollection.kt @@ -7,37 +7,37 @@ import com.stardust.util.Consumer import java.util.ArrayList import java.util.Collections -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_ROW_INT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_END_INT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SELECTION_START_INT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_ACCESSIBILITY_FOCUS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLEAR_FOCUS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CLICK +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COLLAPSE +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_COPY +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_CUT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_DISMISS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_EXPAND +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_FOCUS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_LONG_CLICK +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_PASTE +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_BACKWARD +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SCROLL_FORWARD +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SELECT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_SELECTION +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_SET_TEXT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_CONTEXT_CLICK +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_DOWN +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_LEFT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_RIGHT +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_TO_POSITION +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SCROLL_UP +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SET_PROGRESS +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat.ACTION_SHOW_ON_SCREEN /** * Created by Stardust on 2017/3/9. diff --git a/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt b/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt index bbfe477c..23031ada 100644 --- a/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt +++ b/automator/src/main/java/com/stardust/automator/filter/BooleanFilter.kt @@ -1,7 +1,7 @@ package com.stardust.automator.filter import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import com.stardust.automator.UiObject diff --git a/automator/src/main/java/com/stardust/automator/filter/DfsFilter.kt b/automator/src/main/java/com/stardust/automator/filter/DfsFilter.kt index c7b881c2..60ecf8d6 100644 --- a/automator/src/main/java/com/stardust/automator/filter/DfsFilter.kt +++ b/automator/src/main/java/com/stardust/automator/filter/DfsFilter.kt @@ -8,7 +8,7 @@ import java.util.ArrayList * Created by Stardust on 2017/3/9. */ -abstract class DfsFilter : ListFilter, Filter { +abstract class DfsFilter : ListFilter(), Filter { override fun filter(nodes: List): List { val list = ArrayList() diff --git a/automator/src/main/java/com/stardust/automator/filter/ListFilter.kt b/automator/src/main/java/com/stardust/automator/filter/ListFilter.kt index dfd6a5a0..3e8fe541 100644 --- a/automator/src/main/java/com/stardust/automator/filter/ListFilter.kt +++ b/automator/src/main/java/com/stardust/automator/filter/ListFilter.kt @@ -8,16 +8,21 @@ import java.util.ArrayList * Created by Stardust on 2017/3/9. */ -interface ListFilter { +abstract class ListFilter { - fun filter(nodes: List): List + var maxCount: Int = Integer.MAX_VALUE - abstract class Default : Filter, ListFilter { + abstract fun filter(nodes: List): List + + abstract class Default : Filter, ListFilter() { override fun filter(nodes: List): List { val list = ArrayList() for (node in nodes) { list.addAll(filter(node)) + if (list.size > maxCount) { + break + } } return list } diff --git a/automator/src/main/java/com/stardust/automator/filter/TextFilter.kt b/automator/src/main/java/com/stardust/automator/filter/TextFilter.kt index 3d17f4f4..f0016e6a 100644 --- a/automator/src/main/java/com/stardust/automator/filter/TextFilter.kt +++ b/automator/src/main/java/com/stardust/automator/filter/TextFilter.kt @@ -8,7 +8,6 @@ import com.stardust.automator.UiObject class TextFilter private constructor(private val mText: String) : ListFilter.Default() { - override fun filter(node: UiObject): List { return node.findByText(mText) } diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt b/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt index aa2fc185..0135866a 100644 --- a/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt +++ b/automator/src/main/java/com/stardust/automator/simple_action/ActionFactory.kt @@ -3,7 +3,7 @@ package com.stardust.automator.simple_action import android.graphics.Rect import android.os.Build import android.os.Bundle -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.view.accessibility.AccessibilityNodeInfo import com.stardust.automator.UiObject diff --git a/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt b/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt index 698a438d..89a7b72b 100644 --- a/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt +++ b/automator/src/main/java/com/stardust/automator/simple_action/ActionTarget.kt @@ -2,7 +2,7 @@ package com.stardust.automator.simple_action import android.graphics.Rect import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi /** * Created by Stardust on 2017/1/27. diff --git a/automator/src/main/java/com/stardust/notification/Notification.kt b/automator/src/main/java/com/stardust/notification/Notification.kt index 901b9c36..ab91ef5f 100644 --- a/automator/src/main/java/com/stardust/notification/Notification.kt +++ b/automator/src/main/java/com/stardust/notification/Notification.kt @@ -3,7 +3,7 @@ package com.stardust.notification import android.app.PendingIntent import android.os.Build import android.os.Parcel -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi /** * Created by Stardust on 2017/10/30. diff --git a/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt b/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt index f5da80cb..103b86cd 100644 --- a/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt +++ b/automator/src/main/java/com/stardust/notification/NotificationListenerService.kt @@ -4,7 +4,7 @@ import android.app.Notification import android.os.Build import android.os.Parcel import android.service.notification.StatusBarNotification -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import com.stardust.view.accessibility.NotificationListener import java.util.concurrent.CopyOnWriteArrayList diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt index 7d057315..fa3ede4f 100644 --- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt +++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoAllocator.kt @@ -1,8 +1,8 @@ package com.stardust.view.accessibility import android.os.Build -import android.support.annotation.RequiresApi -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat +import androidx.annotation.RequiresApi +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat import android.util.Log import android.view.accessibility.AccessibilityNodeInfo diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt index 01efdb71..f1a05900 100644 --- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt +++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityNodeInfoHelper.kt @@ -1,7 +1,7 @@ package com.stardust.view.accessibility import android.graphics.Rect -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat import android.view.accessibility.AccessibilityNodeInfo import com.stardust.automator.UiObject diff --git a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt index 81b502a2..66a08dc8 100644 --- a/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt +++ b/automator/src/main/java/com/stardust/view/accessibility/LayoutInspector.kt @@ -2,7 +2,7 @@ package com.stardust.view.accessibility import android.content.Context import android.os.Build -import android.support.annotation.RequiresApi +import androidx.annotation.RequiresApi import android.util.Log import android.view.accessibility.AccessibilityNodeInfo @@ -82,6 +82,6 @@ class LayoutInspector(private val mContext: Context) { companion object { - private val LOG_TAG = LayoutInspector::class.java!!.getSimpleName() + private val LOG_TAG = LayoutInspector::class.java.simpleName } } diff --git a/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt b/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt index a5b102e7..bdc16d7f 100644 --- a/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt +++ b/automator/src/main/java/com/stardust/view/accessibility/NodeInfo.kt @@ -4,7 +4,7 @@ import android.content.Context import android.content.pm.PackageManager import android.content.res.Resources import android.graphics.Rect -import android.support.annotation.Keep +import androidx.annotation.Keep import android.view.accessibility.AccessibilityNodeInfo import com.stardust.automator.UiObject diff --git a/build.gradle b/build.gradle index 77df33c4..a50fb89e 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc2' } } diff --git a/common/build.gradle b/common/build.gradle index 8d6b7ce2..0ee577bd 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -12,7 +12,7 @@ android { versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -25,11 +25,11 @@ android { } 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' api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - api 'com.android.support:support-annotations:28.0.0' + api 'androidx.annotation:annotation:1.0.0' api 'com.github.hyb1996:settingscompat:1.1.5' } diff --git a/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java b/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java index 46520167..d8c922db 100644 --- a/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java +++ b/common/src/androidTest/java/com/stardust/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.stardust; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/common/src/main/java/com/stardust/app/Fragment.java b/common/src/main/java/com/stardust/app/Fragment.java index 265ad096..d6adbe22 100644 --- a/common/src/main/java/com/stardust/app/Fragment.java +++ b/common/src/main/java/com/stardust/app/Fragment.java @@ -1,8 +1,8 @@ package com.stardust.app; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,7 +13,7 @@ import com.stardust.util.ViewUtil; * Created by Stardust on 2017/1/30. */ -public abstract class Fragment extends android.support.v4.app.Fragment { +public abstract class Fragment extends androidx.fragment.app.Fragment { private View mView; diff --git a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java index 7e830be5..68412685 100644 --- a/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java +++ b/common/src/main/java/com/stardust/app/FragmentPagerAdapterBuilder.java @@ -1,9 +1,9 @@ package com.stardust.app; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/common/src/main/java/com/stardust/app/GlobalAppContext.java b/common/src/main/java/com/stardust/app/GlobalAppContext.java index 3e99d8e3..4b5391a8 100644 --- a/common/src/main/java/com/stardust/app/GlobalAppContext.java +++ b/common/src/main/java/com/stardust/app/GlobalAppContext.java @@ -6,7 +6,7 @@ import android.content.Context; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.widget.Toast; /** diff --git a/common/src/main/java/com/stardust/app/MenuUtils.java b/common/src/main/java/com/stardust/app/MenuUtils.java index a4f9a918..6b590a53 100644 --- a/common/src/main/java/com/stardust/app/MenuUtils.java +++ b/common/src/main/java/com/stardust/app/MenuUtils.java @@ -1,7 +1,7 @@ package com.stardust.app; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.core.graphics.drawable.DrawableCompat; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; diff --git a/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java b/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java index 03f49ee1..a8017895 100644 --- a/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java +++ b/common/src/main/java/com/stardust/app/OnActivityResultDelegate.java @@ -1,7 +1,7 @@ package com.stardust.app; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.SparseArray; import java.util.ArrayList; diff --git a/common/src/main/java/com/stardust/io/EFile.java b/common/src/main/java/com/stardust/io/EFile.java index 8331bcf2..83f85a65 100644 --- a/common/src/main/java/com/stardust/io/EFile.java +++ b/common/src/main/java/com/stardust/io/EFile.java @@ -1,6 +1,6 @@ package com.stardust.io; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.File; import java.net.URI; diff --git a/common/src/main/java/com/stardust/pio/PFile.java b/common/src/main/java/com/stardust/pio/PFile.java index 38784e3f..97d6feab 100644 --- a/common/src/main/java/com/stardust/pio/PFile.java +++ b/common/src/main/java/com/stardust/pio/PFile.java @@ -1,8 +1,7 @@ package com.stardust.pio; -import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.File; import java.io.FileFilter; diff --git a/common/src/main/java/com/stardust/util/BiMaps.java b/common/src/main/java/com/stardust/util/BiMaps.java index 0c4fb29c..c78b2f28 100644 --- a/common/src/main/java/com/stardust/util/BiMaps.java +++ b/common/src/main/java/com/stardust/util/BiMaps.java @@ -1,8 +1,8 @@ package com.stardust.util; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import java.util.Collection; import java.util.HashMap; diff --git a/common/src/main/java/com/stardust/util/ClipboardUtil.java b/common/src/main/java/com/stardust/util/ClipboardUtil.java index 751ab56e..2053b3dc 100644 --- a/common/src/main/java/com/stardust/util/ClipboardUtil.java +++ b/common/src/main/java/com/stardust/util/ClipboardUtil.java @@ -3,8 +3,8 @@ package com.stardust.util; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.content.Intent; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; /** diff --git a/common/src/main/java/com/stardust/util/Consumer.java b/common/src/main/java/com/stardust/util/Consumer.java index 590d7244..2a31f183 100644 --- a/common/src/main/java/com/stardust/util/Consumer.java +++ b/common/src/main/java/com/stardust/util/Consumer.java @@ -1,6 +1,6 @@ package com.stardust.util; -import android.support.annotation.Keep; +import androidx.annotation.Keep; /** * Created by Stardust on 2017/3/10. diff --git a/common/src/main/java/com/stardust/util/DeveloperUtils.java b/common/src/main/java/com/stardust/util/DeveloperUtils.java index 206c188b..7f01fd34 100644 --- a/common/src/main/java/com/stardust/util/DeveloperUtils.java +++ b/common/src/main/java/com/stardust/util/DeveloperUtils.java @@ -9,18 +9,13 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.content.pm.Signature; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Base64; -import android.util.Log; - -import com.stardust.R; import java.io.IOException; import java.lang.ref.WeakReference; -import java.lang.reflect.Method; import java.security.MessageDigest; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/common/src/main/java/com/stardust/util/DrawerAutoClose.java b/common/src/main/java/com/stardust/util/DrawerAutoClose.java index df13b073..272aca56 100644 --- a/common/src/main/java/com/stardust/util/DrawerAutoClose.java +++ b/common/src/main/java/com/stardust/util/DrawerAutoClose.java @@ -1,9 +1,7 @@ package com.stardust.util; import android.app.Activity; -import android.support.v4.widget.DrawerLayout; - -import com.stardust.util.BackPressedHandler; +import androidx.drawerlayout.widget.DrawerLayout; /** * Created by Stardust on 2017/6/19. diff --git a/common/src/main/java/com/stardust/util/IntentUtil.java b/common/src/main/java/com/stardust/util/IntentUtil.java index 8b50def8..100038b2 100644 --- a/common/src/main/java/com/stardust/util/IntentUtil.java +++ b/common/src/main/java/com/stardust/util/IntentUtil.java @@ -4,8 +4,8 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.Nullable; -import android.support.v4.content.FileProvider; +import androidx.annotation.Nullable; +import androidx.core.content.FileProvider; import android.widget.Toast; import com.stardust.R; diff --git a/common/src/main/java/com/stardust/util/MimeTypes.java b/common/src/main/java/com/stardust/util/MimeTypes.java index ac8e3020..debc77ef 100644 --- a/common/src/main/java/com/stardust/util/MimeTypes.java +++ b/common/src/main/java/com/stardust/util/MimeTypes.java @@ -1,7 +1,7 @@ package com.stardust.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.webkit.MimeTypeMap; import static com.stardust.pio.PFiles.getExtension; diff --git a/common/src/main/java/com/stardust/util/SparseArrayEntries.java b/common/src/main/java/com/stardust/util/SparseArrayEntries.java index 34325219..9b050217 100644 --- a/common/src/main/java/com/stardust/util/SparseArrayEntries.java +++ b/common/src/main/java/com/stardust/util/SparseArrayEntries.java @@ -1,6 +1,6 @@ package com.stardust.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.SparseArray; /** diff --git a/common/src/main/java/com/stardust/util/TextUtils.java b/common/src/main/java/com/stardust/util/TextUtils.java index c077ec87..03435990 100644 --- a/common/src/main/java/com/stardust/util/TextUtils.java +++ b/common/src/main/java/com/stardust/util/TextUtils.java @@ -1,6 +1,6 @@ package com.stardust.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by Stardust on 2017/5/3. diff --git a/common/src/main/java/com/stardust/util/ViewUtil.java b/common/src/main/java/com/stardust/util/ViewUtil.java index 6d0ca1c1..61b58b54 100644 --- a/common/src/main/java/com/stardust/util/ViewUtil.java +++ b/common/src/main/java/com/stardust/util/ViewUtil.java @@ -2,11 +2,10 @@ package com.stardust.util; import android.app.Activity; import android.content.Context; -import android.support.annotation.IdRes; +import androidx.annotation.IdRes; import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup; -import android.widget.RelativeLayout; /** * Created by Stardust on 2017/1/24. diff --git a/gradle.properties b/gradle.properties index d85e1728..3004cc89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,3 +18,5 @@ systemProp.http.proxyHost=127.0.0.1 org.gradle.jvmargs=-Xms8192m -Xmx8192m -Dfile.encoding=UTF-8 systemProp.https.proxyHost=127.0.0.1 systemProp.http.proxyPort=1080 +android.useAndroidX=true +android.enableJetifier=true diff --git a/inrt/build.gradle b/inrt/build.gradle index 49723440..fee72d65 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -12,7 +12,8 @@ android { targetSdkVersion versions.target versionCode versions.appVersionCode - 200 versionName versions.appVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + multiDexEnabled true ndk { abiFilters 'armeabi-v7a' } @@ -80,7 +81,7 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - 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' }) //Glide diff --git a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java b/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java index c4dc2fb6..3c731a82 100644 --- a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java +++ b/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package com.stardust.auojs.inrt; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/inrt/src/main/AndroidManifest.xml b/inrt/src/main/AndroidManifest.xml index 9909a633..88f80e07 100644 --- a/inrt/src/main/AndroidManifest.xml +++ b/inrt/src/main/AndroidManifest.xml @@ -67,7 +67,7 @@ diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java index 901921e9..c503298a 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java @@ -2,8 +2,8 @@ package com.stardust.auojs.inrt; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java index 195f307e..263225b3 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java @@ -2,12 +2,10 @@ package com.stardust.auojs.inrt; import android.os.Bundle; import android.preference.Preference; -import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.view.View; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; /** diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java index 620c2db6..598e4596 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java @@ -6,10 +6,10 @@ import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; import android.widget.Toast; diff --git a/inrt/src/main/res/layout/activity_main.xml b/inrt/src/main/res/layout/activity_main.xml index a5e55c8a..58c2433f 100644 --- a/inrt/src/main/res/layout/activity_main.xml +++ b/inrt/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ android:orientation="vertical"> - @@ -19,7 +19,7 @@ android:layout_height="wrap_content" app:popupTheme="@style/AppTheme.PopupOverlay"/> - + - @@ -19,7 +19,7 @@ android:layout_height="wrap_content" app:popupTheme="@style/AppTheme.PopupOverlay"/> - +