fix notification icon

HabitRPG · May 30, 2024 · 517f77a · 517f77a
1 parent 3351238
commit 517f77a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Habitica/res/drawable/pill_bg_purple_300.xml b/Habitica/res/drawable/pill_bg_purple_300.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/background_brand"/>
+    <solid android:color="@color/brand_300"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
diff --git a/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/...tica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -17,7 +17,9 @@ import androidx.core.view.GravityCompat
 import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.SimpleItemAnimator
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
@@ -652,8 +654,10 @@ class NavigationDrawerFragment : DialogFragment() {
         // set UP the drawer's list view with items and click listener
 
         lifecycleScope.launchCatching {
-            viewModel.getNotificationCount().collect {
-                setNotificationsCount(it)
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.getNotificationCount().collect {
+                    setNotificationsCount(it)
+                }
             }
         }
         lifecycleScope.launchCatching {

diff --git a/...g/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt b/...g/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt
@@ -313,7 +313,7 @@ internal fun EmptyFooter(type: String?, hasItems: Boolean) {
             },
     ) {
         Image(
-            painterResource(if (type == "backgrounds") R.drawable.customization_background else R.drawable.customization_mix),
+            painterResource(if (type == "background") R.drawable.customization_background else R.drawable.customization_mix),
             null,
             modifier = Modifier.padding(bottom = 16.dp),
         )

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3.7
-CODE=7781
+CODE=7801
-Original file line number
+Diff line change
@@ Expand Up @@
                 },
         ) {
             Image(
-                painterResource(if (type == "backgrounds") R.drawable.customization_background else R.drawable.customization_mix),
+                painterResource(if (type == "background") R.drawable.customization_background else R.drawable.customization_mix),
                 null,
                 modifier = Modifier.padding(bottom = 16.dp),
             )
@@ Expand Down @@