Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Kotlin 1.4.21 | Coil 1.1.0 #2692

Merged
merged 1 commit into from
Dec 18, 2020
Merged

Update to Kotlin 1.4.21 | Coil 1.1.0 #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"

// used to showcase how to load images
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'com.github.bumptech.glide:glide:4.10.0'
kapt 'com.github.bumptech.glide:compiler:4.10.0'
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
implementation("io.coil-kt:coil:1.1.0")

// needed to fix glide androidX support
implementation "com.android.support:support-annotations:28.0.0"
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/com/mikepenz/materialdrawer/app/CollapsingToolbarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package com.mikepenz.materialdrawer.app
import android.graphics.Color
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions.centerCropTransform
import coil.load
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome
import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
Expand Down Expand Up @@ -77,7 +76,7 @@ class CollapsingToolbarActivity : AppCompatActivity() {
}

private fun loadBackdrop() {
Glide.with(this).load("https://unsplash.it/600/300/?random").apply(centerCropTransform()).into(binding.backdrop)
binding.backdrop.load("https://unsplash.it/600/300/?random")
}

private fun fillFab() {
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/mikepenz/materialdrawer/app/CustomApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import android.graphics.drawable.Drawable
import android.net.Uri
import android.widget.ImageView
import androidx.multidex.MultiDexApplication
import com.bumptech.glide.Glide
import coil.clear
import coil.load
import com.mikepenz.iconics.Iconics
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.utils.backgroundColorRes
Expand Down Expand Up @@ -39,11 +40,14 @@ class CustomApplication : MultiDexApplication() {
//initialize and create the image loader logic
DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
GlideApp.with(imageView.context).load(uri).placeholder(placeholder).into(imageView)
imageView.load(uri) {
allowHardware(false)
placeholder(placeholder)
}
}

override fun cancel(imageView: ImageView) {
Glide.with(imageView.context).clear(imageView)
imageView.clear()
}

override fun placeholder(ctx: Context, tag: String?): Drawable {
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/com/mikepenz/materialdrawer/app/MyAppGlideModule.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
drawerlayout : '1.1.1',
constraintLayout : '2.0.4',
cardview : '1.0.0',
kotlin : "1.4.20",
kotlin : "1.4.21",
fastadapter : "5.3.2",
iconics : "5.2.1",
aboutLibs : "8.6.3",
Expand Down