Skip to content

Commit

Permalink
MOD update gradle
Browse files Browse the repository at this point in the history
MOD update support dependencies
MOD update glide
FIX glide changes
  • Loading branch information
sth-tractive committed Jan 5, 2018
1 parent fbdb105 commit eaf32c3
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 21 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions tedbottompicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit eaf32c3

Please sign in to comment.