Merge pull request #2781 from mikepenz/develop

dev -> main
mikepenz · Jun 24, 2022 · 8a921ae · 8a921ae
2 parents e549e06 + 310b594
commit 8a921ae
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,7 +37,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    git (1.7.0)
+    git (1.11.0)
       rchardet (~> 1.8)
     kramdown (2.3.1)
       rexml

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin && Material 3 | [v9.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v9.0.0)
+- Kotlin && Material 3 | [v9.0.1](https://github.com/mikepenz/MaterialDrawer/tree/v9.0.1)
 - Kotlin | [v8.4.5](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.5)
 - Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
 - Java && AppCompat | [v6.0.9](https://github.com/mikepenz/MaterialDrawer/tree/v6.0.9)

diff --git a/app/build.gradle b/app/build.gradle
@@ -69,11 +69,13 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
     implementation "androidx.cardview:cardview:${versions.cardview}"
     implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
-    implementation "androidx.slidingpanelayout:slidingpanelayout:${versions.slidingpaneLayout}"
+    implementation("androidx.slidingpanelayout:slidingpanelayout:${versions.slidingpaneLayout}") {
+        force true
+    }
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"
 
     // used to showcase how to load images
-    implementation("io.coil-kt:coil:1.4.0")
+    implementation("io.coil-kt:coil:2.1.0")
 
     // the sample uses more advanced functions of the fastadapter
     // https://github.com/mikepenz/FastAdapter/

diff --git a/app/src/main/java/com/mikepenz/materialdrawer/app/CustomApplication.kt b/app/src/main/java/com/mikepenz/materialdrawer/app/CustomApplication.kt
@@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.widget.ImageView
 import androidx.multidex.MultiDexApplication
-import coil.clear
+import coil.dispose
 import coil.load
 import com.google.android.material.color.DynamicColors
 import com.mikepenz.iconics.Iconics
@@ -50,7 +50,7 @@ class CustomApplication : MultiDexApplication() {
             }
 
             override fun cancel(imageView: ImageView) {
-                imageView.clear()
+                imageView.dispose()
             }
 
             override fun placeholder(ctx: Context, tag: String?): Drawable {

diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "9.0.0",
-                versionCode: 9000
+                versionName: "9.0.1",
+                versionCode: 9001
         ]
 
         setup = [
@@ -18,15 +18,15 @@ buildscript {
                 annotation        : '1.1.0',
                 recyclerView      : '1.2.1',
                 core              : '1.7.0',
-                material          : '1.5.0',
-                appcompat         : '1.4.1',
+                material          : '1.6.1',
+                appcompat         : '1.4.2',
                 drawerlayout      : '1.1.1',
-                constraintLayout  : '2.1.3',
+                constraintLayout  : '2.1.4',
                 cardview          : '1.0.0',
-                kotlin            : "1.6.20",
+                kotlin            : "1.7.0",
                 fastadapter       : "5.6.0",
                 iconics           : "5.3.3",
-                aboutLibs         : "10.1.0",
+                aboutLibs         : "10.3.1",
                 navigation        : "2.4.2",
                 detekt            : '1.18.1',
                 slidingpaneLayout : "1.1.0", // no plans to upgrade to 1.2.0 anymore
@@ -41,7 +41,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/materialdrawer/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.kt b/materialdrawer/src/main/java/com/mikepenz/materialdrawer/model/MiniDrawerItem.kt
@@ -133,7 +133,7 @@ open class MiniDrawerItem : BaseDrawerItem<MiniDrawerItem, MiniDrawerItem.ViewHo
 
         if (enableSelectedBackground) {
             //get the correct color for the background
-            val selectedColor = getSelectedColor(ctx)
+            val selectedColor = selectedColor?.color(ctx) ?: getSelectedColor(ctx)
             //set the background for the item
             themeDrawerItem(ctx, holder.view, selectedColor, isSelectedBackgroundAnimated, shapeAppearanceModel, isSelected = isSelected)
         }