Androidx support

.gitignore

@@ -14,3 +14,77 @@ example/ios/Flutter/App.framework
 example/ios/Flutter/Flutter.framework
 example/ios/Flutter/flutter_assets
 example/ios/Pods
+example/android/gradle/*
+
+# Miscellaneous
+*.class
+*.lock
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Visual Studio Code related
+.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.packages
+.pub-cache/
+.pub/
+build/
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+android/gradle/*
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.0
+* **Breaking change** Migrate to AndroidX on android support library. 
+If you are using the android support library and you want to use that version, you should migrate to Androidx your project. 
+
+## 0.2.0
+* Added title and description as a parameter
+
 ## 0.1.0
 * Add return saved file path
 * Add save screenshot sample

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
@@ -22,17 +22,17 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    api 'com.android.support:appcompat-v7:27.1.0'
+    api 'androidx.core:core:1.0.0'
 }

android/image_picker_saver.iml

@@ -24,8 +24,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/classes/test/debug" />
+    <output url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -35,20 +35,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -73,63 +73,43 @@
     </content>
     <content url="file://$MODULE_DIR$/../example/build/image_picker_saver">
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/attr" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/generated/source/r" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/aapt_friendly_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/extractedTypedefs" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/intermediate-jars" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/javaPrecompile" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/library_and_local_jars_jni" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/packaged-aidl" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/packaged-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/packagedAssets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/library_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/packaged_res" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/public_res" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/publish-proguard" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/../example/build/image_picker_saver/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:/Users/hefang/development/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/home/nadia/flutter/bin/cache/artifacts/engine/android-arm/flutter.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
   </component>
 </module>

android/src/main/java/io/flutter/plugins/imagepickersaver/ImagePickerDelegate.java

@@ -12,15 +12,15 @@
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.FileProvider;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.FileProvider;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
@@ -282,7 +282,11 @@ public void saveImageToGallery(MethodCall methodCall, MethodChannel.Result resul
 
         //Bitmap bitmap = BitmapFactory.decodeByteArray(fileData, 0, fileData.length);
 
-        String filePath = CapturePhotoUtils.insertImage(activity.getContentResolver(), fileData, "Camera", "123");
+        String title = methodCall.argument("title") == null? "Camera": methodCall.argument("title").toString();
+
+        String desctiption = methodCall.argument("description") == null? "123": methodCall.argument("description").toString();
+
+        String filePath = CapturePhotoUtils.insertImage(activity.getContentResolver(), fileData, title, desctiption);
 
         finishWithSuccess(filePath);
 

android/src/main/java/io/flutter/plugins/imagepickersaver/ImagePickerFileProvider.java

@@ -1,6 +1,7 @@
 package io.flutter.plugins.imagepickersaver;
 
-import android.support.v4.content.FileProvider;
+
+import androidx.core.content.FileProvider;
 
 /**
  * Providing a custom {@code FileProvider} prevents manifest {@code <provider>} name collisions.

android/src/main/java/io/flutter/plugins/imagepickersaver/ImagePickerSaverPlugin.java

@@ -5,11 +5,11 @@
 package io.flutter.plugins.imagepickersaver;
 
 import android.os.Environment;
-import android.support.annotation.VisibleForTesting;
 
 import java.io.File;
 import java.io.IOException;
 
+import androidx.annotation.VisibleForTesting;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;