From b9dff19cdb27d143334634265fc636b4d188bd92 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 4 Oct 2022 11:46:34 +0200 Subject: [PATCH] Fix issues wih notifications --- .../helpers/notifications/HabiticaLocalNotification.kt | 2 ++ .../notifications/HabiticaLocalNotificationFactory.kt | 3 --- .../android/habitica/receivers/NotificationPublisher.kt | 5 +---- .../com/habitrpg/android/habitica/receivers/TaskReceiver.kt | 4 +++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt index ec2a1c035..91cb2c279 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt @@ -7,6 +7,7 @@ import android.media.RingtoneManager import androidx.annotation.CallSuper import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.extensions.withImmutableFlag import com.habitrpg.android.habitica.ui.activities.MainActivity @@ -32,6 +33,7 @@ abstract class HabiticaLocalNotification( val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) return notificationBuilder .setSound(path) + .setColor(ContextCompat.getColor(context, R.color.brand_300)) } @CallSuper diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt index a71cfb522..f45e3e122 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt @@ -2,9 +2,6 @@ package com.habitrpg.android.habitica.helpers.notifications import android.content.Context -/** - * Created by keithholliday on 6/28/16. - */ class HabiticaLocalNotificationFactory { // use getShape method to get object of type shape fun build(notificationType: String?, context: Context?): HabiticaLocalNotification { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt index d7071d703..dd0dac59a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt @@ -27,7 +27,6 @@ import java.util.Date import java.util.Random import javax.inject.Inject -@Suppress("DEPRECATION") // https://gist.github.com/BrandonSmith/6679223 class NotificationPublisher : BroadcastReceiver() { @@ -145,8 +144,7 @@ class NotificationPublisher : BroadcastReceiver() { private fun getRandomDailyTip(): String { val thisContext = context ?: return "" - val index = Random().nextInt(4) - return when (index) { + return when (Random().nextInt(10)) { 0 -> thisContext.getString(R.string.daily_tip_0) 1 -> thisContext.getString(R.string.daily_tip_1) 2 -> thisContext.getString(R.string.daily_tip_2) @@ -162,7 +160,6 @@ class NotificationPublisher : BroadcastReceiver() { } companion object { - var NOTIFICATION_ID = "notification-id" var CHECK_DAILIES = "check-dailies" } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt index 1cb1c9589..839925764 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt @@ -9,6 +9,7 @@ import android.media.RingtoneManager import android.os.Build import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContextCompat import com.habitrpg.android.habitica.HabiticaBaseApplication import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.data.TaskRepository @@ -16,10 +17,10 @@ import com.habitrpg.android.habitica.extensions.withImmutableFlag import com.habitrpg.android.habitica.helpers.ExceptionHandler import com.habitrpg.android.habitica.helpers.TaskAlarmManager import com.habitrpg.android.habitica.models.tasks.Task -import com.habitrpg.shared.habitica.models.tasks.TaskType import com.habitrpg.android.habitica.ui.activities.MainActivity import com.habitrpg.shared.habitica.HLogger import com.habitrpg.shared.habitica.LogLevel +import com.habitrpg.shared.habitica.models.tasks.TaskType import io.reactivex.rxjava3.functions.Consumer import javax.inject.Inject @@ -67,6 +68,7 @@ class TaskReceiver : BroadcastReceiver() { var notificationBuilder = NotificationCompat.Builder(context, "default") .setSmallIcon(R.drawable.ic_gryphon_white) + .setColor(ContextCompat.getColor(context, R.color.brand_300)) .setContentTitle(task.text) .setStyle( NotificationCompat.BigTextStyle()