diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java b/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
index 9cbf4e06fd..91b336abcf 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
@@ -7,8 +7,8 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import java.lang.reflect.InvocationTargetException;
diff --git a/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt b/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
index 45e67a4a0d..9eba25c622 100644
--- a/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
+++ b/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
@@ -1,6 +1,6 @@
package com.blankj.subutil.pkg.helper
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
import com.blankj.subutil.pkg.R
import com.blankj.utilcode.util.ActivityUtils
import com.blankj.utilcode.util.PermissionUtils
diff --git a/utilcode/lib/build.gradle b/utilcode/lib/build.gradle
index 3570124816..41b0dacaa4 100644
--- a/utilcode/lib/build.gradle
+++ b/utilcode/lib/build.gradle
@@ -1,7 +1,7 @@
apply {
from "${rootDir.path}/config_lib.gradle"
- plugin "tech.harmonysoft.oss.traute"
+// plugin "tech.harmonysoft.oss.traute"
plugin "com.github.dcendents.android-maven"
plugin "com.jfrog.bintray"
plugin "readme-core"
@@ -17,10 +17,10 @@ apply from: "${rootDir.path}/gradle/bintrayUploadAndroid.gradle"
dependencies {
compile dep.gson
- compileOnly dep.support.appcompat_v7
- compileOnly dep.support.design
+ compileOnly dep.appcompat
+ compileOnly dep.design
testImplementation dep.junit
testImplementation dep.robolectric
- testImplementation dep.support.appcompat_v7
+ testImplementation dep.appcompat
}
\ No newline at end of file
diff --git a/utilcode/lib/project.properties b/utilcode/lib/project.properties
index 22ae3b8603..d0f2a3f7e0 100644
--- a/utilcode/lib/project.properties
+++ b/utilcode/lib/project.properties
@@ -1,7 +1,7 @@
#project
project.name=UtilCode
project.groupId=com.blankj
-project.artifactId=utilcode
+project.artifactId=utilcodex
project.packaging=aar
project.siteUrl=https://github.com/Blankj/AndroidUtilCode
project.gitUrl=https://github.com/Blankj/AndroidUtilCode.git
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
index b68bfcb113..5c05c0163e 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
index 76f7e9a217..6db826e4ab 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
@@ -4,7 +4,7 @@
import android.Manifest.permission;
import android.annotation.SuppressLint;
import android.os.Build;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
index 9932037bf8..45090576e3 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
index 4b8a9a07b5..9dd16d6e48 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -10,15 +10,16 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.util.Pair;
import android.util.Log;
import android.view.View;
import java.util.List;
+import androidx.annotation.AnimRes;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
index 7e87e73474..ca9036225e 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
@@ -1,9 +1,10 @@
package com.blankj.utilcode.util;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
import android.view.View;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
/**
*
* author: blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
index 136f27b5ed..357c423fc6 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
@@ -17,8 +17,6 @@
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
import android.util.Log;
import java.io.File;
@@ -27,6 +25,9 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
index 7b5509b2b5..22178a5c20 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -8,11 +8,6 @@
import android.graphics.Color;
import android.graphics.Point;
import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
-import android.support.v4.widget.DrawerLayout;
import android.util.Log;
import android.util.TypedValue;
import android.view.Display;
@@ -27,6 +22,12 @@
import java.lang.reflect.Method;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+import androidx.drawerlayout.widget.DrawerLayout;
+
import static android.Manifest.permission.EXPAND_STATUS_BAR;
/**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
index f9344b0a59..bacc519540 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
@@ -2,11 +2,12 @@
import android.content.ContentResolver;
import android.provider.Settings;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
import android.view.Window;
import android.view.WindowManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
index bb48a4b5cf..c5a9a17a6d 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
@@ -3,13 +3,14 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
index 99aef6b078..2e6637febf 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
@@ -8,7 +8,6 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import android.util.Log;
import com.blankj.utilcode.constant.CacheConstants;
@@ -37,6 +36,8 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
index 2ef267bd01..6dbb9f7475 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
@@ -3,13 +3,14 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
index c800423c78..aca1c25837 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
@@ -3,7 +3,7 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.blankj.utilcode.constant.CacheConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
index 56abfba117..aedcfa7fc4 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
index d0e06e394d..ddaa2baed9 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
@@ -1,7 +1,7 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
-import android.support.v4.util.LruCache;
+import androidx.annotation.NonNull;
+import androidx.collection.LruCache;
import com.blankj.utilcode.constant.CacheConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
index 4c0c22232b..a6603cfc44 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
@@ -1,12 +1,12 @@
package com.blankj.utilcode.util;
import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
index 9ef930c467..a096321cf4 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
@@ -5,8 +5,8 @@
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.Log;
import java.io.BufferedWriter;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
index c1c2c3c76e..d0c1788a02 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
@@ -8,8 +8,8 @@
import android.os.Build;
import android.os.PowerManager;
import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
import android.text.TextUtils;
import java.io.File;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
index 43b8537e75..9e8ae14ef1 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
@@ -3,16 +3,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.AnimatorRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
@@ -20,6 +10,17 @@
import java.util.Collections;
import java.util.List;
+import androidx.annotation.AnimRes;
+import androidx.annotation.AnimatorRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
index 83e01eb1ad..cbee7dd4bd 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
@@ -27,13 +27,13 @@
import android.renderscript.Element;
import android.renderscript.RenderScript;
import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
import android.view.View;
import java.io.BufferedOutputStream;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
index 6faa37d043..1e26dc8a9a 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
@@ -8,8 +8,8 @@
import android.os.Bundle;
import android.provider.MediaStore;
import android.provider.Settings;
-import android.support.annotation.RequiresPermission;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.RequiresPermission;
+import androidx.core.content.FileProvider;
import java.io.File;
import java.util.ArrayList;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
index e1e2e78600..f5d814207d 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
@@ -12,10 +12,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.RequiresApi;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.RequiresApi;
+import androidx.collection.SimpleArrayMap;
import android.util.Log;
import com.google.gson.Gson;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
index 6f6cf85b80..bd4b8da935 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
@@ -8,7 +8,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
index f281d777c2..3171837f46 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
@@ -7,7 +7,7 @@
import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import android.telephony.TelephonyManager;
import android.text.format.Formatter;
import android.util.Log;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
index b8163d2e66..73a900b465 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
@@ -5,9 +5,9 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
index be5491ece0..3c0c087a39 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
@@ -1,9 +1,9 @@
package com.blankj.utilcode.util;
import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.util.LongSparseArray;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.RequiresApi;
+import androidx.collection.LongSparseArray;
+import androidx.collection.SimpleArrayMap;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
index 235a0f3f94..1cb3df0156 100755
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
@@ -10,10 +10,10 @@
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.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
import android.util.Log;
import android.view.MotionEvent;
import android.view.WindowManager;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
index 99068781a4..f407f81b5f 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
@@ -7,7 +7,7 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import android.telephony.SmsManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
index 7db75522d9..00c2bf6f73 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
@@ -10,8 +10,8 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.Log;
import java.io.BufferedReader;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
index ba57fab956..817a94149f 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
import com.blankj.utilcode.constant.RegexConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
index 92424163bb..ee41e95958 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.RawRes;
+import androidx.annotation.RawRes;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
index d3e21fb873..21274c3023 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
@@ -1,7 +1,7 @@
package com.blankj.utilcode.util;
import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.Map;
import java.util.Set;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
index 554a2ed586..a9d18a1a55 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
@@ -3,7 +3,7 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.Collections;
import java.util.HashMap;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
index c3e089a90f..f55e4a21db 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
@@ -7,12 +7,11 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.Point;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.View;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
index b164e6154e..eab1990d29 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
@@ -1,12 +1,12 @@
package com.blankj.utilcode.util;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
index 641204fd63..d79cf9262b 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
@@ -14,14 +14,14 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.text.Layout;
import android.text.Layout.Alignment;
import android.text.SpannableStringBuilder;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
index c3254e3d32..70f0defe50 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
@@ -1,8 +1,8 @@
package com.blankj.utilcode.util;
import android.content.res.Resources;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.StringRes;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
index ba7122e366..819af790e8 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
@@ -2,9 +2,6 @@
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.util.Log;
import android.util.SparseArray;
@@ -21,6 +18,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
index adaa920474..a5286b0fbe 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.blankj.utilcode.constant.TimeConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
index b4fe658945..b25360e52c 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
@@ -14,11 +14,11 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationManagerCompat;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
index 98f3ef66a8..8e4fd9d09c 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
@@ -8,12 +8,14 @@
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
+import android.text.TextUtils;
import android.util.Log;
import java.io.File;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+
/**
*
* author: Blankj
@@ -70,12 +72,19 @@ public static File uri2File(@NonNull final Uri uri) {
Log.d("UriUtils", uri.toString() + " parse failed. -> 1");
return null;
} else if ("com.android.providers.downloads.documents".equals(authority)) {
- final String id = DocumentsContract.getDocumentId(uri);
- final Uri contentUri = ContentUris.withAppendedId(
- Uri.parse("content://downloads/public_downloads"),
- Long.valueOf(id)
- );
- return getFileFromUri(contentUri, 2);
+ String id = DocumentsContract.getDocumentId(uri);
+ if (!TextUtils.isEmpty(id)) {
+ if (id.startsWith("raw:")) {
+ return new File(id.substring(4));
+ }
+ final Uri contentUri = ContentUris.withAppendedId(
+ Uri.parse(Environment.DIRECTORY_DOWNLOADS),
+ Long.valueOf(id)
+ );
+ return getFileFromUri(contentUri, 2);
+ }
+ Log.d("UriUtils", uri.toString() + " parse failed. -> 3");
+ return null;
} else if ("com.android.providers.media.documents".equals(authority)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
index 52b82376e1..d858e4ad22 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -7,7 +7,7 @@
import android.app.Application.ActivityLifecycleCallbacks;
import android.content.Context;
import android.os.Bundle;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
index a57bbb8241..622d657817 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.os.Vibrator;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import static android.Manifest.permission.VIBRATE;
diff --git a/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java b/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
index a0203f78fc..ed12c24d8d 100644
--- a/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
+++ b/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
@@ -1,7 +1,5 @@
package com.blankj.utilcode.util;
-import android.support.v4.util.LongSparseArray;
-import android.support.v4.util.SimpleArrayMap;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -12,6 +10,9 @@
import java.util.HashMap;
import java.util.LinkedList;
+import androidx.collection.LongSparseArray;
+import androidx.collection.SimpleArrayMap;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
index 5ace21f5b1..f3d3600a27 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
@@ -6,7 +6,7 @@ import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.os.Build
import android.os.Bundle
-import android.support.v4.app.ActivityOptionsCompat
+import androidx.core.app.ActivityOptionsCompat
import android.view.View
import android.view.Window
import com.blankj.lib.base.BaseTitleBarActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
index 4815032936..864f1c12b4 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
@@ -2,7 +2,7 @@ package com.blankj.utilcode.pkg.feature.activity
import android.os.Build
import android.os.Bundle
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
import android.view.View
import android.view.Window
import com.blankj.lib.base.BaseTitleBarActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
index b2633ddf5c..0dac18c72c 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
@@ -3,10 +3,10 @@ package com.blankj.utilcode.pkg.feature.bar
import android.content.Context
import android.content.Intent
import android.os.Bundle
-import android.support.design.widget.BottomNavigationView
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
-import android.support.v4.view.ViewPager
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
import android.view.View
import com.blankj.lib.base.BaseActivity
import com.blankj.utilcode.pkg.R
@@ -37,7 +37,7 @@ class BarStatusFragmentActivity : BaseActivity() {
R.id.barStatusFragmentNavigationCustom
)
- private val mFragmentList = ArrayList()
+ private val mFragmentList = ArrayList()
private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener l@{ item ->
when (item.itemId) {
@@ -78,8 +78,8 @@ class BarStatusFragmentActivity : BaseActivity() {
mFragmentList.add(BarStatusCustomFragment.newInstance())
barStatusFragmentVp.offscreenPageLimit = 3
- barStatusFragmentVp.adapter = object : FragmentPagerAdapter(supportFragmentManager) {
- override fun getItem(position: Int): Fragment {
+ barStatusFragmentVp.adapter = object : androidx.fragment.app.FragmentPagerAdapter(supportFragmentManager) {
+ override fun getItem(position: Int): androidx.fragment.app.Fragment {
return mFragmentList[position]
}
@@ -88,7 +88,7 @@ class BarStatusFragmentActivity : BaseActivity() {
}
}
- barStatusFragmentVp.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ barStatusFragmentVp.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
override fun onPageSelected(position: Int) {
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
index ca0289a158..117c7d121e 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
@@ -2,8 +2,8 @@ package com.blankj.utilcode.pkg.feature.fragment
import android.os.Build
import android.os.Bundle
-import android.support.annotation.RequiresApi
-import android.support.v4.app.Fragment
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.Fragment
import android.transition.*
import android.view.View
import com.blankj.lib.base.BaseLazyFragment
@@ -129,7 +129,7 @@ class ContainerFragment : BaseLazyFragment(), FragmentUtils.OnBackClickListener
}
}
- private fun addSharedElement(fragment: Fragment): Fragment {
+ private fun addSharedElement(fragment: androidx.fragment.app.Fragment): androidx.fragment.app.Fragment {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
fragment.sharedElementEnterTransition = DetailTransition()
fragment.enterTransition = Fade()
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
index b768f563e5..6e3137b9c6 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
@@ -4,8 +4,8 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
-import android.support.design.widget.BottomNavigationView
-import android.support.v4.app.Fragment
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import androidx.fragment.app.Fragment
import android.view.View
import com.blankj.lib.base.BaseActivity
import com.blankj.utilcode.pkg.R
@@ -30,7 +30,7 @@ class FragmentActivity : BaseActivity() {
}
}
- private val mFragments = arrayListOf()
+ private val mFragments = arrayListOf()
private var curIndex: Int = 0
private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
index 496c5a4032..636d92c030 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
@@ -6,9 +6,9 @@ import android.graphics.Bitmap
import android.graphics.Color
import android.os.Build
import android.os.Bundle
-import android.support.annotation.LayoutRes
-import android.support.annotation.StringRes
-import android.support.v7.widget.LinearLayoutManager
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.LinearLayoutManager
import android.view.View
import android.widget.ImageView
import android.widget.TextView
@@ -92,7 +92,7 @@ class ImageActivity : BaseActivity() {
}
imageRv.adapter = ImageAdapter(mList, R.layout.item_image)
- imageRv.layoutManager = LinearLayoutManager(this)
+ imageRv.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
}
override fun doBusiness() {}
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
index 4bd07d274e..34d3914fe1 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
import android.text.SpannableStringBuilder
import android.view.View
import android.view.ViewGroup
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
index f3a1a3ee02..7c5fd45308 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
@@ -5,7 +5,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.*
import android.os.Bundle
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
import android.text.Layout
import android.text.SpannableStringBuilder
import android.text.TextPaint
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
index 314ba33d59..458ecbb3fb 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
@@ -2,7 +2,7 @@ package com.blankj.utilcode.pkg.feature.toast
import android.os.Handler
import android.os.Looper
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
import android.widget.TextView
import android.widget.Toast
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
index ea6c10c24d..40055d14b9 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
import android.view.Gravity
import android.view.View
import com.blankj.lib.base.BaseTitleBarActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
index 7e6094414a..c3247b1312 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
@@ -1,6 +1,6 @@
package com.blankj.utilcode.pkg.helper
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
import android.text.method.ScrollingMovementMethod
import android.view.LayoutInflater
import android.view.View
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
index 003c6f5840..e33848b84d 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
@@ -1,5 +1,5 @@
-
@@ -42,6 +42,6 @@
android:textSize="30pt"
app:layout_constraintTop_toBottomOf="@id/adaptScreenCloseAdaptDpTv" />
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
index 0b207d97f5..07c76be55b 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
@@ -8,7 +8,7 @@
android:background="@color/white"
tools:context=".feature.adaptScreen.HeightActivity">
-
@@ -94,6 +94,6 @@
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
index 46e0f2f1a2..5a791d924f 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
@@ -8,7 +8,7 @@
android:background="@color/white"
tools:context=".feature.adaptScreen.WidthActivity">
-
@@ -147,6 +147,6 @@
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml b/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
index c5f975b58f..1a36770b58 100644
--- a/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
@@ -7,7 +7,7 @@
android:background="@color/white"
android:orientation="vertical">
-
-
-
+
+
@@ -69,5 +69,5 @@
android:text="@string/sub_util" />
-
-
+
+
diff --git a/lib/base/build.gradle b/lib/base/build.gradle
index 370036c062..67f9762d82 100644
--- a/lib/base/build.gradle
+++ b/lib/base/build.gradle
@@ -8,7 +8,7 @@ dependencies {
api gradle.ext.dep.subutil_lib
api gradle.ext.dep.support_appcompat_v7
- api gradle.ext.dep.support_design
+ api gradle.ext.dep.support_material
api gradle.ext.dep.support_multidex
api gradle.ext.dep.constraint
api gradle.ext.dep.kotlin
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseActivity.java b/lib/base/src/main/java/com/blankj/lib/base/BaseActivity.java
index caae1d45cf..0c9d8fa419 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseActivity.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseActivity.java
@@ -3,11 +3,12 @@
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.blankj.swipepanel.SwipePanel;
import com.blankj.utilcode.util.AntiShakeUtils;
import com.blankj.utilcode.util.AppUtils;
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseApplication.java b/lib/base/src/main/java/com/blankj/lib/base/BaseApplication.java
index 1e0ddc0b27..5d2eba8260 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseApplication.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseApplication.java
@@ -2,7 +2,8 @@
import android.app.Application;
import android.content.Context;
-import android.support.multidex.MultiDex;
+
+import androidx.multidex.MultiDex;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.CrashUtils;
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.java b/lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.java
index c7f7f1daea..ec3c895f6e 100755
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.java
@@ -3,17 +3,18 @@
import android.annotation.SuppressLint;
import android.content.Intent;
import android.net.Uri;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.NavigationView;
-import android.support.v4.widget.DrawerLayout;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.widget.FrameLayout;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.drawerlayout.widget.DrawerLayout;
+
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.StringUtils;
+import com.google.android.material.navigation.NavigationView;
/**
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java b/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
index 5667f3f02c..0e4e7ba5cc 100755
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
@@ -4,17 +4,18 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
import com.blankj.utilcode.util.AntiShakeUtils;
/**
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseTitleActivity.java b/lib/base/src/main/java/com/blankj/lib/base/BaseTitleActivity.java
index a40230420d..e0ed3ed10a 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseTitleActivity.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseTitleActivity.java
@@ -1,16 +1,17 @@
package com.blankj.lib.base;
import android.annotation.SuppressLint;
-import android.support.annotation.LayoutRes;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewStub;
import android.widget.FrameLayout;
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
import com.blankj.utilcode.util.BarUtils;
import com.blankj.utilcode.util.ColorUtils;
diff --git a/lib/base/src/main/java/com/blankj/lib/base/IBaseView.java b/lib/base/src/main/java/com/blankj/lib/base/IBaseView.java
index 29e8553899..b0550f126c 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/IBaseView.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/IBaseView.java
@@ -1,10 +1,11 @@
package com.blankj.lib.base;
import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
import android.view.View;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+
/**
*
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
index 11aa94e015..e69be6c6df 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
@@ -1,12 +1,13 @@
package com.blankj.lib.base.rv;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.List;
/**
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
index cdf42c7882..332c4caee0 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
@@ -1,10 +1,11 @@
package com.blankj.lib.base.rv;
-import android.support.annotation.NonNull;
import android.util.SparseArray;
import android.util.SparseIntArray;
import android.view.View;
+import androidx.annotation.NonNull;
+
/**
*
* author: blankj
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java
index ceb1c46eac..0bd892f317 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java
@@ -1,7 +1,7 @@
package com.blankj.lib.base.rv;
-import android.support.annotation.IdRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.IdRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.SparseArray;
import android.view.View;
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/RecycleViewDivider.java b/lib/base/src/main/java/com/blankj/lib/base/rv/RecycleViewDivider.java
index 3d2b90f302..dd20894e10 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/RecycleViewDivider.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/RecycleViewDivider.java
@@ -5,11 +5,11 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.LinearLayout;
diff --git a/lib/base/src/main/res/layout/activity_base_title.xml b/lib/base/src/main/res/layout/activity_base_title.xml
index b11ecf7341..986d3669b6 100644
--- a/lib/base/src/main/res/layout/activity_base_title.xml
+++ b/lib/base/src/main/res/layout/activity_base_title.xml
@@ -1,24 +1,23 @@
-
-
-
+
+
diff --git a/lib/base/src/main/res/layout/activity_base_title_stub_scroll.xml b/lib/base/src/main/res/layout/activity_base_title_stub_scroll.xml
index 96f5e09d49..bd031cfb67 100644
--- a/lib/base/src/main/res/layout/activity_base_title_stub_scroll.xml
+++ b/lib/base/src/main/res/layout/activity_base_title_stub_scroll.xml
@@ -1,5 +1,5 @@
-
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java b/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
index 9cbf4e06fd..91b336abcf 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/Utils.java
@@ -7,8 +7,8 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import java.lang.reflect.InvocationTargetException;
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java b/subutil/lib/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
index f5583397d9..2f26fb9c24 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/http/ExecutorFactory.java
@@ -2,7 +2,8 @@
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.util.concurrent.Executor;
import java.util.concurrent.LinkedBlockingQueue;
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/http/HttpUtils.java b/subutil/lib/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
index b952f318cb..bdd4174486 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/http/HttpUtils.java
@@ -1,7 +1,8 @@
package com.blankj.subutil.util.http;
import android.accounts.NetworkErrorException;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/http/Request.java b/subutil/lib/src/main/java/com/blankj/subutil/util/http/Request.java
index fe39b1299c..c6eddf9b96 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/http/Request.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/http/Request.java
@@ -1,6 +1,7 @@
package com.blankj.subutil.util.http;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/http/SSLConfig.java b/subutil/lib/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
index b8624af490..0cf43662f2 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/http/SSLConfig.java
@@ -2,7 +2,8 @@
import android.annotation.SuppressLint;
import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/subutil/pkg/build.gradle b/subutil/pkg/build.gradle
index 9fe360a5dd..881637b34a 100644
--- a/subutil/pkg/build.gradle
+++ b/subutil/pkg/build.gradle
@@ -4,5 +4,5 @@ apply {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- api project(':lib:base')
+ api gradle.ext.dep.lib_base
}
\ No newline at end of file
diff --git a/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt b/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
index 45e67a4a0d..9eba25c622 100644
--- a/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
+++ b/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt
@@ -1,6 +1,6 @@
package com.blankj.subutil.pkg.helper
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
import com.blankj.subutil.pkg.R
import com.blankj.utilcode.util.ActivityUtils
import com.blankj.utilcode.util.PermissionUtils
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
index 445f206121..0bdb622940 100644
--- a/utilcode/README-CN.md
+++ b/utilcode/README-CN.md
@@ -5,7 +5,7 @@ Gradle:
implementation 'com.blankj:utilcode:1.24.0'
// if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.23.7'
+implementation 'com.blankj:utilcodex:1.24.0'
```
diff --git a/utilcode/README.md b/utilcode/README.md
index f449736061..5a6a295b4c 100644
--- a/utilcode/README.md
+++ b/utilcode/README.md
@@ -5,7 +5,7 @@ Gradle:
implementation 'com.blankj:utilcode:1.24.0'
// if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.23.7'
+implementation 'com.blankj:utilcodex:1.24.0'
```
diff --git a/utilcode/app/build.gradle b/utilcode/app/build.gradle
index 5616386892..ea5c172cd7 100644
--- a/utilcode/app/build.gradle
+++ b/utilcode/app/build.gradle
@@ -4,5 +4,5 @@ apply {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation project(':utilcode:pkg')
+ implementation gradle.ext.dep.utilcode_pkg
}
\ No newline at end of file
diff --git a/utilcode/lib/build.gradle b/utilcode/lib/build.gradle
index e4dd3a6716..6d6c599298 100644
--- a/utilcode/lib/build.gradle
+++ b/utilcode/lib/build.gradle
@@ -18,7 +18,7 @@ dependencies {
compile gradle.ext.dep.gson
compileOnly gradle.ext.dep.support_appcompat_v7
- compileOnly gradle.ext.dep.support_design
+ compileOnly gradle.ext.dep.support_material
testImplementation gradle.ext.dep.junit
testImplementation gradle.ext.dep.robolectric
diff --git a/utilcode/lib/project.properties b/utilcode/lib/project.properties
index 22ae3b8603..d238eda740 100644
--- a/utilcode/lib/project.properties
+++ b/utilcode/lib/project.properties
@@ -1,9 +1,9 @@
#project
-project.name=UtilCode
+project.name=UtilCodeX
project.groupId=com.blankj
-project.artifactId=utilcode
+project.artifactId=utilcodex
project.packaging=aar
project.siteUrl=https://github.com/Blankj/AndroidUtilCode
project.gitUrl=https://github.com/Blankj/AndroidUtilCode.git
#javadoc
-javadoc.name=UtilCode
\ No newline at end of file
+javadoc.name=UtilCodeX
\ No newline at end of file
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
index b68bfcb113..5c05c0163e 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/MemoryConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
index 76f7e9a217..6db826e4ab 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java
@@ -4,7 +4,7 @@
import android.Manifest.permission;
import android.annotation.SuppressLint;
import android.os.Build;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
index 9932037bf8..45090576e3 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/constant/TimeConstants.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.constant;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
index d6a671e4fe..de1bfeb005 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -10,14 +10,15 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.util.Pair;
import android.util.Log;
import android.view.View;
+import androidx.annotation.AnimRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
+
import java.util.List;
/**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
index 7e87e73474..ca9036225e 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
@@ -1,9 +1,10 @@
package com.blankj.utilcode.util;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
import android.view.View;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
/**
*
* author: blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
index a9368be59f..5a9194ce66 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
@@ -17,8 +17,6 @@
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
import android.util.Log;
import java.io.File;
@@ -27,6 +25,9 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
index 7b5509b2b5..22178a5c20 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BarUtils.java
@@ -8,11 +8,6 @@
import android.graphics.Color;
import android.graphics.Point;
import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
-import android.support.v4.widget.DrawerLayout;
import android.util.Log;
import android.util.TypedValue;
import android.view.Display;
@@ -27,6 +22,12 @@
import java.lang.reflect.Method;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+import androidx.drawerlayout.widget.DrawerLayout;
+
import static android.Manifest.permission.EXPAND_STATUS_BAR;
/**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
index f9344b0a59..bacc519540 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BrightnessUtils.java
@@ -2,11 +2,12 @@
import android.content.ContentResolver;
import android.provider.Settings;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
import android.view.Window;
import android.view.WindowManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java
index f04202043e..d272c99b98 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java
@@ -16,11 +16,12 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
index bb48a4b5cf..c5a9a17a6d 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
@@ -3,13 +3,14 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
index 67e6b3fb0e..a8ae8afa5b 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
@@ -8,9 +8,10 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import android.util.Log;
+import androidx.annotation.NonNull;
+
import com.blankj.utilcode.constant.CacheConstants;
import org.json.JSONArray;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
index 2ef267bd01..6dbb9f7475 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleStaticUtils.java
@@ -3,13 +3,14 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.Serializable;
+import androidx.annotation.NonNull;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
index c800423c78..aca1c25837 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheDoubleUtils.java
@@ -3,7 +3,7 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.blankj.utilcode.constant.CacheConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
index 56abfba117..aedcfa7fc4 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryStaticUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
index d0e06e394d..ddaa2baed9 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
@@ -1,7 +1,7 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
-import android.support.v4.util.LruCache;
+import androidx.annotation.NonNull;
+import androidx.collection.LruCache;
import com.blankj.utilcode.constant.CacheConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
index 4c0c22232b..a6603cfc44 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ColorUtils.java
@@ -1,12 +1,12 @@
package com.blankj.utilcode.util;
import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
index 18b5f814a3..081dd09761 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/CrashUtils.java
@@ -5,8 +5,8 @@
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.Log;
import java.io.BufferedWriter;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
index e6b1910cfc..c641c9bdae 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
@@ -11,11 +11,12 @@
import android.os.Debug;
import android.os.PowerManager;
import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.RequiresPermission;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+
import java.io.File;
import java.net.InetAddress;
import java.net.NetworkInterface;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
index 43b8537e75..9e8ae14ef1 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
@@ -3,16 +3,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.annotation.AnimatorRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.View;
@@ -20,6 +10,17 @@
import java.util.Collections;
import java.util.List;
+import androidx.annotation.AnimRes;
+import androidx.annotation.AnimatorRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
/**
*
* author: Blankj
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
index 83e01eb1ad..cbee7dd4bd 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ImageUtils.java
@@ -27,13 +27,13 @@
import android.renderscript.Element;
import android.renderscript.RenderScript;
import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
import android.view.View;
import java.io.BufferedOutputStream;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
index 6faa37d043..1e26dc8a9a 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/IntentUtils.java
@@ -8,8 +8,8 @@
import android.os.Bundle;
import android.provider.MediaStore;
import android.provider.Settings;
-import android.support.annotation.RequiresPermission;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.RequiresPermission;
+import androidx.core.content.FileProvider;
import java.io.File;
import java.util.ArrayList;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java
index cfa568fa7c..de3eb285cc 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java
@@ -7,7 +7,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
import android.util.Log;
import android.view.View;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
@@ -16,6 +15,8 @@
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+
import java.lang.reflect.Field;
/**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
index 1372ecd40b..9a7e11cbf5 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/LogUtils.java
@@ -10,10 +10,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.RequiresApi;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.RequiresApi;
+import androidx.collection.SimpleArrayMap;
import android.util.Log;
import com.google.gson.Gson;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
index 6f6cf85b80..bd4b8da935 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
@@ -8,7 +8,7 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
index d59eb28240..24a05a26b7 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
@@ -7,13 +7,14 @@
import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.text.format.Formatter;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
+
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.InterfaceAddress;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
index b8163d2e66..73a900b465 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/NotificationUtils.java
@@ -5,9 +5,9 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
index be5491ece0..3c0c087a39 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ObjectUtils.java
@@ -1,9 +1,9 @@
package com.blankj.utilcode.util;
import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.util.LongSparseArray;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.RequiresApi;
+import androidx.collection.LongSparseArray;
+import androidx.collection.SimpleArrayMap;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
index d35cbcc620..602efcb5db 100755
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PermissionUtils.java
@@ -9,10 +9,10 @@
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.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
import android.util.Log;
import android.view.MotionEvent;
import android.view.WindowManager;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
index 99068781a4..f407f81b5f 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
@@ -7,7 +7,7 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import android.telephony.SmsManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
index adcd265f72..619b175549 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
@@ -10,8 +10,8 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.Log;
import java.util.Arrays;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
index ba57fab956..817a94149f 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/RegexUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.collection.SimpleArrayMap;
import com.blankj.utilcode.constant.RegexConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
index 81d10f08cf..3fb515c06b 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.RawRes;
+import androidx.annotation.RawRes;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
index d3e21fb873..21274c3023 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPStaticUtils.java
@@ -1,7 +1,7 @@
package com.blankj.utilcode.util;
import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.Map;
import java.util.Set;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
index 554a2ed586..a9d18a1a55 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SPUtils.java
@@ -3,7 +3,7 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.Collections;
import java.util.HashMap;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
index 7390fceed0..3245eb115c 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
@@ -10,8 +10,8 @@
import android.graphics.Point;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresPermission;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.View;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ShellUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ShellUtils.java
index b7ad2fa9d2..fc10a601ae 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ShellUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ShellUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.io.BufferedReader;
import java.io.DataOutputStream;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
index b164e6154e..eab1990d29 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
@@ -1,12 +1,12 @@
package com.blankj.utilcode.util;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
index b8d9d53aed..4d49451ec0 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/SpanUtils.java
@@ -14,14 +14,14 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.text.Layout;
import android.text.Layout.Alignment;
import android.text.SpannableStringBuilder;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
index c3254e3d32..70f0defe50 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/StringUtils.java
@@ -1,8 +1,8 @@
package com.blankj.utilcode.util;
import android.content.res.Resources;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.StringRes;
/**
*
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
index 0545a27fa0..19de94ca33 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
@@ -2,10 +2,11 @@
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
import android.util.Log;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executor;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
index adaa920474..a5286b0fbe 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
@@ -1,6 +1,6 @@
package com.blankj.utilcode.util;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.blankj.utilcode.constant.TimeConstants;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
index 150425cdba..0dd47cfa3e 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
@@ -12,11 +12,11 @@
import android.os.Build;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationManagerCompat;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
index 9ad408912a..20fdc39b81 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
@@ -8,12 +8,14 @@
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
+import android.text.TextUtils;
import android.util.Log;
import java.io.File;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+
/**
*
* author: Blankj
@@ -75,12 +77,19 @@ public static File uri2File(@NonNull final Uri uri) {
Log.d("UriUtils", uri.toString() + " parse failed. -> 1");
return null;
} else if ("com.android.providers.downloads.documents".equals(authority)) {
- final String id = DocumentsContract.getDocumentId(uri);
- final Uri contentUri = ContentUris.withAppendedId(
- Uri.parse("content://downloads/public_downloads"),
- Long.valueOf(id)
- );
- return getFileFromUri(contentUri, 2);
+ String id = DocumentsContract.getDocumentId(uri);
+ if (!TextUtils.isEmpty(id)) {
+ if (id.startsWith("raw:")) {
+ return new File(id.substring(4));
+ }
+ final Uri contentUri = ContentUris.withAppendedId(
+ Uri.parse(Environment.DIRECTORY_DOWNLOADS),
+ Long.valueOf(id)
+ );
+ return getFileFromUri(contentUri, 2);
+ }
+ Log.d("UriUtils", uri.toString() + " parse failed. -> 3");
+ return null;
} else if ("com.android.providers.media.documents".equals(authority)) {
final String docId = DocumentsContract.getDocumentId(uri);
final String[] split = docId.split(":");
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
index d0c98afc96..1992a2c902 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -13,13 +13,14 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
+import androidx.core.content.FileProvider;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
index a57bbb8241..622d657817 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
@@ -2,7 +2,7 @@
import android.content.Context;
import android.os.Vibrator;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
import static android.Manifest.permission.VIBRATE;
diff --git a/utilcode/lib/src/test/java/com/blankj/utilcode/util/BaseTest.java b/utilcode/lib/src/test/java/com/blankj/utilcode/util/BaseTest.java
index 85bc9d8ac2..2dadedff8c 100644
--- a/utilcode/lib/src/test/java/com/blankj/utilcode/util/BaseTest.java
+++ b/utilcode/lib/src/test/java/com/blankj/utilcode/util/BaseTest.java
@@ -1,8 +1,5 @@
package com.blankj.utilcode.util;
-
-import android.support.annotation.NonNull;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -29,7 +26,7 @@ public BaseTest() {
ShadowLog.stream = System.out;
ThreadUtils.setDeliver(new Executor() {
@Override
- public void execute(@NonNull Runnable command) {
+ public void execute(Runnable command) {
command.run();
}
});
@@ -201,8 +198,8 @@ public void onFail(Throwable t) {
static class Person implements Comparable {
String name;
- int age;
- int time;
+ int age;
+ int time;
public Person(String name) {
this.name = name;
@@ -220,7 +217,7 @@ public String toString() {
}
@Override
- public int compareTo(@NonNull Person o) {
+ public int compareTo(Person o) {
int res = o.age - age;
if (res != 0) {
return res;
diff --git a/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java b/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
index a0203f78fc..ed12c24d8d 100644
--- a/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
+++ b/utilcode/lib/src/test/java/com/blankj/utilcode/util/ObjectUtilsTest.java
@@ -1,7 +1,5 @@
package com.blankj.utilcode.util;
-import android.support.v4.util.LongSparseArray;
-import android.support.v4.util.SimpleArrayMap;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -12,6 +10,9 @@
import java.util.HashMap;
import java.util.LinkedList;
+import androidx.collection.LongSparseArray;
+import androidx.collection.SimpleArrayMap;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/utilcode/pkg/build.gradle b/utilcode/pkg/build.gradle
index 9fe360a5dd..881637b34a 100644
--- a/utilcode/pkg/build.gradle
+++ b/utilcode/pkg/build.gradle
@@ -4,5 +4,5 @@ apply {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- api project(':lib:base')
+ api gradle.ext.dep.lib_base
}
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
index e784f98401..9982c948b7 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
@@ -6,7 +6,7 @@ import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.os.Build
import android.os.Bundle
-import android.support.v4.app.ActivityOptionsCompat
+import androidx.core.app.ActivityOptionsCompat
import android.view.View
import android.view.Window
import com.blankj.lib.base.BaseTitleActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
index 0c63773639..abf0151bbc 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt
@@ -2,7 +2,7 @@ package com.blankj.utilcode.pkg.feature.activity
import android.os.Build
import android.os.Bundle
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
import android.view.View
import android.view.Window
import com.blankj.lib.base.BaseTitleActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
index d4f0d60530..fc8020b3e5 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.kt
@@ -3,10 +3,10 @@ package com.blankj.utilcode.pkg.feature.bar
import android.content.Context
import android.content.Intent
import android.os.Bundle
-import android.support.design.widget.BottomNavigationView
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
-import android.support.v4.view.ViewPager
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.viewpager.widget.ViewPager
import android.view.View
import com.blankj.lib.base.BaseActivity
import com.blankj.utilcode.pkg.R
@@ -37,7 +37,7 @@ class BarStatusFragmentActivity : BaseActivity() {
R.id.barStatusFragmentNavigationCustom
)
- private val mFragmentList = ArrayList()
+ private val mFragmentList = ArrayList()
private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener l@{ item ->
when (item.itemId) {
@@ -78,8 +78,8 @@ class BarStatusFragmentActivity : BaseActivity() {
mFragmentList.add(BarStatusCustomFragment.newInstance())
barStatusFragmentVp.offscreenPageLimit = 3
- barStatusFragmentVp.adapter = object : FragmentPagerAdapter(supportFragmentManager) {
- override fun getItem(position: Int): Fragment {
+ barStatusFragmentVp.adapter = object : androidx.fragment.app.FragmentPagerAdapter(supportFragmentManager) {
+ override fun getItem(position: Int): androidx.fragment.app.Fragment {
return mFragmentList[position]
}
@@ -88,7 +88,7 @@ class BarStatusFragmentActivity : BaseActivity() {
}
}
- barStatusFragmentVp.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ barStatusFragmentVp.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
override fun onPageSelected(position: Int) {
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
index ada9dd0d10..86972c449d 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ContainerFragment.kt
@@ -2,8 +2,8 @@ package com.blankj.utilcode.pkg.feature.fragment
import android.os.Build
import android.os.Bundle
-import android.support.annotation.RequiresApi
-import android.support.v4.app.Fragment
+import androidx.annotation.RequiresApi
+import androidx.fragment.app.Fragment
import android.transition.*
import android.view.View
import com.blankj.lib.base.BaseLazyFragment
@@ -128,7 +128,7 @@ class ContainerFragment : BaseLazyFragment(), FragmentUtils.OnBackClickListener
}
}
- private fun addSharedElement(fragment: Fragment): Fragment {
+ private fun addSharedElement(fragment: androidx.fragment.app.Fragment): androidx.fragment.app.Fragment {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
fragment.sharedElementEnterTransition = DetailTransition()
fragment.enterTransition = Fade()
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
index 446271b366..b18a2e236b 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.kt
@@ -4,8 +4,8 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
-import android.support.design.widget.BottomNavigationView
-import android.support.v4.app.Fragment
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import androidx.fragment.app.Fragment
import android.view.View
import com.blankj.lib.base.BaseActivity
import com.blankj.utilcode.pkg.R
@@ -29,7 +29,7 @@ class FragmentActivity : BaseActivity() {
}
}
- private val mFragments = arrayListOf()
+ private val mFragments = arrayListOf()
private var curIndex: Int = 0
private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
index 0e092e0062..2c6656f220 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt
@@ -6,12 +6,12 @@ import android.graphics.Bitmap
import android.graphics.Color
import android.os.Build
import android.os.Bundle
-import android.support.annotation.StringRes
-import android.support.v7.widget.LinearLayoutManager
import android.view.View
import android.widget.Button
import android.widget.ImageView
import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.LinearLayoutManager
import com.blankj.lib.base.BaseTaskActivity
import com.blankj.lib.base.rv.BaseAdapter
import com.blankj.lib.base.rv.BaseCell
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
index a0ea36d528..cd1c1b0d99 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
import android.text.SpannableStringBuilder
import android.view.View
import android.view.ViewGroup
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
index d84ced168c..202069ed61 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt
@@ -5,7 +5,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.*
import android.os.Bundle
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
import android.text.Layout
import android.text.SpannableStringBuilder
import android.text.TextPaint
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
index 314ba33d59..458ecbb3fb 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.kt
@@ -2,7 +2,7 @@ package com.blankj.utilcode.pkg.feature.toast
import android.os.Handler
import android.os.Looper
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
import android.widget.TextView
import android.widget.Toast
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
index 51c9e53774..47f91e826e 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
import android.view.Gravity
import android.view.View
import com.blankj.lib.base.BaseTitleActivity
diff --git a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
index 344a69e448..a495a13013 100644
--- a/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
+++ b/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.kt
@@ -3,7 +3,6 @@ package com.blankj.utilcode.pkg.helper
import android.app.Dialog
import android.graphics.Bitmap
import android.graphics.drawable.ColorDrawable
-import android.support.v7.app.AlertDialog
import android.text.method.ScrollingMovementMethod
import android.view.Gravity
import android.view.LayoutInflater
@@ -12,9 +11,9 @@ import android.widget.Button
import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
import com.blankj.utilcode.pkg.R
import com.blankj.utilcode.util.*
-import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldRequest
/**
* ```
@@ -26,7 +25,7 @@ import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldReques
*/
object DialogHelper {
- fun showRationaleDialog(shouldRequest: ShouldRequest) {
+ fun showRationaleDialog(shouldRequest: PermissionUtils.OnRationaleListener.ShouldRequest) {
val topActivity = ActivityUtils.getTopActivity()
AlertDialog.Builder(topActivity)
.setTitle(android.R.string.dialog_alert_title)
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
index 792ae5672e..9be8749952 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen.xml
@@ -1,5 +1,5 @@
-
@@ -43,6 +43,6 @@
android:textSize="30pt"
app:layout_constraintTop_toBottomOf="@id/adaptScreenCloseAdaptDpTv" />
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
index 350921b04d..75fa87e8e5 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_height.xml
@@ -1,13 +1,12 @@
-
-
@@ -94,6 +93,6 @@
android:textSize="30pt" />
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
index 121415e1b6..dd9f9f40c7 100644
--- a/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_adaptscreen_width.xml
@@ -8,7 +8,7 @@
android:fillViewport="true"
tools:context=".feature.adaptScreen.AdaptWidthActivity">
-
@@ -149,6 +149,6 @@
-
+
\ No newline at end of file
diff --git a/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml b/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
index 3ce196004b..bd6e43e7a7 100644
--- a/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
+++ b/utilcode/pkg/src/main/res/layout/activity_bar_status_fragment.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
Date: Wed, 26 Jun 2019 13:40:48 +0800
Subject: [PATCH 005/191] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=98=BF=E9=87=8C?=
=?UTF-8?q?=E4=BA=91=E4=BB=93=E5=BA=93=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build.gradle | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/build.gradle b/build.gradle
index 6a8c9055e5..2a396521c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,18 @@
buildscript {
apply from: 'config.gradle'
repositories {
+ maven {
+ url 'https://maven.aliyun.com/repository/public'
+ name '代替 jcenter()及mavenCentral()'
+ }
+ maven {
+ url 'https://maven.aliyun.com/repository/jcenter'
+ name '代替 jcenter()'
+ }
+ maven {
+ url 'https://maven.aliyun.com/repository/google'
+ name '代替 google()'
+ }
if (bus.isDebug) {
maven() {
url uri(new File(project.rootDir, "maven"))
@@ -20,6 +32,18 @@ buildscript {
allprojects {
repositories {
+ maven {
+ url 'https://maven.aliyun.com/repository/public'
+ name '代替 jcenter()及mavenCentral()'
+ }
+ maven {
+ url 'https://maven.aliyun.com/repository/jcenter'
+ name '代替 jcenter()'
+ }
+ maven {
+ url 'https://maven.aliyun.com/repository/google'
+ name '代替 google()'
+ }
google()
jcenter()
}
From 047750f980bd4890a6e939817a0aed30aff2b636 Mon Sep 17 00:00:00 2001
From: liyujiang
Date: Wed, 26 Jun 2019 17:05:22 +0800
Subject: [PATCH 006/191] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=A0=E4=B8=AA?=
=?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8C=87=E5=AE=9A=E6=97=A5=E6=9C=9F=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E5=8F=8A=E7=9B=B8=E5=BA=94=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B?=
=?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/blankj/utilcode/util/TimeUtils.java | 60 +-
.../blankj/utilcode/util/TimeUtilsTest.java | 552 +++++++++---------
2 files changed, 336 insertions(+), 276 deletions(-)
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
index adaa920474..19a9ad40c4 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/TimeUtils.java
@@ -24,10 +24,17 @@ public final class TimeUtils {
private static final ThreadLocal SDF_THREAD_LOCAL = new ThreadLocal<>();
private static SimpleDateFormat getDefaultFormat() {
+ return getDateFormat("yyyy-MM-dd HH:mm:ss");
+ }
+
+ @NonNull
+ private static SimpleDateFormat getDateFormat(String pattern) {
SimpleDateFormat simpleDateFormat = SDF_THREAD_LOCAL.get();
if (simpleDateFormat == null) {
- simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+ simpleDateFormat = new SimpleDateFormat(pattern, Locale.getDefault());
SDF_THREAD_LOCAL.set(simpleDateFormat);
+ } else {
+ simpleDateFormat.applyPattern(pattern);
}
return simpleDateFormat;
}
@@ -47,6 +54,17 @@ public static String millis2String(final long millis) {
return millis2String(millis, getDefaultFormat());
}
+ /**
+ * Milliseconds to the formatted time string.
+ *
+ * @param millis The milliseconds.
+ * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
+ * @return the formatted time string
+ */
+ public static String millis2String(long millis, @NonNull final String pattern) {
+ return millis2String(millis, getDateFormat(pattern));
+ }
+
/**
* Milliseconds to the formatted time string.
*
@@ -69,6 +87,18 @@ public static long string2Millis(final String time) {
return string2Millis(time, getDefaultFormat());
}
+ /**
+ * Formatted time string to the milliseconds.
+ * The pattern is {@code yyyy-MM-dd HH:mm:ss}.
+ *
+ * @param time The formatted time string.
+ * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
+ * @return the milliseconds
+ */
+ public static long string2Millis(final String time, @NonNull final String pattern) {
+ return string2Millis(time, getDateFormat(pattern));
+ }
+
/**
* Formatted time string to the milliseconds.
*
@@ -96,6 +126,18 @@ public static Date string2Date(final String time) {
return string2Date(time, getDefaultFormat());
}
+ /**
+ * Formatted time string to the date.
+ * The pattern is {@code yyyy-MM-dd HH:mm:ss}.
+ *
+ * @param time The formatted time string.
+ * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
+ * @return the date
+ */
+ public static Date string2Date(final String time, @NonNull final String pattern) {
+ return string2Date(time, getDateFormat(pattern));
+ }
+
/**
* Formatted time string to the date.
*
@@ -123,6 +165,17 @@ public static String date2String(final Date date) {
return date2String(date, getDefaultFormat());
}
+ /**
+ * Date to the formatted time string.
+ *
+ * @param date The date.
+ * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
+ * @return the formatted time string
+ */
+ public static String date2String(final Date date, @NonNull final String pattern) {
+ return getDateFormat(pattern).format(date);
+ }
+
/**
* Date to the formatted time string.
*
@@ -1338,8 +1391,8 @@ public static String getChineseZodiac(final int year) {
return CHINESE_ZODIAC[year % 12];
}
- private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22};
- private static final String[] ZODIAC = {
+ private static final int[] ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22};
+ private static final String[] ZODIAC = {
"水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座",
"狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座"
};
@@ -1431,4 +1484,5 @@ private static String millis2FitTimeSpan(long millis, int precision) {
}
return sb.toString();
}
+
}
diff --git a/utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java b/utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java
index 5b82277a0a..7ca86340c3 100644
--- a/utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java
+++ b/utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java
@@ -1,274 +1,280 @@
-package com.blankj.utilcode.util;
-
-import com.blankj.utilcode.constant.TimeConstants;
-
-import org.junit.Test;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-
-/**
- *
- * author: Blankj
- * blog : http://blankj.com
- * time : 2016/08/12
- * desc : test TimeUtils
- *
- */
-public class TimeUtilsTest extends BaseTest {
-
- private final DateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
- private final DateFormat mFormat = new SimpleDateFormat("yyyy MM dd HH:mm:ss", Locale.getDefault());
-
- private final long timeMillis = 1493887049000L;// 2017-05-04 16:37:29
- private final Date timeDate = new Date(timeMillis);
- private final String timeString = defaultFormat.format(timeDate);
- private final String timeStringFormat = mFormat.format(timeDate);
- private final long tomorrowTimeMillis = 1493973449000L;
- private final Date tomorrowTimeDate = new Date(tomorrowTimeMillis);
- private final String tomorrowTimeString = defaultFormat.format(tomorrowTimeDate);
- private final String tomorrowTimeStringFormat = mFormat.format(tomorrowTimeDate);
- private final long delta = 10;// 允许误差 10ms
-
- @Test
- public void millis2String() {
- assertEquals(timeString, TimeUtils.millis2String(timeMillis));
- assertEquals(timeStringFormat, TimeUtils.millis2String(timeMillis, mFormat));
- }
-
- @Test
- public void string2Millis() {
- assertEquals(timeMillis, TimeUtils.string2Millis(timeString));
- assertEquals(timeMillis, TimeUtils.string2Millis(timeStringFormat, mFormat));
- }
-
- @Test
- public void string2Date() {
- assertEquals(timeDate, TimeUtils.string2Date(timeString));
- assertEquals(timeDate, TimeUtils.string2Date(timeStringFormat, mFormat));
- }
-
- @Test
- public void date2String() {
- assertEquals(timeString, TimeUtils.date2String(timeDate));
- assertEquals(timeStringFormat, TimeUtils.date2String(timeDate, mFormat));
- }
-
- @Test
- public void date2Millis() {
- assertEquals(timeMillis, TimeUtils.date2Millis(timeDate));
- }
-
- @Test
- public void millis2Date() {
- assertEquals(timeDate, TimeUtils.millis2Date(timeMillis));
- }
-
- @Test
- public void getTimeSpan() {
- long testTimeMillis = timeMillis + 120 * TimeConstants.SEC;
- String testTimeString = TimeUtils.millis2String(testTimeMillis);
- String testTimeStringFormat = TimeUtils.millis2String(testTimeMillis, mFormat);
- Date testTimeDate = TimeUtils.millis2Date(testTimeMillis);
- assertEquals(-120, TimeUtils.getTimeSpan(timeString, testTimeString, TimeConstants.SEC));
- assertEquals(2, TimeUtils.getTimeSpan(testTimeStringFormat, timeStringFormat, mFormat, TimeConstants.MIN));
- assertEquals(-2, TimeUtils.getTimeSpan(timeDate, testTimeDate, TimeConstants.MIN));
- assertEquals(120, TimeUtils.getTimeSpan(testTimeMillis, timeMillis, TimeConstants.SEC));
- }
-
- @Test
- public void getFitTimeSpan() {
- long testTimeMillis = timeMillis + 10 * TimeConstants.DAY + 10 * TimeConstants.MIN + 10 * TimeConstants.SEC;
- String testTimeString = TimeUtils.millis2String(testTimeMillis);
- String testTimeStringFormat = TimeUtils.millis2String(testTimeMillis, mFormat);
- Date testTimeDate = TimeUtils.millis2Date(testTimeMillis);
- assertEquals("-10天10分钟10秒", TimeUtils.getFitTimeSpan(timeString, testTimeString, 5));
- assertEquals("10天10分钟10秒", TimeUtils.getFitTimeSpan(testTimeStringFormat, timeStringFormat, mFormat, 5));
- assertEquals("-10天10分钟10秒", TimeUtils.getFitTimeSpan(timeDate, testTimeDate, 5));
- assertEquals("10天10分钟10秒", TimeUtils.getFitTimeSpan(testTimeMillis, timeMillis, 5));
- }
-
- @Test
- public void getNowMills() {
- assertEquals(System.currentTimeMillis(), TimeUtils.getNowMills(), delta);
- }
-
- @Test
- public void getNowString() {
- assertEquals(System.currentTimeMillis(), TimeUtils.string2Millis(TimeUtils.getNowString()), delta);
- assertEquals(System.currentTimeMillis(), TimeUtils.string2Millis(TimeUtils.getNowString(mFormat), mFormat), delta);
- }
-
- @Test
- public void getNowDate() {
- assertEquals(System.currentTimeMillis(), TimeUtils.date2Millis(TimeUtils.getNowDate()), delta);
- }
-
- @Test
- public void getTimeSpanByNow() {
- assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowString(), TimeConstants.MSEC), delta);
- assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowString(mFormat), mFormat, TimeConstants.MSEC), delta);
- assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowDate(), TimeConstants.MSEC), delta);
- assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowMills(), TimeConstants.MSEC), delta);
- }
-
- @Test
- public void getFitTimeSpanByNow() {
-// long spanMillis = 6 * TimeConstants.DAY + 6 * TimeConstants.HOUR + 6 * TimeConstants.MIN + 6 * TimeConstants.SEC;
-// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis), 4));
-// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis, mFormat), mFormat, 4));
-// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2Date(System.currentTimeMillis() + spanMillis), 4));
-// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(System.currentTimeMillis() + spanMillis, 4));
- }
-
- @Test
- public void getFriendlyTimeSpanByNow() {
- assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowString()));
- assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowString(mFormat), mFormat));
- assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowDate()));
- assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills()));
- assertEquals("1秒前", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills() - TimeConstants.SEC));
- assertEquals("1分钟前", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills() - TimeConstants.MIN));
- }
-
- @Test
- public void getMillis() {
- assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeMillis, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeString, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeStringFormat, mFormat, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeDate, 1, TimeConstants.DAY));
- }
-
- @Test
- public void getString() {
- assertEquals(tomorrowTimeString, TimeUtils.getString(timeMillis, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeMillis, mFormat, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeString, TimeUtils.getString(timeString, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeStringFormat, mFormat, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeString, TimeUtils.getString(timeDate, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeDate, mFormat, 1, TimeConstants.DAY));
- }
-
- @Test
- public void getDate() {
- assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeMillis, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeString, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeStringFormat, mFormat, 1, TimeConstants.DAY));
- assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeDate, 1, TimeConstants.DAY));
- }
-
- @Test
- public void getMillisByNow() {
- assertEquals(System.currentTimeMillis() + TimeConstants.DAY, TimeUtils.getMillisByNow(1, TimeConstants.DAY), delta);
- }
-
- @Test
- public void getStringByNow() {
- long tomorrowMillis = TimeUtils.string2Millis(TimeUtils.getStringByNow(1, TimeConstants.DAY));
- assertEquals(System.currentTimeMillis() + TimeConstants.DAY, tomorrowMillis, delta);
- tomorrowMillis = TimeUtils.string2Millis(TimeUtils.getStringByNow(1, mFormat, TimeConstants.DAY), mFormat);
- assertEquals(System.currentTimeMillis() + TimeConstants.DAY, tomorrowMillis, delta);
- }
-
- @Test
- public void getDateByNow() {
- long tomorrowMillis = TimeUtils.date2Millis(TimeUtils.getDateByNow(1, TimeConstants.DAY));
- assertEquals(System.currentTimeMillis() + TimeConstants.DAY, TimeUtils.getMillisByNow(1, TimeConstants.DAY), delta);
- }
-
- @Test
- public void isToday() {
- long todayTimeMillis = System.currentTimeMillis();
- String todayTimeString = TimeUtils.millis2String(todayTimeMillis);
- String todayTimeStringFormat = TimeUtils.millis2String(todayTimeMillis, mFormat);
- Date todayTimeDate = TimeUtils.millis2Date(todayTimeMillis);
- long tomorrowTimeMillis = todayTimeMillis + TimeConstants.DAY;
- String tomorrowTimeString = TimeUtils.millis2String(tomorrowTimeMillis);
- Date tomorrowTimeDate = TimeUtils.millis2Date(tomorrowTimeMillis);
- assertTrue(TimeUtils.isToday(todayTimeString));
- assertTrue(TimeUtils.isToday(todayTimeStringFormat, mFormat));
- assertTrue(TimeUtils.isToday(todayTimeDate));
- assertTrue(TimeUtils.isToday(todayTimeMillis));
- assertFalse(TimeUtils.isToday(tomorrowTimeString));
- assertFalse(TimeUtils.isToday(tomorrowTimeStringFormat, mFormat));
- assertFalse(TimeUtils.isToday(tomorrowTimeDate));
- assertFalse(TimeUtils.isToday(tomorrowTimeMillis));
- }
-
- @Test
- public void isLeapYear() {
- assertFalse(TimeUtils.isLeapYear(timeString));
- assertFalse(TimeUtils.isLeapYear(timeStringFormat, mFormat));
- assertFalse(TimeUtils.isLeapYear(timeDate));
- assertFalse(TimeUtils.isLeapYear(timeMillis));
- assertTrue(TimeUtils.isLeapYear(2016));
- assertFalse(TimeUtils.isLeapYear(2017));
- }
-
- @Test
- public void getChineseWeek() {
- assertEquals("星期四", TimeUtils.getChineseWeek(timeString));
- assertEquals("星期四", TimeUtils.getChineseWeek(timeStringFormat, mFormat));
- assertEquals("星期四", TimeUtils.getChineseWeek(timeDate));
- assertEquals("星期四", TimeUtils.getChineseWeek(timeMillis));
- }
-
- @Test
- public void getUSWeek() {
- assertEquals("Thursday", TimeUtils.getUSWeek(timeString));
- assertEquals("Thursday", TimeUtils.getUSWeek(timeStringFormat, mFormat));
- assertEquals("Thursday", TimeUtils.getUSWeek(timeDate));
- assertEquals("Thursday", TimeUtils.getUSWeek(timeMillis));
- }
-
- @Test
- public void getWeekIndex() {
- assertEquals(5, TimeUtils.getValueByCalendarField(timeString, Calendar.DAY_OF_WEEK));
- assertEquals(5, TimeUtils.getValueByCalendarField(timeString, Calendar.DAY_OF_WEEK));
- assertEquals(5, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.DAY_OF_WEEK));
- assertEquals(5, TimeUtils.getValueByCalendarField(timeDate, Calendar.DAY_OF_WEEK));
- assertEquals(5, TimeUtils.getValueByCalendarField(timeMillis, Calendar.DAY_OF_WEEK));
- }
-
- @Test
- public void getWeekOfMonth() {
- assertEquals(1, TimeUtils.getValueByCalendarField(timeString, Calendar.WEEK_OF_MONTH));
- assertEquals(1, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.WEEK_OF_MONTH));
- assertEquals(1, TimeUtils.getValueByCalendarField(timeDate, Calendar.WEEK_OF_MONTH));
- assertEquals(1, TimeUtils.getValueByCalendarField(timeMillis, Calendar.WEEK_OF_MONTH));
- }
-
- @Test
- public void getWeekOfYear() {
- assertEquals(18, TimeUtils.getValueByCalendarField(timeString, Calendar.WEEK_OF_YEAR));
- assertEquals(18, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.WEEK_OF_YEAR));
- assertEquals(18, TimeUtils.getValueByCalendarField(timeDate, Calendar.WEEK_OF_YEAR));
- assertEquals(18, TimeUtils.getValueByCalendarField(timeMillis, Calendar.WEEK_OF_YEAR));
- }
-
- @Test
- public void getChineseZodiac() {
- assertEquals("鸡", TimeUtils.getChineseZodiac(timeString));
- assertEquals("鸡", TimeUtils.getChineseZodiac(timeStringFormat, mFormat));
- assertEquals("鸡", TimeUtils.getChineseZodiac(timeDate));
- assertEquals("鸡", TimeUtils.getChineseZodiac(timeMillis));
- assertEquals("鸡", TimeUtils.getChineseZodiac(2017));
- }
-
- @Test
- public void getZodiac() {
- assertEquals("金牛座", TimeUtils.getZodiac(timeString));
- assertEquals("金牛座", TimeUtils.getZodiac(timeStringFormat, mFormat));
- assertEquals("金牛座", TimeUtils.getZodiac(timeDate));
- assertEquals("金牛座", TimeUtils.getZodiac(timeMillis));
- assertEquals("狮子座", TimeUtils.getZodiac(8, 16));
- }
+package com.blankj.utilcode.util;
+
+import com.blankj.utilcode.constant.TimeConstants;
+
+import org.junit.Test;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+
+/**
+ *
+ * author: Blankj
+ * blog : http://blankj.com
+ * time : 2016/08/12
+ * desc : test TimeUtils
+ *
+ */
+public class TimeUtilsTest {
+
+ private final DateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+ private final DateFormat mFormat = new SimpleDateFormat("yyyy MM dd HH:mm:ss", Locale.getDefault());
+
+ private final long timeMillis = 1493887049000L;// 2017-05-04 16:37:29
+ private final Date timeDate = new Date(timeMillis);
+ private final String timeString = defaultFormat.format(timeDate);
+ private final String timeStringFormat = mFormat.format(timeDate);
+ private final long tomorrowTimeMillis = 1493973449000L;
+ private final Date tomorrowTimeDate = new Date(tomorrowTimeMillis);
+ private final String tomorrowTimeString = defaultFormat.format(tomorrowTimeDate);
+ private final String tomorrowTimeStringFormat = mFormat.format(tomorrowTimeDate);
+ private final long delta = 10;// 允许误差 10ms
+
+ @Test
+ public void millis2String() {
+ assertEquals(timeString, TimeUtils.millis2String(timeMillis));
+ assertEquals(timeStringFormat, TimeUtils.millis2String(timeMillis, mFormat));
+ assertEquals("2017年05月04日", TimeUtils.millis2String(timeMillis, "yyyy年MM月dd日"));
+ assertEquals("16时37分", TimeUtils.millis2String(timeMillis, "HH时mm分"));
+ }
+
+ @Test
+ public void string2Millis() {
+ assertEquals(timeMillis, TimeUtils.string2Millis(timeString));
+ assertEquals(timeMillis, TimeUtils.string2Millis(timeStringFormat, mFormat));
+ assertEquals(TimeUtils.string2Millis("2017-05-04 16:37", "yyyy-MM-dd HH:mm"),
+ TimeUtils.string2Millis("2017年05月04日16时37分", "yyyy年MM月dd日HH时mm分"));
+ }
+
+ @Test
+ public void string2Date() {
+ assertEquals(timeDate, TimeUtils.string2Date(timeString));
+ assertEquals(timeDate, TimeUtils.string2Date(timeStringFormat, mFormat));
+ assertEquals(timeDate, TimeUtils.string2Date("2017-05-04 16:37:29", "yyyy-MM-dd HH:mm:ss"));
+ }
+
+ @Test
+ public void date2String() {
+ assertEquals(timeString, TimeUtils.date2String(timeDate));
+ assertEquals(timeStringFormat, TimeUtils.date2String(timeDate, mFormat));
+ assertEquals("2017-05-04 16:37:29", TimeUtils.date2String(timeDate, "yyyy-MM-dd HH:mm:ss"));
+ }
+
+ @Test
+ public void date2Millis() {
+ assertEquals(timeMillis, TimeUtils.date2Millis(timeDate));
+ }
+
+ @Test
+ public void millis2Date() {
+ assertEquals(timeDate, TimeUtils.millis2Date(timeMillis));
+ }
+
+ @Test
+ public void getTimeSpan() {
+ long testTimeMillis = timeMillis + 120 * TimeConstants.SEC;
+ String testTimeString = TimeUtils.millis2String(testTimeMillis);
+ String testTimeStringFormat = TimeUtils.millis2String(testTimeMillis, mFormat);
+ Date testTimeDate = TimeUtils.millis2Date(testTimeMillis);
+ assertEquals(-120, TimeUtils.getTimeSpan(timeString, testTimeString, TimeConstants.SEC));
+ assertEquals(2, TimeUtils.getTimeSpan(testTimeStringFormat, timeStringFormat, mFormat, TimeConstants.MIN));
+ assertEquals(-2, TimeUtils.getTimeSpan(timeDate, testTimeDate, TimeConstants.MIN));
+ assertEquals(120, TimeUtils.getTimeSpan(testTimeMillis, timeMillis, TimeConstants.SEC));
+ }
+
+ @Test
+ public void getFitTimeSpan() {
+ long testTimeMillis = timeMillis + 10 * TimeConstants.DAY + 10 * TimeConstants.MIN + 10 * TimeConstants.SEC;
+ String testTimeString = TimeUtils.millis2String(testTimeMillis);
+ String testTimeStringFormat = TimeUtils.millis2String(testTimeMillis, mFormat);
+ Date testTimeDate = TimeUtils.millis2Date(testTimeMillis);
+ assertEquals("-10天10分钟10秒", TimeUtils.getFitTimeSpan(timeString, testTimeString, 5));
+ assertEquals("10天10分钟10秒", TimeUtils.getFitTimeSpan(testTimeStringFormat, timeStringFormat, mFormat, 5));
+ assertEquals("-10天10分钟10秒", TimeUtils.getFitTimeSpan(timeDate, testTimeDate, 5));
+ assertEquals("10天10分钟10秒", TimeUtils.getFitTimeSpan(testTimeMillis, timeMillis, 5));
+ }
+
+ @Test
+ public void getNowMills() {
+ assertEquals(System.currentTimeMillis(), TimeUtils.getNowMills(), delta);
+ }
+
+ @Test
+ public void getNowString() {
+ assertEquals(System.currentTimeMillis(), TimeUtils.string2Millis(TimeUtils.getNowString()), delta);
+ assertEquals(System.currentTimeMillis(), TimeUtils.string2Millis(TimeUtils.getNowString(mFormat), mFormat), delta);
+ }
+
+ @Test
+ public void getNowDate() {
+ assertEquals(System.currentTimeMillis(), TimeUtils.date2Millis(TimeUtils.getNowDate()), delta);
+ }
+
+ @Test
+ public void getTimeSpanByNow() {
+ assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowString(), TimeConstants.MSEC), delta);
+ assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowString(mFormat), mFormat, TimeConstants.MSEC), delta);
+ assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowDate(), TimeConstants.MSEC), delta);
+ assertEquals(0, TimeUtils.getTimeSpanByNow(TimeUtils.getNowMills(), TimeConstants.MSEC), delta);
+ }
+
+ @Test
+ public void getFitTimeSpanByNow() {
+// long spanMillis = 6 * TimeConstants.DAY + 6 * TimeConstants.HOUR + 6 * TimeConstants.MIN + 6 * TimeConstants.SEC;
+// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis), 4));
+// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2String(System.currentTimeMillis() + spanMillis, mFormat), mFormat, 4));
+// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(TimeUtils.millis2Date(System.currentTimeMillis() + spanMillis), 4));
+// assertEquals("6天6小时6分钟6秒", TimeUtils.getFitTimeSpanByNow(System.currentTimeMillis() + spanMillis, 4));
+ }
+
+ @Test
+ public void getFriendlyTimeSpanByNow() {
+ assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowString()));
+ assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowString(mFormat), mFormat));
+ assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowDate()));
+ assertEquals("刚刚", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills()));
+ assertEquals("1秒前", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills() - TimeConstants.SEC));
+ assertEquals("1分钟前", TimeUtils.getFriendlyTimeSpanByNow(TimeUtils.getNowMills() - TimeConstants.MIN));
+ }
+
+ @Test
+ public void getMillis() {
+ assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeMillis, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeString, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeStringFormat, mFormat, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeMillis, TimeUtils.getMillis(timeDate, 1, TimeConstants.DAY));
+ }
+
+ @Test
+ public void getString() {
+ assertEquals(tomorrowTimeString, TimeUtils.getString(timeMillis, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeMillis, mFormat, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeString, TimeUtils.getString(timeString, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeStringFormat, mFormat, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeString, TimeUtils.getString(timeDate, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeStringFormat, TimeUtils.getString(timeDate, mFormat, 1, TimeConstants.DAY));
+ }
+
+ @Test
+ public void getDate() {
+ assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeMillis, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeString, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeStringFormat, mFormat, 1, TimeConstants.DAY));
+ assertEquals(tomorrowTimeDate, TimeUtils.getDate(timeDate, 1, TimeConstants.DAY));
+ }
+
+ @Test
+ public void getMillisByNow() {
+ assertEquals(System.currentTimeMillis() + TimeConstants.DAY, TimeUtils.getMillisByNow(1, TimeConstants.DAY), delta);
+ }
+
+ @Test
+ public void getStringByNow() {
+ long tomorrowMillis = TimeUtils.string2Millis(TimeUtils.getStringByNow(1, TimeConstants.DAY));
+ assertEquals(System.currentTimeMillis() + TimeConstants.DAY, tomorrowMillis, delta);
+ tomorrowMillis = TimeUtils.string2Millis(TimeUtils.getStringByNow(1, mFormat, TimeConstants.DAY), mFormat);
+ assertEquals(System.currentTimeMillis() + TimeConstants.DAY, tomorrowMillis, delta);
+ }
+
+ @Test
+ public void getDateByNow() {
+ long tomorrowMillis = TimeUtils.date2Millis(TimeUtils.getDateByNow(1, TimeConstants.DAY));
+ assertEquals(System.currentTimeMillis() + TimeConstants.DAY, TimeUtils.getMillisByNow(1, TimeConstants.DAY), delta);
+ }
+
+ @Test
+ public void isToday() {
+ long todayTimeMillis = System.currentTimeMillis();
+ String todayTimeString = TimeUtils.millis2String(todayTimeMillis);
+ String todayTimeStringFormat = TimeUtils.millis2String(todayTimeMillis, mFormat);
+ Date todayTimeDate = TimeUtils.millis2Date(todayTimeMillis);
+ long tomorrowTimeMillis = todayTimeMillis + TimeConstants.DAY;
+ String tomorrowTimeString = TimeUtils.millis2String(tomorrowTimeMillis);
+ Date tomorrowTimeDate = TimeUtils.millis2Date(tomorrowTimeMillis);
+ assertTrue(TimeUtils.isToday(todayTimeString));
+ assertTrue(TimeUtils.isToday(todayTimeStringFormat, mFormat));
+ assertTrue(TimeUtils.isToday(todayTimeDate));
+ assertTrue(TimeUtils.isToday(todayTimeMillis));
+ assertFalse(TimeUtils.isToday(tomorrowTimeString));
+ assertFalse(TimeUtils.isToday(tomorrowTimeStringFormat, mFormat));
+ assertFalse(TimeUtils.isToday(tomorrowTimeDate));
+ assertFalse(TimeUtils.isToday(tomorrowTimeMillis));
+ }
+
+ @Test
+ public void isLeapYear() {
+ assertFalse(TimeUtils.isLeapYear(timeString));
+ assertFalse(TimeUtils.isLeapYear(timeStringFormat, mFormat));
+ assertFalse(TimeUtils.isLeapYear(timeDate));
+ assertFalse(TimeUtils.isLeapYear(timeMillis));
+ assertTrue(TimeUtils.isLeapYear(2016));
+ assertFalse(TimeUtils.isLeapYear(2017));
+ }
+
+ @Test
+ public void getChineseWeek() {
+ assertEquals("星期四", TimeUtils.getChineseWeek(timeString));
+ assertEquals("星期四", TimeUtils.getChineseWeek(timeStringFormat, mFormat));
+ assertEquals("星期四", TimeUtils.getChineseWeek(timeDate));
+ assertEquals("星期四", TimeUtils.getChineseWeek(timeMillis));
+ }
+
+ @Test
+ public void getUSWeek() {
+ assertEquals("Thursday", TimeUtils.getUSWeek(timeString));
+ assertEquals("Thursday", TimeUtils.getUSWeek(timeStringFormat, mFormat));
+ assertEquals("Thursday", TimeUtils.getUSWeek(timeDate));
+ assertEquals("Thursday", TimeUtils.getUSWeek(timeMillis));
+ }
+
+ @Test
+ public void getWeekIndex() {
+ assertEquals(5, TimeUtils.getValueByCalendarField(timeString, Calendar.DAY_OF_WEEK));
+ assertEquals(5, TimeUtils.getValueByCalendarField(timeString, Calendar.DAY_OF_WEEK));
+ assertEquals(5, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.DAY_OF_WEEK));
+ assertEquals(5, TimeUtils.getValueByCalendarField(timeDate, Calendar.DAY_OF_WEEK));
+ assertEquals(5, TimeUtils.getValueByCalendarField(timeMillis, Calendar.DAY_OF_WEEK));
+ }
+
+ @Test
+ public void getWeekOfMonth() {
+ assertEquals(1, TimeUtils.getValueByCalendarField(timeString, Calendar.WEEK_OF_MONTH));
+ assertEquals(1, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.WEEK_OF_MONTH));
+ assertEquals(1, TimeUtils.getValueByCalendarField(timeDate, Calendar.WEEK_OF_MONTH));
+ assertEquals(1, TimeUtils.getValueByCalendarField(timeMillis, Calendar.WEEK_OF_MONTH));
+ }
+
+ @Test
+ public void getWeekOfYear() {
+ assertEquals(18, TimeUtils.getValueByCalendarField(timeString, Calendar.WEEK_OF_YEAR));
+ assertEquals(18, TimeUtils.getValueByCalendarField(timeStringFormat, mFormat, Calendar.WEEK_OF_YEAR));
+ assertEquals(18, TimeUtils.getValueByCalendarField(timeDate, Calendar.WEEK_OF_YEAR));
+ assertEquals(18, TimeUtils.getValueByCalendarField(timeMillis, Calendar.WEEK_OF_YEAR));
+ }
+
+ @Test
+ public void getChineseZodiac() {
+ assertEquals("鸡", TimeUtils.getChineseZodiac(timeString));
+ assertEquals("鸡", TimeUtils.getChineseZodiac(timeStringFormat, mFormat));
+ assertEquals("鸡", TimeUtils.getChineseZodiac(timeDate));
+ assertEquals("鸡", TimeUtils.getChineseZodiac(timeMillis));
+ assertEquals("鸡", TimeUtils.getChineseZodiac(2017));
+ }
+
+ @Test
+ public void getZodiac() {
+ assertEquals("金牛座", TimeUtils.getZodiac(timeString));
+ assertEquals("金牛座", TimeUtils.getZodiac(timeStringFormat, mFormat));
+ assertEquals("金牛座", TimeUtils.getZodiac(timeDate));
+ assertEquals("金牛座", TimeUtils.getZodiac(timeMillis));
+ assertEquals("狮子座", TimeUtils.getZodiac(8, 16));
+ }
}
\ No newline at end of file
From 8fa41678ee59c8644293f2b9c00febd8b1e6b96c Mon Sep 17 00:00:00 2001
From: liyujiang
Date: Wed, 26 Jun 2019 17:06:46 +0800
Subject: [PATCH 007/191] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E7=94=A8=E4=BA=8E=E8=A7=A3=E5=86=B3ScrollView=E5=B5=8C?=
=?UTF-8?q?=E5=A5=97ListView/GridView/WebView/RecyclerView=E7=AD=89?=
=?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BD=AE=E9=A1=B6=E9=97=AE=E9=A2=98=E7=9A=84?=
=?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/blankj/utilcode/util/ViewUtils.java | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ViewUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ViewUtils.java
index 16b573fab0..2efce48662 100644
--- a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ViewUtils.java
+++ b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ViewUtils.java
@@ -33,4 +33,28 @@ public static void setViewEnabled(View view, boolean enabled, View... excludes)
}
view.setEnabled(enabled);
}
+
+ /**
+ * 用于解决ScrollView嵌套ListView/GridView/WebView/RecyclerView等无法置顶问题
+ *
+ * @param view ScrollView嵌套的跟视图
+ */
+ public static void fixScrollViewTopping(View view) {
+ view.setFocusable(false);
+ ViewGroup viewGroup = null;
+ if (view instanceof ViewGroup) {
+ viewGroup = (ViewGroup) view;
+ }
+ if (viewGroup == null) {
+ return;
+ }
+ for (int i = 0, n = viewGroup.getChildCount(); i < n; i++) {
+ View childAt = viewGroup.getChildAt(i);
+ childAt.setFocusable(false);
+ if (childAt instanceof ViewGroup) {
+ fixScrollViewTopping(childAt);
+ }
+ }
+ }
+
}
\ No newline at end of file
From 83735f35b3c67e5026ddcc9cd6c32accb13e1761 Mon Sep 17 00:00:00 2001
From: Blankj <625783482@qq.com>
Date: Fri, 28 Jun 2019 13:20:00 +0800
Subject: [PATCH 008/191] see 06/28 log
---
gradle/config/configApp.gradle | 7 +-
.../com/blankj/launcher/app/LauncherApp.java | 4 +
.../com/blankj/lib/base/BaseFragment.java | 8 +-
.../com/blankj/lib/base/rv/BaseAdapter.java | 53 +++++++++---
.../java/com/blankj/lib/base/rv/BaseCell.java | 4 +-
.../com/blankj/subutil/util/CountryUtils.java | 3 +-
.../com/blankj/subutil/util/BaseTest.java | 2 +
.../com/blankj/subutil/util/TestUtils.java | 2 +
.../subutil/util/http/nodeServer/app.js | 1 -
.../subutil/util/http/nodeServer/index.htm | 18 ----
.../subutil/util/http/nodeServer/package.json | 13 ---
.../nodeServer/public/images/image_lena.jpg | Bin 53220 -> 0 bytes
.../subutil/util/http/nodeServer/server.js | 79 ------------------
.../subutil/util/http/nodeServer/star.jpg | Bin 13072 -> 0 bytes
.../subutil/util/http/nodeServer/users.json | 20 -----
.../blankj/utilcode/util/ActivityUtils.java | 3 +-
.../com/blankj/utilcode/util/ClickUtils.java | 44 ++++++++++
.../blankj/utilcode/util/LanguageUtils.java | 38 +++++++++
.../java/com/blankj/utilcode/util/Utils.java | 2 +-
.../com/blankj/utilcode/util/ViewUtils.java | 10 +--
utilcode/pkg/src/main/AndroidManifest.xml | 4 +
.../utilcode/pkg/feature/CoreUtilActivity.kt | 3 +
.../pkg/feature/keyboard/KeyboardActivity.kt | 5 ++
.../pkg/feature/language/LanguageActivity.kt | 59 +++++++++++++
.../src/main/res/layout/activity_language.xml | 23 +++++
.../main/res/layout/activity_util_core.xml | 7 ++
.../src/main/res/values-zh-rCN/strings.xml | 6 ++
utilcode/pkg/src/main/res/values/strings.xml | 6 +-
28 files changed, 263 insertions(+), 161 deletions(-)
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/app.js
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/index.htm
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/package.json
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/public/images/image_lena.jpg
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/server.js
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/star.jpg
delete mode 100644 subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/users.json
create mode 100644 utilcode/lib/src/main/java/com/blankj/utilcode/util/LanguageUtils.java
create mode 100644 utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/language/LanguageActivity.kt
create mode 100644 utilcode/pkg/src/main/res/layout/activity_language.xml
create mode 100644 utilcode/pkg/src/main/res/values-zh-rCN/strings.xml
diff --git a/gradle/config/configApp.gradle b/gradle/config/configApp.gradle
index dd49160df7..76787bcf32 100644
--- a/gradle/config/configApp.gradle
+++ b/gradle/config/configApp.gradle
@@ -87,10 +87,13 @@ def configSigning(Project pro) {
def configApkName(Project pro) {
pro.android.applicationVariants.all { variant ->
if (variant.buildType.name != "debug") {
- variant.getPackageApplicationProvider().get().outputDirectory = new File("${rootDir.path}/apk")
- variant.getPackageApplicationProvider().get().outputScope.apkDatas.forEach { apkData ->
+ def artifact = variant.getPackageApplicationProvider().get()
+ artifact.outputDirectory = new File("${rootDir.path}/apk")
+ artifact.outputScope.apkDatas.forEach { apkData ->
apkData.outputFileName = "util" + suffix +
+ (variant.flavorName == "" ? "" : ("_" + variant.flavorName)) +
"_" + variant.versionName.replace(".", "_") +
+ "_" + variant.buildType.name +
".apk"
}
}
diff --git a/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java b/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java
index 990f6d47a5..653b3339f6 100644
--- a/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java
+++ b/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java
@@ -3,6 +3,9 @@
import android.content.Context;
import com.blankj.lib.common.CommonApplication;
+import com.blankj.utilcode.util.LanguageUtils;
+
+import java.util.Locale;
/**
*
@@ -29,6 +32,7 @@ protected void attachBaseContext(Context base) {
public void onCreate() {
super.onCreate();
sInstance = this;
+ LanguageUtils.applyLanguage(getBaseContext(), Locale.SIMPLIFIED_CHINESE);
}
}
diff --git a/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java b/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
index 692ad8a213..cd9a005f22 100755
--- a/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/BaseFragment.java
@@ -31,10 +31,10 @@ public abstract class BaseFragment extends Fragment
private static final String TAG = "BaseFragment";
private static final String STATE_SAVE_IS_HIDDEN = "STATE_SAVE_IS_HIDDEN";
- private ClickUtils.OnDebouncingClickListener mDebouncingClick = new ClickUtils.OnDebouncingClickListener() {
+ private View.OnClickListener mClickListener = new View.OnClickListener() {
@Override
- public void onDebouncingClick(View v) {
- BaseFragment.this.onDebouncingClick(v);
+ public void onClick(View v) {
+ onDebouncingClick(v);
}
};
@@ -119,7 +119,7 @@ public void onDestroy() {
}
public void applyDebouncingClickListener(View... views) {
- ClickUtils.applyGlobalDebouncing(views, mDebouncingClick);
+ ClickUtils.applyGlobalDebouncing(views, mClickListener);
}
public T findViewById(@IdRes int id) {
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
index 619d84e5ae..cd83ae923e 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java
@@ -18,20 +18,19 @@
*/
public class BaseAdapter extends RecyclerView.Adapter {
+ public BaseCell mEmptyCell;
+ public List mHeaders;
public List mData;
+ public List mFooters;
public Context mContext;
public LayoutInflater mInflater;
- public void setData(@NonNull final List data) {
- mData = data;
- }
-
- public List getData() {
- return mData;
- }
-
@Override
public final int getItemViewType(int position) {
+ int headerSize = getHeaderSize();
+ if (headerSize > position) {
+ return mHeaders.get(position).viewType;
+ }
return mData.get(position).viewType;
}
@@ -47,16 +46,44 @@ public final void onBindViewHolder(@NonNull BaseViewHolder holder, int position)
mData.get(position).bind(holder, position);
}
+ @Override
+ public void onViewRecycled(@NonNull BaseViewHolder holder) {
+ super.onViewRecycled(holder);
+ int position = holder.getAdapterPosition();
+ mData.get(position).onViewRecycled(holder, position);
+ }
+
@Override
public int getItemCount() {
+ return getHeaderSize() + getDataSize() + getFooterSize();
+ }
+
+ public void setEmptyCell(BaseCell emptyCell) {
+ mEmptyCell = emptyCell;
+ }
+
+ private int getHeaderSize() {
+ if (mHeaders == null) return 0;
+ return mHeaders.size();
+ }
+
+ private int getDataSize() {
if (mData == null) return 0;
return mData.size();
}
- @Override
- public void onViewRecycled(@NonNull BaseViewHolder holder) {
- super.onViewRecycled(holder);
- int position = holder.getAdapterPosition();
- mData.get(position).onViewRecycled(holder, position);
+ private int getFooterSize() {
+ if (mFooters == null) return 0;
+ return mFooters.size();
+ }
+
+ public void setData(@NonNull final List data) {
+ mData = data;
}
+
+ public List getData() {
+ return mData;
+ }
+
+
}
diff --git a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
index a068edc22d..74fb63067a 100644
--- a/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
+++ b/lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java
@@ -36,12 +36,12 @@ public void onViewRecycled(@NonNull final BaseViewHolder holder, final int posit
protected int viewType;
public BaseCell(int layoutId) {
- viewType = getClass().hashCode();
+ viewType = layoutId + getClass().hashCode();
LAYOUT_SPARSE_ARRAY.put(viewType, layoutId);
}
public BaseCell(View view) {
- viewType = getClass().hashCode();
+ viewType = view.hashCode() + getClass().hashCode();
VIEW_SPARSE_ARRAY.put(viewType, view);
}
diff --git a/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java b/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java
index dcb56b065c..4a41e71050 100644
--- a/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java
+++ b/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java
@@ -1,6 +1,7 @@
package com.blankj.subutil.util;
import android.content.Context;
+import android.content.res.Resources;
import android.telephony.TelephonyManager;
import com.blankj.utilcode.util.Utils;
@@ -36,7 +37,7 @@ public static String getCountryCodeByLanguage(String defaultValue) {
}
public static String getCountryByLanguage() {
- return Utils.getApp().getResources().getConfiguration().locale.getCountry();
+ return Resources.getSystem().getConfiguration().locale.getCountry();
}
public static String getCountryBySim() {
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/BaseTest.java b/subutil/lib/src/test/java/com/blankj/subutil/util/BaseTest.java
index d7dbca0823..7162d4ee6f 100644
--- a/subutil/lib/src/test/java/com/blankj/subutil/util/BaseTest.java
+++ b/subutil/lib/src/test/java/com/blankj/subutil/util/BaseTest.java
@@ -1,6 +1,8 @@
package com.blankj.subutil.util;
+import com.blankj.utilcode.util.Utils;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/TestUtils.java b/subutil/lib/src/test/java/com/blankj/subutil/util/TestUtils.java
index 5e09412922..78422556ed 100644
--- a/subutil/lib/src/test/java/com/blankj/subutil/util/TestUtils.java
+++ b/subutil/lib/src/test/java/com/blankj/subutil/util/TestUtils.java
@@ -1,5 +1,7 @@
package com.blankj.subutil.util;
+import com.blankj.utilcode.util.Utils;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/app.js b/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/app.js
deleted file mode 100644
index ae4a9a961c..0000000000
--- a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/app.js
+++ /dev/null
@@ -1 +0,0 @@
-var http = require('http');
\ No newline at end of file
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/index.htm b/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/index.htm
deleted file mode 100644
index 5d3ea5edde..0000000000
--- a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/index.htm
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- 文件上传表单
-
-
-
-文件上传：
-选择一个文件上传:
-
-
-
-
-
\ No newline at end of file
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/package.json b/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/package.json
deleted file mode 100644
index 6ca0b421cf..0000000000
--- a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "name": "nodeserver",
- "version": "1.0.0",
- "scripts": {
- "start": "node server.js"
- },
- "dependencies": {
- "cookie-parser": "^1.4.4",
- "express": "^4.16.4",
- "multer": "^1.4.1",
- "body-parser": "latest"
- }
-}
diff --git a/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/public/images/image_lena.jpg b/subutil/lib/src/test/java/com/blankj/subutil/util/http/nodeServer/public/images/image_lena.jpg
deleted file mode 100644
index ad90c8f96d72141d119ca71bd632b0261f5d7675..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 53220
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 | | | | | |