From eaf32c3d342f2b055ed0a164a06c30e8a7013aec Mon Sep 17 00:00:00 2001 From: Stephan Hener Date: Fri, 5 Jan 2018 10:35:45 +0100 Subject: [PATCH] MOD update gradle MOD update support dependencies MOD update glide FIX glide changes --- app/build.gradle | 8 ++++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- tedbottompicker/build.gradle | 20 +++++++++---------- .../adapter/ImageGalleryAdapter.java | 13 ++++++++---- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 00e8337..7901ad9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.0' + compileSdkVersion 27 + buildToolsVersion '26.0.2' defaultConfig { applicationId "gun0912.tedbottompickerdemo" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -28,7 +28,7 @@ repositories { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:26.0.0-beta2' + compile 'com.android.support:appcompat-v7:27.0.2' compile project(':tedbottompicker') compile 'gun0912.ted:tedpermission:1.0.3' diff --git a/build.gradle b/build.gradle index 39ffa83..b8fbd21 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7964388..0d9af0a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 07 10:02:54 CET 2017 +#Fri Jan 05 10:23:42 CET 2018 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.1-all.zip diff --git a/tedbottompicker/build.gradle b/tedbottompicker/build.gradle index ca7e503..235da75 100644 --- a/tedbottompicker/build.gradle +++ b/tedbottompicker/build.gradle @@ -29,12 +29,12 @@ ext { } android { - compileSdkVersion 26 - buildToolsVersion '26.0.0' + compileSdkVersion 27 + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -55,15 +55,15 @@ configurations { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:26.0.0-beta2' - compile 'com.android.support:design:26.0.0-beta2' - compile 'com.android.support:animated-vector-drawable:26.0.0-beta2' + compile 'com.android.support:appcompat-v7:27.0.2' + compile 'com.android.support:design:27.0.2' + compile 'com.android.support:animated-vector-drawable:27.0.2' - compile 'com.android.support:support-annotations:26.0.0-beta2' - javadocDeps 'com.android.support:support-annotations:26.0.0-beta2' - compile 'com.github.bumptech.glide:glide:3.7.0' + compile 'com.android.support:support-annotations:27.0.2' + javadocDeps 'com.android.support:support-annotations:27.0.2' + compile 'com.github.bumptech.glide:glide:4.4.0' compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.1@aar' - compile 'io.reactivex:rxjava:1.3.0' + compile 'io.reactivex:rxjava:1.3.2' compile 'io.reactivex:rxandroid:1.2.1' } diff --git a/tedbottompicker/src/main/java/gun0912/tedbottompicker/adapter/ImageGalleryAdapter.java b/tedbottompicker/src/main/java/gun0912/tedbottompicker/adapter/ImageGalleryAdapter.java index 312ecaa..8160779 100644 --- a/tedbottompicker/src/main/java/gun0912/tedbottompicker/adapter/ImageGalleryAdapter.java +++ b/tedbottompicker/src/main/java/gun0912/tedbottompicker/adapter/ImageGalleryAdapter.java @@ -12,6 +12,7 @@ import android.view.ViewGroup; import com.bumptech.glide.Glide; +import com.bumptech.glide.request.RequestOptions; import java.io.File; import java.lang.annotation.Retention; @@ -108,13 +109,17 @@ public void onBindViewHolder(final GalleryViewHolder holder, final int position) } else { Uri uri = pickerTile.getImageUri(); if (builder.imageProvider == null) { + Glide.with(context) .load(uri) .thumbnail(0.1f) - .dontAnimate() - .centerCrop() - .placeholder(R.drawable.ic_gallery) - .error(R.drawable.img_error) + .apply( + new RequestOptions() + .centerCrop() + .dontAnimate() + .placeholder(R.drawable.ic_gallery) + .error(R.drawable.img_error) + ) .into(holder.iv_thumbnail); } else { builder.imageProvider.onProvideImage(holder.iv_thumbnail, uri);