Merge pull request #2671 from mikepenz/develop

dev -> main
mikepenz · Oct 28, 2020 · 8c9a36c · 8c9a36c
2 parents c4c1bd6 + 6ce59da
commit 8c9a36c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin && New | [v8.1.7](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.7)
+- Kotlin && New | [v8.1.8](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.8)
 - Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
 - 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)
@@ -307,10 +307,6 @@ Overwrite the Style of the BezelImageView for the whole MaterialDrawer
 </style>
 ```
 
-### Prefer a Kotlin DSL?
-> Note this is currently not compatible with v8.
-Thanks to @zsmb13 there's now an (in)official Kotlin DSL wrapper for the MaterialDrawer https://github.com/zsmb13/MaterialDrawerKt
-
 # Used by
 (feel free to send me new projects)
 
@@ -376,10 +372,10 @@ Thanks to @zsmb13 there's now an (in)official Kotlin DSL wrapper for the Materia
 
 # Developed By
 
-* Mike Penz
- * [mikepenz.com](http://mikepenz.com) - <[email protected]>
- * [paypal.me/mikepenz](http://paypal.me/mikepenz)
-
+- Mike Penz
+  - [mikepenz.dev](https://mikepenz.dev) - [blog.mikepenz.dev](https://blog.mikepenz.dev) - <[email protected]>
+  - [paypal.me/mikepenz](http://paypal.me/mikepenz)
+  - [Automatic changelog generation action](https://github.com/marketplace/actions/release-changelog-builder)
 
 # License
 

diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "8.1.7",
-                versionCode: 8017
+                versionName: "8.1.8",
+                versionCode: 8018
         ]
 
         setup = [

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/model/interfaces/Iconable.kt b/library/src/main/java/com/mikepenz/materialdrawer/model/interfaces/Iconable.kt
@@ -24,11 +24,15 @@ fun <T : Iconable> T.withIconColor(iconColor: ColorStateList): T {
     return this
 }
 
-var <T : Iconable> T.iconDrawable: Drawable
+var <T : Iconable> T.iconDrawable: Drawable?
     @Deprecated(level = DeprecationLevel.ERROR, message = "Not readable")
     get() = throw UnsupportedOperationException("Please use the direct property")
     set(value) {
-        this.icon = ImageHolder(value)
+        if (value != null) {
+            this.icon = ImageHolder(value)
+        } else {
+            this.icon = null
+        }
     }
 
 var <T : Iconable> T.iconBitmap: Bitmap

diff --git a/library/src/main/java/com/mikepenz/materialdrawer/widget/MiniDrawerSliderView.kt b/library/src/main/java/com/mikepenz/materialdrawer/widget/MiniDrawerSliderView.kt
@@ -97,13 +97,13 @@ open class MiniDrawerSliderView @JvmOverloads constructor(context: Context, attr
             createItems()
         }
 
-    private var enableSelectedMiniDrawerItemBackground = false
+    var enableSelectedMiniDrawerItemBackground = false
         set(value) {
             field = value
             createItems()
         }
 
-    private var enableProfileClick = true
+    var enableProfileClick = true
         set(value) {
             field = value
             createItems()
@@ -334,6 +334,7 @@ open class MiniDrawerSliderView @JvmOverloads constructor(context: Context, attr
                             val drawerItem = drawer?.getDrawerItem(item.identifier)
                             if (drawerItem != null && !drawerItem.isSelected) {
                                 //set the selection
+                                drawer?.selectExtension?.deselect()
                                 drawer?.setSelection(item.identifier, true)
                             }
                         } else if (drawer?.onDrawerItemClickListener != null) {