github/NavLib
1
0
Fork 0
mirror of https://github.com/kuba2k2/NavLib.git synced 2025-02-23 15:04:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix removing badges on other profiles. Deselect mini drawer if item not present.

Browse Source
This commit is contained in:
kubasz 2019-09-13 16:53:54 +02:00
parent 3ed34a4705
commit 8a707ebec7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt
View File

@ -23,6 +23,7 @@ import com.mikepenz.materialdrawer.holder.StringHolder
import com.mikepenz.materialdrawer.model.BaseDrawerItem import com.mikepenz.materialdrawer.model.BaseDrawerItem
import com.mikepenz.materialdrawer.model.ProfileDrawerItem import com.mikepenz.materialdrawer.model.ProfileDrawerItem
import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
import com.mikepenz.materialdrawer.model.interfaces.Badgeable
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
import com.mikepenz.materialdrawer.model.interfaces.IProfile import com.mikepenz.materialdrawer.model.interfaces.IProfile
import pl.szczodrzynski.navlib.* import pl.szczodrzynski.navlib.*
@ -491,6 +492,7 @@ class NavDrawer(
if (drawer?.currentSelection != id.toLong() || !fireOnClick) if (drawer?.currentSelection != id.toLong() || !fireOnClick)
drawer?.setSelection(id.toLong(), fireOnClick) drawer?.setSelection(id.toLong(), fireOnClick)
miniDrawer?.setSelection(-1L)
if (drawerMode == DRAWER_MODE_MINI) if (drawerMode == DRAWER_MODE_MINI)
miniDrawer?.setSelection(id.toLong()) miniDrawer?.setSelection(id.toLong())
} }
@ -629,6 +631,13 @@ class NavDrawer(
currentProfileObj = profileList.singleOrNull { it.id == currentProfile } currentProfileObj = profileList.singleOrNull { it.id == currentProfile }
drawer?.drawerItems?.forEachIndexed { index, item ->
if (item is Badgeable<*>) {
item.withBadge(null)
drawer!!.updateItem(item)
}
}
Log.d("NavDebug", "updateBadges()") Log.d("NavDebug", "updateBadges()")
unreadCounterList.map { unreadCounterList.map {
it.drawerItemId = unreadCounterTypeMap[it.type] it.drawerItemId = unreadCounterTypeMap[it.type]

1
navlib/src/main/res/layout/nav_view.xml
View File

@ -48,6 +48,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<pl.szczodrzynski.navlib.NavToolbar <pl.szczodrzynski.navlib.NavToolbar
style="@style/Widget.MaterialComponents.Toolbar.Surface"
android:id="@+id/nv_toolbar" android:id="@+id/nv_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"