isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

NotificationTray: Use isCompletedToday instead of value != UNKNOWN

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-12-29 08:13:54 -06:00
parent 3dfa376f59
commit e6167baab1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
View File

@@ -23,13 +23,11 @@ import org.isoron.uhabits.core.commands.Command
import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.commands.CommandRunner
import org.isoron.uhabits.core.commands.CreateRepetitionCommand import org.isoron.uhabits.core.commands.CreateRepetitionCommand
import org.isoron.uhabits.core.commands.DeleteHabitsCommand import org.isoron.uhabits.core.commands.DeleteHabitsCommand
import org.isoron.uhabits.core.models.Entry
import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.Habit
import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.models.Timestamp
import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.preferences.Preferences
import org.isoron.uhabits.core.tasks.Task import org.isoron.uhabits.core.tasks.Task
import org.isoron.uhabits.core.tasks.TaskRunner import org.isoron.uhabits.core.tasks.TaskRunner
import org.isoron.uhabits.core.utils.DateUtils.Companion.getTodayWithOffset
import java.util.HashMap import java.util.HashMap
import java.util.Locale import java.util.Locale
import java.util.Objects import java.util.Objects
@@ -106,17 +104,17 @@ class NotificationTray @Inject constructor(
internal class NotificationData(val timestamp: Timestamp, val reminderTime: Long) internal class NotificationData(val timestamp: Timestamp, val reminderTime: Long)
private inner class ShowNotificationTask(private val habit: Habit, data: NotificationData) : private inner class ShowNotificationTask(private val habit: Habit, data: NotificationData) :
Task { Task {
var todayValue = 0 var isCompleted = false
private val timestamp: Timestamp = data.timestamp private val timestamp: Timestamp = data.timestamp
private val reminderTime: Long = data.reminderTime private val reminderTime: Long = data.reminderTime
override fun doInBackground() { override fun doInBackground() {
val today = getTodayWithOffset() isCompleted = habit.isCompletedToday()
todayValue = habit.computedEntries.get(today).value
} }
override fun onPostExecute() { override fun onPostExecute() {
systemTray.log("Showing notification for habit=" + habit.id) systemTray.log("Showing notification for habit=" + habit.id)
if (todayValue != Entry.UNKNOWN) { if (isCompleted) {
systemTray.log( systemTray.log(
String.format( String.format(
Locale.US, Locale.US,