From 52d7348151c17633cac0f5d1f4aeee3a231ca6d9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 9 Feb 2024 15:00:50 +0100
Subject: [PATCH] add support for gif

---
 Habitica/res/layout/chat_item.xml                 |  2 +-
 Habitica/res/values-night/colors.tavern.xml       |  4 ++--
 .../android/habitica/models/tasks/Task.kt         |  2 +-
 .../habitica/extensions/DataBindingUtils.kt       |  1 +
 fastlane/changelog.txt                            | 15 +++++++--------
 version.properties                                |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index 980af2e70..408dc813d 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -80,7 +80,7 @@
                             android:id="@+id/tvLikes"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_margin="5dp"
+                            android:layout_margin="8dp"
                             android:clickable="false"
                             android:focusable="false"
                             android:gravity="center_vertical" />
diff --git a/Habitica/res/values-night/colors.tavern.xml b/Habitica/res/values-night/colors.tavern.xml
index 7ae5acbb0..d642cbe8a 100644
--- a/Habitica/res/values-night/colors.tavern.xml
+++ b/Habitica/res/values-night/colors.tavern.xml
@@ -2,8 +2,8 @@
 <resources>
     <color name="tavern.nolikes.background">#0A0A0A</color>
     <color name="tavern.somelikes.background">#464646</color>
-    <color name="tavern.userliked.background">@color/text_green</color>
+    <color name="tavern.userliked.background">@color/green_50</color>
     <color name="tavern.nolikes.foreground">@color/gray_400</color>
     <color name="tavern.somelikes.foreground">@color/gray_700</color>
     <color name="tavern.userliked.foreground">@color/gray_700</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index cc020df93..ec9d0c58e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -359,7 +359,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
 
         // If the reminder is a todo, only schedule sole dueDate/time occurrence. Otherwise, schedule multiple occurrences in advance
         if (this.type == TaskType.TODO) {
-            occurrencesList.add(this.dueDate?.toZonedDateTime()?.withHour(reminderTime.hour)?.withMinute(reminderTime.minute) ?: return null)
+            occurrencesList.add((remindersItem.getZonedDateTime() ?: this.dueDate?.toZonedDateTime())?.withHour(reminderTime.hour)?.withMinute(reminderTime.minute) ?: return null)
             return occurrencesList
         }
         val now = ZonedDateTime.now().withZoneSameInstant(ZoneId.systemDefault())
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index 56ef209ef..a707da8cd 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -184,6 +184,7 @@ object DataBindingUtils {
         tempMap["Pet-Gryphatrice-Jubilant"] = "gif"
         tempMap["stable_Pet-Gryphatrice-Jubilant"] = "gif"
         tempMap["back_special_heroicAureole"] = "gif"
+        tempMap["Pet-HatchingPotion-Funghi"] = "gif"
         FILEFORMAT_MAP = tempMap
 
         val tempNameMap = mutableMapOf<String, String>()
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index a027f5f83..51007ad8b 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,8 +1,7 @@
-New in 4.3.3:
-- Reminders should show more reliably now
-- Remaining Armoire equipment no longer counts unreleased items
-- Better error handling when gifting
-- Avatar widget now displays correctly
-- Pets just got cuter! Tap a Pet or Mount to see them in an environment that changes each month.
-- New Subscriber benefits: Buy one Armoire, get another free! Also, get a second chance at life once a day when you run out of HP!
-- See answers to common Quest mechanic questions under your active Quest
+New in 4.3.4:
+
+To Do reminders should show more reliably
+Added password reset option to the Account Reset and Account Delete screens
+Group Plan invites will show in the notification center
+Added the ability to report a Challenge for community violations
+Various other bug fixes and improvements
diff --git a/version.properties b/version.properties
index fdc54212b..e7a9c161a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3.4
-CODE=6881
\ No newline at end of file
+CODE=6901
\ No newline at end of file