From 6fe25ddce4829b688fa830e58d36a9faa48256b2 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 25 Sep 2019 21:25:43 +0200 Subject: [PATCH] Add option to enable/disable party activity notifications --- Habitica/res/values/strings.xml | 1 + Habitica/res/xml/preferences_fragment.xml | 6 ++++++ .../helpers/notifications/ChatMentionNotification.kt | 9 +++++++++ .../habitica/models/user/PushNotificationsPreference.kt | 1 + .../preferences/PushNotificationsPreferencesFragment.kt | 2 ++ 5 files changed, 19 insertions(+) diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index efbff46ee..fcc593cc3 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -844,4 +844,5 @@ Daily Search Search tasks + Party Activity diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml index 047c45882..6a2b9cbf0 100644 --- a/Habitica/res/xml/preferences_fragment.xml +++ b/Habitica/res/xml/preferences_fragment.xml @@ -245,6 +245,12 @@ android:title="@string/preference_push_important_announcements" android:layout="@layout/preference_child_summary"/> + + diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt index 344e607b0..32d1030db 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ChatMentionNotification.kt @@ -2,9 +2,18 @@ package com.habitrpg.android.habitica.helpers.notifications import android.content.Context import android.content.Intent +import androidx.core.app.NotificationCompat class ChatMentionNotification(context: Context, identifier: String) : HabiticaLocalNotification(context, identifier) { + override fun configureNotificationBuilder(data: MutableMap): NotificationCompat.Builder { + val style = NotificationCompat.BigTextStyle() + .setBigContentTitle(title) + .bigText(message) + return super.configureNotificationBuilder(data) + .setStyle(style) + } + override fun configureMainIntent(intent: Intent) { super.configureMainIntent(intent) intent.putExtra("type", data?.get("type")) 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 03ec3dd74..8e2d18411 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 @@ -13,4 +13,5 @@ open class PushNotificationsPreference : RealmObject() { var questStarted: Boolean = false var giftedGems: Boolean = false var giftedSubscription: Boolean = false + var partyActivity: Boolean = false } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt index 61129196f..a2b08a4a4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt @@ -44,6 +44,7 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr updatePreference("preference_push_your_quest_has_begun", user?.preferences?.pushNotifications?.questStarted) updatePreference("preference_push_invited_to_quest", user?.preferences?.pushNotifications?.invitedQuest) updatePreference("preference_push_important_announcements", user?.preferences?.pushNotifications?.majorUpdates) + updatePreference("preference_push_party_activity", user?.preferences?.pushNotifications?.partyActivity) isSettingUser = false isInitialSet = false } @@ -67,6 +68,7 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr "preference_push_your_quest_has_begun" -> "questStarted" "preference_push_invited_to_quest" -> "invitedQuest" "preference_push_important_announcements" -> "majorUpdates" + "preference_push_party_activity" -> "partyActivity" else -> null } if (pathKey != null) {