Managed messages unread counter in side nav bar

app/res/drawable/bg_msg_count_red.xml

@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/red_700"/>
+</shape>

app/res/layout/nav_drawer_list_item.xml

@@ -7,14 +7,47 @@
     android:orientation="horizontal"
     android:padding="16dp"
     android:gravity="center_vertical"
+    android:clipChildren="false"
+    android:clipToPadding="false"
     android:background="@color/cc_brand_color">
 
-    <ImageView
-        android:id="@+id/list_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:src="@drawable/commcare_actionbar_logo"
-        android:contentDescription="@null"/>
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <ImageView
+            android:id="@+id/list_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/commcare_actionbar_logo" />
+
+        <FrameLayout
+            android:id="@+id/badge_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|top"
+            android:background="@drawable/bg_msg_count_red"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingStart="4dp"
+            android:paddingEnd="4dp"
+            android:paddingVertical="1dp"
+            android:layout_marginEnd="-6dp"
+            android:layout_marginTop="-6dp"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_message_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:textColor="@android:color/white"
+                android:textSize="11sp" />
+        </FrameLayout>
+    </FrameLayout>
 
     <TextView
         android:id="@+id/list_title"
@@ -29,6 +62,5 @@
         android:layout_height="24dp"
         android:paddingStart="16dp"
         android:src="@drawable/ic_blue_forward"
-        app:tint="@android:color/white"
-        android:contentDescription="@null"/>
+        app:tint="@android:color/white"/>
 </LinearLayout>

app/src/org/commcare/navdrawer/BaseDrawerController.kt

