重构 使用AndroidX代替android.support库

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
package com.stardust.util;
import android.support.annotation.Keep;
import androidx.annotation.Keep;
/**
* Created by Stardust on 2017/3/10.

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
package com.stardust.util;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.SparseArray;
/**

View File

@@ -1,6 +1,6 @@
package com.stardust.util;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* Created by Stardust on 2017/5/3.

View File

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