Update gradle & libraries. Fix removing badges on incorrect profile.

This commit is contained in:
kubasz 2019-12-02 21:53:37 +01:00
parent 8ae5e2b87a
commit 8b31921697
3 changed files with 8 additions and 8 deletions

View File

@ -23,8 +23,8 @@ buildscript {
androidX : '1.0.0',
annotation : '1.1.0',
recyclerView : '1.1.0-rc01',
material : '1.2.0-alpha01',
recyclerView : '1.1.0',
material : '1.2.0-alpha02',
appcompat : '1.1.0',
constraintLayout : '2.0.0-beta3',
cardview : '1.0.0',
@ -37,13 +37,13 @@ buildscript {
lifecycle : "2.2.0-rc02",
work : "2.2.0",
firebase : '17.2.0',
firebase : '17.2.1',
firebasemessaging: "20.0.0",
play_services : "17.0.0",
materialdialogs : "0.9.6.0",
materialdrawer : "cad66092a6",
iconics : "4.0.1-b02",
iconics : "4.0.1",
font_cmd : "3.5.95.1-kotlin",
gifdrawable : "1.2.15"
@ -55,7 +55,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.5.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
// NOTE: Do not place your application dependencies here; they belong

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

View File

@ -647,8 +647,8 @@ class NavDrawer(
if (it.drawerItemId == null)
return@forEach
if (it.profileId != currentProfile) {
Log.d("NavDebug", "- Remove badge for ${it.drawerItemId}")
drawer?.updateBadge(it.drawerItemId?.toLong() ?: 0, null)
//Log.d("NavDebug", "- Remove badge for ${it.drawerItemId}")
//drawer?.updateBadge(it.drawerItemId?.toLong() ?: 0, null)
return@forEach
}
Log.d("NavDebug", "- Set badge ${it.count} for ${it.drawerItemId}")