merge with dev

app/build.gradle

@@ -24,15 +24,15 @@ android {
             storePassword ""
         }
     }
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.kbeanie.multipicker.sample"
         minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 13
-        versionName "1.3"
+        targetSdkVersion 27
+        versionCode 14
+        versionName "1.6.1"
     }
     buildTypes {
         release {
@@ -65,17 +65,17 @@ gradle.taskGraph.whenReady { taskGraph ->
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile project(':multipicker')
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation project(':multipicker')
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
         transitive = true;
     }
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.google.android.gms:play-services-base:10.2.1'
-    compile 'com.google.android.gms:play-services-ads:10.2.1'
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:1.0.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.google.android.gms:play-services-base:16.0.1'
+    implementation 'com.google.android.gms:play-services-ads:17.1.0'
+    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.1.0'
 }

app/src/main/AndroidManifest.xml

@@ -98,7 +98,9 @@
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="ccbe3957847c84647fbf4938cf6adb0da0a5583e" />
-
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-0799630550074661~7339318802"/>
     </application>
 
 

app/src/main/java/com/kbeanie/multipicker/sample/AbActivity.java

@@ -42,8 +42,9 @@ public void setContentView(@LayoutRes int layoutResID) {
     public final static String TEST_OPO = "BB5687CFDF9B599D839B1104E0A27DFC";
     public final static String XIAOMI = "EEAEE535D859D6F87E56B88B7A65D984";
     public final static String TEMP_DEVICE = "6AD51385081B9D970E623E078AADEA4A";
+    public final static String ONEPLUS_6 = "24F27F547DF8E70EE386AFE4D978DA68";
 
-    private final static String[] TEST_DEVICES = {GALAXY_TAB, NEXUS_S, TEST_DEVICE_ID_2, TEST_GALAXY_NEXUS, TEST_OPO, TEMP_DEVICE, XIAOMI};
+    private final static String[] TEST_DEVICES = {GALAXY_TAB, NEXUS_S, TEST_DEVICE_ID_2, TEST_GALAXY_NEXUS, TEST_OPO, TEMP_DEVICE, XIAOMI, ONEPLUS_6};
 
     protected void setupAds() {
         adView = (AdView) findViewById(R.id.adView);

app/src/main/java/com/kbeanie/multipicker/sample/AbApplication.java

@@ -3,6 +3,10 @@
 import android.app.Application;
 
 import com.crashlytics.android.Crashlytics;
+import com.google.android.gms.ads.MobileAds;
+import com.kbeanie.multipicker.api.Picker;
+import com.kbeanie.multipicker.core.PickerManager;
+import com.kbeanie.multipicker.sample.utils.PickerUtils;
 
 import io.fabric.sdk.android.Fabric;
 
@@ -17,5 +21,8 @@ public void onCreate() {
         if (!BuildConfig.DEBUG) {
             Fabric.with(this, new Crashlytics());
         }
+
+        MobileAds.initialize(this);
+        PickerManager.debugglable = true;
     }
 }

app/src/main/java/com/kbeanie/multipicker/sample/HomeActivity.java

@@ -16,7 +16,10 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.kbeanie.multipicker.api.Picker;
+import com.kbeanie.multipicker.core.PickerManager;
 import com.kbeanie.multipicker.sample.adapters.DemosAdapter;
+import com.kbeanie.multipicker.sample.utils.PickerUtils;
 
 /**
  * Created by kbibek on 2/18/16.
@@ -35,6 +38,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         lvDemoTypes.setOnItemClickListener(this);
 
         requestExternalStoragePermission();
+
+        PickerManager.debugglable = true;
     }
 
     @Override
@@ -180,11 +185,13 @@ private void requestExternalStoragePermission() {
         if ((ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE)
                 != PackageManager.PERMISSION_GRANTED) || (ContextCompat.checkSelfPermission(this,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                Manifest.permission.READ_CONTACTS)
+                != PackageManager.PERMISSION_GRANTED) || (ContextCompat.checkSelfPermission(this,
+                Manifest.permission.READ_EXTERNAL_STORAGE)
                 != PackageManager.PERMISSION_GRANTED)) {
 
             ActivityCompat.requestPermissions(this,
-                    new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_CONTACTS},
+                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_CONTACTS},
                     EXTERNAL_STORAGE_PERMISSION_REQUEST);
         }
     }

app/src/main/java/com/kbeanie/multipicker/sample/ImagePickerActivity.java

@@ -86,6 +86,7 @@ public void onClick(View v) {
 
     public void pickImageSingle() {
         imagePicker = new ImagePicker(this);
+        imagePicker.setDebugglable(true);
         imagePicker.setFolderName("Random");
         imagePicker.setRequestId(1234);
         imagePicker.ensureMaxSize(500, 500);
@@ -94,7 +95,7 @@ public void pickImageSingle() {
         imagePicker.setImagePickerCallback(this);
         Bundle bundle = new Bundle();
         bundle.putInt("android.intent.extras.CAMERA_FACING", 1);
-        imagePicker.setCacheLocation(PickerUtils.getSavedCacheLocation(this));
+        imagePicker.setCacheLocation(CacheLocation.EXTERNAL_STORAGE_PUBLIC_DIR);
         imagePicker.pickImage();
     }
 

app/src/main/java/com/kbeanie/multipicker/sample/ImagePreviewActivity.java

@@ -48,7 +48,7 @@ private void displayImage() {
 
         Glide.with(this)
                 .load(Uri.fromFile(new File(uri)))
-                .placeholder(R.drawable.ic_image)
+//                .placeholder(R.drawable.ic_image)
                 .into(ivImageGlide);
     }
 }

build.gradle

@@ -3,10 +3,17 @@
 buildscript {
     repositories {
         jcenter()
+        google()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,6 +22,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 15 13:29:56 IST 2017
+#Mon Jan 28 10:26:17 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

multipicker/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'signing'
 
-version = "1.3"
+version = "1.6"
 group = "com.github.deinlandel"
 
 def sonatypeRepo = ""
@@ -76,12 +76,12 @@ android {
         }
     }
 
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -115,7 +115,7 @@ gradle.taskGraph.whenReady { taskGraph ->
 }
 
 dependencies {
-    provided 'com.android.support:appcompat-v7:25.3.1'
-    compile 'junit:junit:4.12'
-    compile 'com.android.support:support-v4:25.3.1'
+    compileOnly 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'junit:junit:4.12'
+    implementation 'com.android.support:support-v4:27.1.1'
 }

multipicker/src/main/java/com/kbeanie/multipicker/api/AudioPicker.java

@@ -22,7 +22,7 @@
 /**
  * Class to pick an audio file.
  */
-public final class AudioPicker extends PickerManager {
+public class AudioPicker extends PickerManager {
     private final static String TAG = AudioPicker.class.getSimpleName();
     private AudioPickerCallback callback;
 

multipicker/src/main/java/com/kbeanie/multipicker/api/CameraImagePicker.java

@@ -9,7 +9,7 @@
 /**
  * Capture an image using the device's camera.
  */
-public final class CameraImagePicker extends ImagePickerImpl {
+public class CameraImagePicker extends ImagePickerImpl {
     /**
      * Constructor for triggering capture from an {@link Activity}
      *

multipicker/src/main/java/com/kbeanie/multipicker/api/CameraVideoPicker.java

@@ -9,7 +9,7 @@
 /**
  * Captures a video using the device's Camera
  */
-public final class CameraVideoPicker extends VideoPickerImpl {
+public class CameraVideoPicker extends VideoPickerImpl {
 
     /**
      * Constructor for triggering Video capture from an {@link Activity}