From 15a352982b80bbf485c6467c93b8b3180738744c Mon Sep 17 00:00:00 2001 From: Carl Vuorinen Date: Sun, 17 Mar 2019 21:47:24 +0200 Subject: [PATCH] Set notifications count to badge in drawer --- .../android/habitica/ui/activities/MainActivity.kt | 1 + .../habitica/ui/fragments/NavigationDrawerFragment.kt | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index f95e2e1cf..ce0386af1 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -374,6 +374,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { displayDeathDialogIfNeeded() YesterdailyDialog.showDialogIfNeeded(this, user?.id, userRepository, taskRepository) + drawerFragment?.setNotificationsCount(this.user?.notifications?.count() ?: 0) drawerFragment?.setMessagesCount(this.user?.inbox?.newMessages ?: 0) drawerFragment?.setSettingsCount(if (this.user?.flags?.isVerifiedUsername != true) 1 else 0 ) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index 5c9531386..93c9cf919 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -306,6 +306,15 @@ class NavigationDrawerFragment : DialogFragment() { outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition) } + fun setNotificationsCount(unreadNotifications: Int) { + if (unreadNotifications == 0) { + notificationsBadge.visibility = View.GONE + } else { + notificationsBadge.visibility = View.VISIBLE + notificationsBadge.text = unreadNotifications.toString() + } + } + fun setMessagesCount(unreadMessages: Int) { if (unreadMessages == 0) { messagesBadge.visibility = View.GONE