tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构 使用AndroidX代替android.support库

Browse Source
This commit is contained in:
hyb1996
2018-11-30 13:17:36 +08:00
parent c3c73ab94a
commit 9d30996ae8
297 changed files with 749 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
inrt/build.gradle
View File

@@ -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

4
inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java
View File

@@ -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;

2
inrt/src/main/AndroidManifest.xml
View File

@@ -67,7 +67,7 @@
</intent-filter>
</service>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="org.autojs.autojs.inrt.fileprovider"
android:exported="false"
android:grantUriPermissions="true">

4
inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java
View File

@@ -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;

8
inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.java
View File

@@ -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;
/**

8
inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.java
View File

@@ -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;

4
inrt/src/main/res/layout/activity_main.xml
View File

@@ -8,7 +8,7 @@
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<com.stardust.autojs.core.console.ConsoleView
android:id="@+id/console"

4
inrt/src/main/res/layout/activity_settings.xml
View File

@@ -8,7 +8,7 @@
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_setting"