From 1fc471cb7ad9fbd0bc5d966dc8513fb0f5808bce Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 13 Jan 2025 16:38:58 +0100
Subject: [PATCH] String tweaks

---
 Habitica/res/layout/activity_task_form.xml      |  6 ++++--
 Habitica/res/values/strings.xml                 |  2 +-
 .../models/user/PushNotificationsPreference.kt  | 17 +++++++++++++++++
 .../habitica/ui/activities/TaskFormActivity.kt  |  4 ++++
 .../ui/viewmodels/MainActivityViewModel.kt      |  3 +++
 version.properties                              |  2 +-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 554d0c01e..3df398cf4 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -242,11 +242,13 @@
                     android:background="@drawable/layout_rounded_bg_yellow_10">
 
                     <TextView
+                        android:id="@+id/exact_alarm_disabled_text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="@dimen/spacing_medium"
+                        android:padding="12dp"
+                        android:gravity="center"
+                        android:fontFamily="@string/font_family_medium"
                         android:text="@string/exact_alarm_system_settings_reminders"
-                        android:textColor="@color/yellow_0"
                         android:textSize="12sp" />
                 </FrameLayout>
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 4b32420ed..99a73bdff 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="enable_notifications">Enable Notifications</string>
     <string name="push_notification_system_settings_description">Allow Habitica notifications in the Settings app to receive push notifications</string>
     <string name="push_notification_system_settings_reminders">Allow Habitica notifications in the Settings app to receive reminders</string>
-    <string name="exact_alarm_system_settings_reminders">Habitica does not have the `Alarms &amp; Reminders` permission in the Settings app. Reminders might not appear at the exact time.</string>
+    <string name="exact_alarm_system_settings_reminders">Reminders may be delayed because permissions aren\'t enabled. Tap to view and update permissions.</string>
     <string name="push_notification_system_settings_title">Notifications Disabled</string>
     <string name="push_notifications_sum">Set your push notifications settings</string>
     <string name="exact_alarm_system_settings_title">`Alarm &amp; Reminders` disabled`</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
index e08848c98..b4753f4a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
@@ -21,4 +21,21 @@ open class PushNotificationsPreference : RealmObject(), BaseObject {
     var mentionJoinedGuild: Boolean = false
     var mentionUnjoinedGuild: Boolean = false
     var contentRelease: Boolean = false
+
+    fun listOfEnabledKeys(): List<String> {
+        var enabled = mutableListOf<String>()
+        if (invitedParty) enabled.add("invitedParty")
+        if (invitedQuest) enabled.add("invitedQuest")
+        if (majorUpdates) enabled.add("majorUpdates")
+        if (wonChallenge) enabled.add("wonChallenge")
+        if (invitedGuild) enabled.add("invitedGuild")
+        if (newPM) enabled.add("newPM")
+        if (questStarted) enabled.add("questStarted")
+        if (giftedGems) enabled.add("giftedGems")
+        if (partyActivity) enabled.add("partyActivity")
+        if (mentionParty) enabled.add("mentionParty")
+        if (mentionJoinedGuild) enabled.add("mentionJoinedGuild")
+        if (contentRelease) enabled.add("contentRelease")
+        return enabled
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 547db53b1..0ef8de5b2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -229,6 +229,10 @@ class TaskFormActivity : BaseActivity() {
         supportActionBar?.setBackgroundDrawable(ColorDrawable(upperTintColor))
         binding.upperTextWrapper.setBackgroundColor(upperTintColor)
 
+        binding.exactAlarmDisabledContainer.background  = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_task_form)
+        binding.exactAlarmDisabledContainer.background.mutate().setTint(this.getThemeColor(R.attr.tintedUiMain))
+        binding.exactAlarmDisabledText.setTextColor(getThemeColor(R.attr.textColorTintedPrimary))
+
         isChallengeTask = bundle.getBoolean(IS_CHALLENGE_TASK, false)
 
         taskType = TaskType.from(bundle.getString(TASK_TYPE_KEY)) ?: TaskType.HABIT
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
index 2729ddc15..ac7e3fd59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
@@ -107,6 +107,9 @@ class MainActivityViewModel
                             "checkin_count",
                             user.loginIncentives.toString(),
                         )
+                        user.preferences?.pushNotifications?.listOfEnabledKeys()?.let {
+                            Analytics.setUserProperty("allowed_push_notifications", it)
+                        }
                         Analytics.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
                         pushNotificationManager.setUser(user)
                         if (!pushNotificationManager.notificationPermissionEnabled()) {
diff --git a/version.properties b/version.properties
index ac9ee06d8..b4d5de3e3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.6.0
-CODE=9301
\ No newline at end of file
+CODE=9311
\ No newline at end of file