Merge branch 'main' of github.com:hamedgramzi/MaterialDrawer into dev…

…elop # Conflicts: # app/build.gradle
mikepenz · Jun 24, 2022 · d84db5b · d84db5b
2 parents de8bfb9 + ad13991
commit d84db5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -75,7 +75,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"
 
     // used to showcase how to load images
-    implementation('io.coil-kt:coil:2.1.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/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)
         }