diff --git a/Habitica/res/drawable/pill_bg_purple_300.xml b/Habitica/res/drawable/pill_bg_purple_300.xml index 52a6171f6..048095726 100644 --- a/Habitica/res/drawable/pill_bg_purple_300.xml +++ b/Habitica/res/drawable/pill_bg_purple_300.xml @@ -1,6 +1,6 @@ - + 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 2d6df6d12..18353081e 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 @@ -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/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt index 13b5fb2fa..e361a18bb 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/ComposeAvatarEquipmentFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/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 index b21d927e8..0900d9463 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.3.7 -CODE=7781 \ No newline at end of file +CODE=7801 \ No newline at end of file