@@ -30,7 +30,7 @@ class BaseDrawerController(
     private val activity: CommCareActivity<*>,
     private val binding: DrawerViewRefs,
     private val highlightSeatedApp: Boolean,
-    private val onItemClicked: (NavItemType, String?) -> Unit
+    private val onItemClicked: (NavItemType, String?) -> Unit,
 ) {
     private lateinit var drawerToggle: ActionBarDrawerToggle
     private lateinit var navDrawerAdapter: NavDrawerAdapter
@@ -42,7 +42,7 @@ class BaseDrawerController(
         COMMCARE_APPS,
         WORK_HISTORY,
         MESSAGING,
-        PAYMENTS
+        PAYMENTS,
     }
 
     fun setupDrawer() {
@@ -54,32 +54,36 @@ class BaseDrawerController(
     }
 
     private fun setupActionBarDrawerToggle() {
-        drawerToggle = object : ActionBarDrawerToggle(
-            activity,
-            binding.drawerLayout,
-            R.string.nav_drawer_open,
-            R.string.nav_drawer_close
-        ) {
-            override fun onDrawerOpened(drawerView: View) {
-                super.onDrawerOpened(drawerView)
-                ViewUtil.hideVirtualKeyboard(activity)
-                FirebaseAnalyticsUtil.reportNavDrawerOpen()
-            }
+        drawerToggle =
+            object : ActionBarDrawerToggle(
+                activity,
+                binding.drawerLayout,
+                R.string.nav_drawer_open,
+                R.string.nav_drawer_close,
+            ) {
+                override fun onDrawerOpened(drawerView: View) {
+                    super.onDrawerOpened(drawerView)
+                    ViewUtil.hideVirtualKeyboard(activity)
+                    FirebaseAnalyticsUtil.reportNavDrawerOpen()
+                }
 
-            override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-                super.onDrawerSlide(drawerView, slideOffset)
-                (activity as? AppCompatActivity)?.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_connect_close)
-                if (slideOffset > 0 && !hasRefreshed) {
-                    refreshDrawerContent()
-                    hasRefreshed = true
+                override fun onDrawerSlide(
+                    drawerView: View,
+                    slideOffset: Float,
+                ) {
+                    super.onDrawerSlide(drawerView, slideOffset)
+                    (activity as? AppCompatActivity)?.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_connect_close)
+                    if (slideOffset > 0 && !hasRefreshed) {
+                        refreshDrawerContent()
+                        hasRefreshed = true
+                    }
+                    if (slideOffset == 0f) hasRefreshed = false
                 }
-                if (slideOffset == 0f) hasRefreshed = false
-            }
 
-            override fun onDrawerClosed(drawerView: View) {
-                (activity as? AppCompatActivity)?.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_menu_bar)
+                override fun onDrawerClosed(drawerView: View) {
+                    (activity as? AppCompatActivity)?.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_menu_bar)
+                }
             }
-        }
         binding.drawerLayout.addDrawerListener(drawerToggle)
         (activity as? AppCompatActivity)?.apply {
             supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -93,34 +97,36 @@ class BaseDrawerController(
     }
 
     private fun initializeAdapter() {
-        navDrawerAdapter = NavDrawerAdapter(
-            activity,
-            emptyList(),
-            onParentClick = {
-                FirebaseAnalyticsUtil.reportNavDrawerItemSelected(it.title)
-                onItemClicked(it.type, null)
-            },
-            onChildClick = { parentType, childItem ->
-                FirebaseAnalyticsUtil.reportNavDrawerItemSelected(childItem.childTitle)
-                onItemClicked(parentType, childItem.recordId)
-            }
-        )
+        navDrawerAdapter =
+            NavDrawerAdapter(
+                activity,
+                emptyList(),
+                onParentClick = {
+                    FirebaseAnalyticsUtil.reportNavDrawerItemSelected(it.title)
+                    onItemClicked(it.type, null)
+                },
+                onChildClick = { parentType, childItem ->
+                    FirebaseAnalyticsUtil.reportNavDrawerItemSelected(childItem.childTitle)
+                    onItemClicked(parentType, childItem.recordId)
+                },
+            )
         binding.navDrawerRecycler.layoutManager = LinearLayoutManager(activity)
         binding.navDrawerRecycler.adapter = navDrawerAdapter
     }
 
     private fun setupListeners() {
         binding.signInButton.setOnClickListener {
-            PersonalIdManager.getInstance()
+            PersonalIdManager
+                .getInstance()
                 .launchPersonalId(
                     activity,
-                    ConnectConstants.LOGIN_CONNECT_LAUNCH_REQUEST_CODE
+                    ConnectConstants.LOGIN_CONNECT_LAUNCH_REQUEST_CODE,
                 )
             closeDrawer()
         }
         binding.aboutView.setOnClickListener {
             DialogCreationHelpers.showAboutCommCareDialog(
-                activity
+                activity,
             )
         }
         binding.notificationView.setOnClickListener {
@@ -137,30 +143,34 @@ class BaseDrawerController(
 
             val user = ConnectUserDatabaseUtil.getUser(activity)
             binding.userName.text = user.name
-            Glide.with(binding.imageUserProfile)
+            Glide
+                .with(binding.imageUserProfile)
                 .load(user.photo)
                 .apply(
-                    RequestOptions.circleCropTransform()
+                    RequestOptions
+                        .circleCropTransform()
                         .placeholder(R.drawable.nav_drawer_person_avatar)
-                        .error(R.drawable.nav_drawer_person_avatar)
+                        .error(R.drawable.nav_drawer_person_avatar),
                 ).into(binding.imageUserProfile)
 
             val appRecords = MultipleAppsUtil.getUsableAppRecords()
 
-            val seatedApp = if (highlightSeatedApp && appRecords.count() > 1) {
-                CommCareApplication.instance().currentApp.uniqueId
-            } else {
-                null
-            }
+            val seatedApp =
+                if (highlightSeatedApp && appRecords.count() > 1) {
+                    CommCareApplication.instance().currentApp.uniqueId
+                } else {
+                    null
+                }
 
-            val commcareApps = appRecords.map {
-                NavDrawerItem.ChildItem(
-                    it.displayName,
-                    it.uniqueId,
-                    NavItemType.COMMCARE_APPS,
-                    it.uniqueId == seatedApp
-                )
-            }
+            val commcareApps =
+                appRecords.map {
+                    NavDrawerItem.ChildItem(
+                        it.displayName,
+                        it.uniqueId,
+                        NavItemType.COMMCARE_APPS,
+                        it.uniqueId == seatedApp,
+                    )
+                }
 
             val hasConnectAccess = ConnectUserDatabaseUtil.hasConnectAccess(activity)
 
@@ -170,8 +180,8 @@ class BaseDrawerController(
                     NavDrawerItem.ParentItem(
                         activity.getString(R.string.nav_drawer_opportunities),
                         R.drawable.nav_drawer_opportunity_icon,
-                        NavItemType.OPPORTUNITIES
-                    )
+                        NavItemType.OPPORTUNITIES,
+                    ),
                 )
             }
 
@@ -182,24 +192,21 @@ class BaseDrawerController(
                     NavItemType.COMMCARE_APPS,
                     isEnabled = commcareApps.isNotEmpty(),
                     isExpanded = commcareApps.size < 2,
-                    children = commcareApps
-                )
+                    children = commcareApps,
+                ),
             )
 
             if (ConnectMessagingDatabaseHelper.getMessagingChannels(activity).isNotEmpty()) {
-                val iconId =
-                    if (ConnectMessagingDatabaseHelper.getUnviewedMessages(activity).isNotEmpty()) {
-                        R.drawable.nav_drawer_message_unread_icon
-                    } else {
-                        R.drawable.nav_drawer_message_icon
-                    }
+                val unreadCount = ConnectMessagingDatabaseHelper.getUnviewedMessages(activity).size
+                val messageCount = if (unreadCount > 0) unreadCount else null
 
                 items.add(
                     NavDrawerItem.ParentItem(
                         activity.getString(R.string.connect_messaging_title),
-                        iconId,
-                        NavItemType.MESSAGING
-                    )
+                        R.drawable.nav_drawer_message_icon,
+                        NavItemType.MESSAGING,
+                        badgeCount = messageCount,
+                    ),
                 )
             }
 
@@ -208,8 +215,8 @@ class BaseDrawerController(
                     NavDrawerItem.ParentItem(
                         activity.getString(R.string.personalid_work_history),
                         R.drawable.ic_work_history,
-                        NavItemType.WORK_HISTORY
-                    )
+                        NavItemType.WORK_HISTORY,
+                    ),
                 )
             }
 
@@ -242,9 +249,7 @@ class BaseDrawerController(
         return PersonalIdManager.getInstance().isloggedIn() && isFeatureEnabled(WORK_HISTORY)
     }
 
-    private fun shouldShowNotiifcations(): Boolean {
-        return PersonalIdManager.getInstance().isloggedIn() && isFeatureEnabled(NOTIFICATIONS)
-    }
+    private fun shouldShowNotiifcations(): Boolean = PersonalIdManager.getInstance().isloggedIn() && isFeatureEnabled(NOTIFICATIONS)
 
     fun closeDrawer() {
         binding.drawerLayout.closeDrawer(GravityCompat.START)
@@ -254,7 +259,5 @@ class BaseDrawerController(
         binding.drawerLayout.openDrawer(GravityCompat.START)
     }
 
-    fun handleOptionsItem(item: MenuItem): Boolean {
-        return drawerToggle.onOptionsItemSelected(item)
-    }
+    fun handleOptionsItem(item: MenuItem): Boolean = drawerToggle.onOptionsItemSelected(item)
 }