migrate to AndroidX

sw926 · sw926 · commit 06b45376409d · 2019-11-13T14:47:04.000+08:00
diff --git a/README-zh.md b/README-zh.md
@@ -13,7 +13,7 @@ Maven
 <dependency>
     <groupId>com.sw926.imagefileselector</groupId>
     <artifactId>library</artifactId>
-    <version>1.0.10</version>
+    <version>1.0.16</version>
 </dependency>
 ```
 Gradle
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Maven
 <dependency>
     <groupId>com.sw926.imagefileselector</groupId>
     <artifactId>library</artifactId>
-    <version>1.0.10</version>
+    <version>1.0.16</version>
 </dependency>
 ```
 Gradle
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,13 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.sw926.imagefileselector.example"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 10
         versionName "1.0.7"
     }
@@ -28,7 +27,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     implementation project(':library')
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/app/src/main/java/com/sw926/imagefileselector/example/ExampleActivity.java b/app/src/main/java/com/sw926/imagefileselector/example/ExampleActivity.java
@@ -4,7 +4,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -114,7 +114,7 @@ public void run() {
                 builder.append("path: ");
                 builder.append(file);
                 builder.append("\n\n");
-                builder.append("length: ");
+                builder.append("size: ");
                 builder.append((int) (imageFile.length() / 1024d));
                 builder.append("KB");
                 builder.append("\n\n");
diff --git a/app/src/main/java/com/sw926/imagefileselector/example/ExampleFragment.java b/app/src/main/java/com/sw926/imagefileselector/example/ExampleFragment.java
@@ -5,7 +5,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -162,7 +162,7 @@ public void run() {
                 builder.append("path: ");
                 builder.append(file);
                 builder.append("\n\n");
-                builder.append("length: ");
+                builder.append("size: ");
                 builder.append((int) (imageFile.length() / 1024d));
                 builder.append("KB");
                 builder.append("\n\n");
diff --git a/app/src/main/java/com/sw926/imagefileselector/example/ExampleFragmentActivity.java b/app/src/main/java/com/sw926/imagefileselector/example/ExampleFragmentActivity.java
@@ -1,8 +1,8 @@
 package com.sw926.imagefileselector.example;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class ExampleFragmentActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/com/sw926/imagefileselector/example/LaunchActivity.java b/app/src/main/java/com/sw926/imagefileselector/example/LaunchActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 public class LaunchActivity extends AppCompatActivity implements View.OnClickListener {
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.3.50'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
@@ -28,3 +28,5 @@ POM_URL=https\://github.com/sw926/ImageFileSelector
 POM_SCM_CONNECTION=scm\:https\://github.com/sw926/ImageFileSelector.git
 RELEASE_REPOSITORY_URL=https\://oss.sonatype.org/service/local/staging/deploy/maven2
 GROUP=com.sw926.imagefileselector
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 06 12:07:54 CST 2018
+#Wed Nov 13 14:29:25 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,8 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 14
@@ -29,7 +28,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    compileOnly 'com.android.support:support-fragment:28.0.0'
+    compileOnly 'androidx.fragment:fragment:1.1.0'
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 //https://raw.githubusercontent.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle
diff --git a/library/src/main/java/com/sw926/imagefileselector/GenericFileProvider.java b/library/src/main/java/com/sw926/imagefileselector/GenericFileProvider.java
@@ -1,6 +1,6 @@
 package com.sw926.imagefileselector;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class GenericFileProvider extends FileProvider {
 
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImageCaptureHelper.kt b/library/src/main/java/com/sw926/imagefileselector/ImageCaptureHelper.kt
@@ -12,8 +12,8 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
-import android.support.v4.app.Fragment
-import android.support.v4.content.FileProvider
+import androidx.fragment.app.Fragment
+import androidx.core.content.FileProvider
 import android.text.TextUtils
 import com.sw926.imagefileselector.ErrorResult.*
 import java.io.File
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImageCompressHelper.kt b/library/src/main/java/com/sw926/imagefileselector/ImageCompressHelper.kt
@@ -1,11 +1,8 @@
 package com.sw926.imagefileselector
 
+import android.annotation.SuppressLint
 import android.graphics.Bitmap
 import android.os.AsyncTask
-import android.os.Build
-import android.os.Parcel
-import android.os.Parcelable
-
 import java.io.File
 import java.util.concurrent.Executors
 
@@ -14,101 +11,28 @@ class ImageCompressHelper {
 
     private var mCallback: Callback? = null
 
-    class CompressParams : Parcelable {
-        var outputPath: String? = null
-        var maxWidth = 1000
-        var maxHeight = 1000
-        var saveQuality = 80
-        var compressFormat: Bitmap.CompressFormat? = null
-
-        override fun describeContents(): Int {
-            return 0
-        }
-
-        override fun writeToParcel(dest: Parcel, flags: Int) {
-            dest.writeString(this.outputPath)
-            dest.writeInt(this.maxWidth)
-            dest.writeInt(this.maxHeight)
-            dest.writeInt(this.saveQuality)
-            dest.writeInt(this.compressFormat?.ordinal ?: -1)
-        }
-
-        constructor() {}
-
-        public constructor(source: Parcel) {
-            this.outputPath = source.readString()
-            this.maxWidth = source.readInt()
-            this.maxHeight = source.readInt()
-            this.saveQuality = source.readInt()
-            val tmpCompressFormat = source.readInt()
-            this.compressFormat = if (tmpCompressFormat == -1) null else Bitmap.CompressFormat.values()[tmpCompressFormat]
-        }
-
-        companion object {
-
-            val CREATOR: Parcelable.Creator<CompressParams> = object : Parcelable.Creator<CompressParams> {
-                override fun createFromParcel(source: Parcel): CompressParams {
-                    return CompressParams(source)
-                }
-
-                override fun newArray(size: Int): Array<CompressParams?> {
-                    return arrayOfNulls(size)
-                }
-            }
-        }
-    }
-
-
-    class CompressJop : Parcelable {
-        var inputFile: String
-        var params: CompressParams
-        var deleteInputFile = false
-
-        constructor(params: CompressParams, inputFile: String) {
-            this.params = params
-            this.inputFile = inputFile
-        }
-
-        override fun describeContents(): Int {
-            return 0
-        }
-
-        override fun writeToParcel(dest: Parcel, flags: Int) {
-            dest.writeString(this.inputFile)
-            dest.writeParcelable(this.params, flags)
-            dest.writeByte(if (this.deleteInputFile) 1.toByte() else 0.toByte())
-        }
-
-        public constructor(source: Parcel) {
-            this.inputFile = source.readString()
-            this.params = source.readParcelable(CompressParams::class.java.classLoader)
-            this.deleteInputFile = source.readByte().toInt() != 0
-        }
-
-        companion object {
-
-            val CREATOR: Parcelable.Creator<CompressJop> = object : Parcelable.Creator<CompressJop> {
-                override fun createFromParcel(source: Parcel): CompressJop {
-                    return CompressJop(source)
-                }
-
-                override fun newArray(size: Int): Array<CompressJop?> {
-                    return arrayOfNulls(size)
-                }
-            }
-        }
-    }
+    @SuppressLint("ParcelCreator")
+    data class CompressParams(
+            var outputPath: String? = null,
+            var maxWidth: Int = 1000,
+            var maxHeight: Int = 1000,
+            var saveQuality: Int = 80,
+            var compressFormat: Bitmap.CompressFormat? = null
+    )
+
+    @SuppressLint("ParcelCreator")
+    class CompressJop(
+            var inputFile: String,
+            var params: CompressParams = CompressParams(),
+            var deleteInputFile: Boolean = false
+    )
 
     fun setCallback(callback: Callback) {
         mCallback = callback
     }
 
     fun compress(jop: CompressJop) {
-        if (Build.VERSION.SDK_INT >= 11) {
-            CompressTask().executeOnExecutor(Executors.newCachedThreadPool(), jop)
-        } else {
-            CompressTask().execute(jop)
-        }
+        CompressTask().executeOnExecutor(Executors.newCachedThreadPool(), jop)
     }
 
     private inner class CompressTask : AsyncTask<CompressJop, Int, String>() {
@@ -121,12 +45,13 @@ class ImageCompressHelper {
             val format = if (param.compressFormat == null) CompressFormatUtils.parseFormat(jop.inputFile) else param.compressFormat
             AppLogger.i(TAG, "use compress format:" + format?.name)
 
-            if (param.outputPath == null) {
+            val outputPath = param.outputPath
+            if (outputPath == null) {
                 clearJop(jop)
                 return null
             }
 
-            val parentDir = File(param.outputPath)
+            val parentDir = File(outputPath)
             if (!parentDir.exists()) {
                 parentDir.mkdirs()
             }
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImageCropper.java b/library/src/main/java/com/sw926/imagefileselector/ImageCropper.java
@@ -8,8 +8,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.FileProvider;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 
 import java.io.File;
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImageFileSelector.kt b/library/src/main/java/com/sw926/imagefileselector/ImageFileSelector.kt
@@ -7,7 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import java.io.File
 
 class ImageFileSelector(context: Context) {
@@ -179,8 +179,10 @@ class ImageFileSelector(context: Context) {
         compressParams.outputPath?.let {
             val outDir = File(it)
 
-            if (outDir.absolutePath.startsWith(context.externalCacheDir.absolutePath)) {
-                return false
+            context.externalCacheDir?.let { cacheDir ->
+                if (outDir.absolutePath.startsWith(cacheDir.absolutePath)) {
+                    return false
+                }
             }
 
             if (outDir.absolutePath.startsWith(context.filesDir.absolutePath)) {
@@ -204,7 +206,7 @@ class ImageFileSelector(context: Context) {
 
             AppLogger.d(TAG, "get file: $file")
 
-            val jop = ImageCompressHelper.CompressJop(compressParams, file)
+            val jop = ImageCompressHelper.CompressJop(file, compressParams)
             jop.deleteInputFile = mDeleteOutputFile
             mImageCompressHelper.compress(jop)
         }
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImagePickHelper.kt b/library/src/main/java/com/sw926/imagefileselector/ImagePickHelper.kt
@@ -7,7 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.TextUtils
 import com.sw926.imagefileselector.ErrorResult.error
 import com.sw926.imagefileselector.ErrorResult.permissionDenied
diff --git a/library/src/main/java/com/sw926/imagefileselector/ImageUtils.java b/library/src/main/java/com/sw926/imagefileselector/ImageUtils.java
@@ -5,8 +5,8 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.media.ExifInterface;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/library/src/main/java/com/sw926/imagefileselector/PermissionsHelper.kt b/library/src/main/java/com/sw926/imagefileselector/PermissionsHelper.kt
@@ -5,8 +5,8 @@ import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
 import java.util.*
 
 /**
