From 23663d2a94f010e8d7c794ec1a1d56f7fd512145 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 20 Jan 2023 14:08:16 +0100
Subject: [PATCH] final fixes

---
 Habitica/res/layout/notification_item.xml     |  5 ++-
 .../ui/fragments/NavigationDrawerFragment.kt  |  4 +-
 .../ui/views/promo/BirthdayMenuView.kt        | 37 +++++++++----------
 version.properties                            |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Habitica/res/layout/notification_item.xml b/Habitica/res/layout/notification_item.xml
index 1ec0a056d..af7f0a0b1 100644
--- a/Habitica/res/layout/notification_item.xml
+++ b/Habitica/res/layout/notification_item.xml
@@ -11,10 +11,11 @@
 
     <com.habitrpg.common.habitica.views.PixelArtView
         android:id="@+id/notification_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_marginEnd="20dp"
         android:background="@color/transparent"
+        android:layout_gravity="center_vertical"
         android:visibility="gone" />
 
     <TextView
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 4c95054d8..bc517cac0 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
@@ -168,7 +168,7 @@ class NavigationDrawerFragment : DialogFragment() {
                         updateSeasonalMenuEntries(gearEvent, pair.second)
                     }
 
-                    val event = pair.first.events.firstOrNull { it.eventKey == "birthday10" }
+                    val event = configManager.getBirthdayEvent()
                     val item = getItemWithIdentifier(SIDEBAR_BIRTHDAY)
                     if (event != null && item == null) {
                         adapter.currentEvent = event
@@ -182,7 +182,7 @@ class NavigationDrawerFragment : DialogFragment() {
                     } else if (event == null && item != null) {
                         item.isVisible = false
                         adapter.updateItem(item)
-                        (activity as? MainActivity)?.showBirthdayIcon = true
+                        (activity as? MainActivity)?.showBirthdayIcon = false
                     }
                 }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
index 3ac7cf869..ccaf376eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/promo/BirthdayMenuView.kt
@@ -53,8 +53,7 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
             .fillMaxWidth()
             .clickable {
                 MainNavigationController.navigate(R.id.birthdayActivity)
-            }
-    ) {
+            }) {
         Column(Modifier.fillMaxWidth()) {
             Box(
                 contentAlignment = Alignment.CenterStart,
@@ -63,8 +62,9 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
                     .fillMaxWidth()
                     .background(colorResource(R.color.brand_100))
             ) {
-                Row(Modifier
-                    .align(Alignment.CenterEnd)) {
+                Row(
+                    Modifier.align(Alignment.CenterEnd)
+                ) {
                     Image(
                         painterResource(R.drawable.birthday_menu_gems),
                         null,
@@ -82,11 +82,8 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
                 }
                 Column(
                     verticalArrangement = Arrangement.spacedBy(
-                        2.dp,
-                        Alignment.CenterVertically
-                    ),
-                    modifier = Modifier
-                        .padding(start = 8.dp)
+                        2.dp, Alignment.CenterVertically
+                    ), modifier = Modifier.padding(start = 8.dp)
                 ) {
                     Image(
                         painterResource(R.drawable.birthday_menu_text), null
@@ -127,16 +124,21 @@ fun BirthdayBanner(endDate: Date, modifier: Modifier = Modifier) {
     }
 }
 
+@Composable
+private fun buildString(
+    value: Int, endDate: Date, formatString: Int
+): String {
+    return stringResource(
+        formatString, endDate.getShortRemainingString()
+    ).uppercase()
+}
+
 @Composable
 fun TimeRemainingText(
-    endDate: Date,
-    formatString: Int,
-    color: Color,
-    fontSize: TextUnit,
-    fontWeight: FontWeight
+    endDate: Date, formatString: Int, color: Color, fontSize: TextUnit, fontWeight: FontWeight
 ) {
     var value by remember { mutableStateOf(0) }
-    LaunchedEffect(Unit) {
+    LaunchedEffect(value) {
         val diff = endDate.time - Date().time
         if (diff.milliseconds > 1.hours) {
             delay(1.minutes)
@@ -148,10 +150,7 @@ fun TimeRemainingText(
         value += 1
     }
     Text(
-        stringResource(
-            formatString,
-            endDate.getShortRemainingString()
-        ).uppercase(),
+        buildString(value = value, endDate = endDate, formatString = formatString),
         color = color,
         fontSize = fontSize,
         fontWeight = fontWeight
diff --git a/version.properties b/version.properties
index b4641220f..7f4b13edc 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.1
-CODE=5081
\ No newline at end of file
+CODE=5101
\ No newline at end of file