Fix issues wih notifications

This commit is contained in:
Phillip Thelen 2022-10-04 11:46:34 +02:00
parent 919ac41c29
commit b9dff19cdb
4 changed files with 6 additions and 8 deletions

View file

@ -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

View file

@ -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 {

View file

@ -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"
}

View file

@ -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()