From a69d528d54eebde330ff5370d51826041d18503f Mon Sep 17 00:00:00 2001
From: zenador <zenador9@gmail.com>
Date: Mon, 4 Aug 2025 01:42:06 +0800
Subject: [PATCH] don't pass extra habit.color

---
 .../isoron/uhabits/activities/habits/list/ListHabitsScreen.kt | 3 +--
 .../uhabits/activities/habits/show/ShowHabitActivity.kt       | 4 +---
 .../uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt | 2 --
 .../uhabits/core/ui/screens/habits/show/views/HistoryCard.kt  | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index 576fd7a18..8b16f44fa 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -287,7 +287,6 @@ class ListHabitsScreen
     override fun showCheckmarkPopup(
         selectedValue: Int,
         notes: String,
-        color: PaletteColor,
         callback: ListHabitsBehavior.CheckMarkDialogCallback,
         habit: Habit?
     ) {
@@ -295,7 +294,7 @@ class ListHabitsScreen
         val fm = (context as AppCompatActivity).supportFragmentManager
         val dialog = CheckmarkDialog()
         dialog.arguments = Bundle().apply {
-            putInt("color", theme.color(color).toInt())
+            habit?.color?.let { putInt("color", theme.color(it).toInt()) }
             putInt("value", selectedValue)
             putString("notes", notes)
             habit?.id?.let { putLong("habitId", it) }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
index 022e79d4a..3ae9a5c90 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -41,7 +41,6 @@ import org.isoron.uhabits.activities.common.dialogs.NumberDialog
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
@@ -190,14 +189,13 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         override fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
-            color: PaletteColor,
             callback: ListHabitsBehavior.CheckMarkDialogCallback,
             habit: Habit?
         ) {
             val theme = view.currentTheme()
             val dialog = CheckmarkDialog()
             dialog.arguments = Bundle().apply {
-                putInt("color", theme.color(color).toInt())
+                habit?.color?.let { putInt("color", theme.color(it).toInt()) }
                 putInt("value", selectedValue)
                 putString("notes", notes)
                 putLong("habitId", habit?.id ?: -1)
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
index f7dd5269e..5b30523bc 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
@@ -71,7 +71,6 @@ open class ListHabitsBehavior @Inject constructor(
             screen.showCheckmarkPopup(
                 entry.value,
                 entry.notes,
-                habit.color,
                 { newValue: Int, newNotes: String ->
                     if (newValue != entry.value && newValue == YES_MANUAL) screen.showConfetti(habit.color, x, y)
                     commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
@@ -187,7 +186,6 @@ open class ListHabitsBehavior @Inject constructor(
         fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
-            color: PaletteColor,
             callback: CheckMarkDialogCallback,
             habit: Habit? = null
         )
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
index f5cf5be4f..4567426b0 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
@@ -97,7 +97,6 @@ class HistoryCardPresenter(
         screen.showCheckmarkPopup(
             entry.value,
             entry.notes,
-            habit.color,
             { newValue, newNotes ->
                 commandRunner.run(
                     CreateRepetitionCommand(
@@ -217,7 +216,6 @@ class HistoryCardPresenter(
         fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
-            color: PaletteColor,
             callback: ListHabitsBehavior.CheckMarkDialogCallback,
             habit: Habit? = null
         )