Skip to content

Commit 8c9a36c

Browse files
authored
Merge pull request #2671 from mikepenz/develop
dev -> main
2 parents c4c1bd6 + 6ce59da commit 8c9a36c

4 files changed

Lines changed: 16 additions & 15 deletions

File tree

README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
## Latest releases 🛠
5151

52-
- Kotlin && New | [v8.1.7](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.7)
52+
- Kotlin && New | [v8.1.8](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.8)
5353
- Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
5454
- Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
5555
- 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
307307
</style>
308308
```
309309

310-
### Prefer a Kotlin DSL?
311-
> Note this is currently not compatible with v8.
312-
Thanks to @zsmb13 there's now an (in)official Kotlin DSL wrapper for the MaterialDrawer https://github.com/zsmb13/MaterialDrawerKt
313-
314310
# Used by
315311
(feel free to send me new projects)
316312

@@ -376,10 +372,10 @@ Thanks to @zsmb13 there's now an (in)official Kotlin DSL wrapper for the Materia
376372

377373
# Developed By
378374

379-
* Mike Penz
380-
* [mikepenz.com](http://mikepenz.com) - <mikepenz@gmail.com>
381-
* [paypal.me/mikepenz](http://paypal.me/mikepenz)
382-
375+
- Mike Penz
376+
- [mikepenz.dev](https://mikepenz.dev) - [blog.mikepenz.dev](https://blog.mikepenz.dev) - <mikepenz@gmail.com>
377+
- [paypal.me/mikepenz](http://paypal.me/mikepenz)
378+
- [Automatic changelog generation action](https://github.com/marketplace/actions/release-changelog-builder)
383379

384380
# License
385381

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ buildscript {
33

44
ext {
55
release = [
6-
versionName: "8.1.7",
7-
versionCode: 8017
6+
versionName: "8.1.8",
7+
versionCode: 8018
88
]
99

1010
setup = [

library/src/main/java/com/mikepenz/materialdrawer/model/interfaces/Iconable.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ fun <T : Iconable> T.withIconColor(iconColor: ColorStateList): T {
2424
return this
2525
}
2626

27-
var <T : Iconable> T.iconDrawable: Drawable
27+
var <T : Iconable> T.iconDrawable: Drawable?
2828
@Deprecated(level = DeprecationLevel.ERROR, message = "Not readable")
2929
get() = throw UnsupportedOperationException("Please use the direct property")
3030
set(value) {
31-
this.icon = ImageHolder(value)
31+
if (value != null) {
32+
this.icon = ImageHolder(value)
33+
} else {
34+
this.icon = null
35+
}
3236
}
3337

3438
var <T : Iconable> T.iconBitmap: Bitmap

library/src/main/java/com/mikepenz/materialdrawer/widget/MiniDrawerSliderView.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ open class MiniDrawerSliderView @JvmOverloads constructor(context: Context, attr
9797
createItems()
9898
}
9999

100-
private var enableSelectedMiniDrawerItemBackground = false
100+
var enableSelectedMiniDrawerItemBackground = false
101101
set(value) {
102102
field = value
103103
createItems()
104104
}
105105

106-
private var enableProfileClick = true
106+
var enableProfileClick = true
107107
set(value) {
108108
field = value
109109
createItems()
@@ -334,6 +334,7 @@ open class MiniDrawerSliderView @JvmOverloads constructor(context: Context, attr
334334
val drawerItem = drawer?.getDrawerItem(item.identifier)
335335
if (drawerItem != null && !drawerItem.isSelected) {
336336
//set the selection
337+
drawer?.selectExtension?.deselect()
337338
drawer?.setSelection(item.identifier, true)
338339
}
339340
} else if (drawer?.onDrawerItemClickListener != null) {

0 commit comments

Comments
 (0)