From 6f794868f18f5c865577a44488eb06356a416ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=BCr=C5=9Fad=20Bumin=20Giray=20Saka?= Date: Mon, 2 May 2022 01:30:25 +0300 Subject: [PATCH] move PaletteColor to CommonMain --- .../isoron/uhabits/BaseUserInterfaceTest.kt | 2 +- .../java/org/isoron/uhabits/HabitFixtures.kt | 2 +- .../habits/list/views/HabitCardViewTest.kt | 2 +- .../habits/show/views/OverviewCardViewTest.kt | 2 +- .../habits/show/views/SubtitleCardViewTest.kt | 2 +- .../uhabits/widgets/TargetWidgetTest.kt | 2 +- .../uhabits/activities/about/AboutView.kt | 2 +- .../common/dialogs/CheckmarkDialog.kt | 2 +- .../dialogs/ColorPickerDialogFactory.kt | 2 +- .../habits/edit/EditHabitActivity.kt | 2 +- .../habits/list/ListHabitsRootView.kt | 2 +- .../habits/list/ListHabitsScreen.kt | 2 +- .../habits/show/ShowHabitActivity.kt | 2 +- .../activities/settings/SettingsActivity.kt | 2 +- .../uhabits/automation/EditSettingRootView.kt | 2 +- .../org/isoron/uhabits/utils/PaletteUtils.kt | 2 +- .../isoron/uhabits/utils/ViewExtensions.kt | 2 +- .../isoron/platform}/models/PaletteColor.kt | 21 +------------------ .../core/commands/ChangeHabitColorCommand.kt | 2 +- .../org/isoron/uhabits/core/models/Habit.kt | 1 + .../core/models/sqlite/records/HabitRecord.kt | 2 +- .../isoron/uhabits/core/test/HabitFixtures.kt | 2 +- .../ui/callbacks/OnColorPickedCallback.kt | 2 +- .../screens/habits/list/ListHabitsBehavior.kt | 2 +- .../list/ListHabitsSelectionMenuBehavior.kt | 2 +- .../core/ui/screens/habits/show/ShowHabit.kt | 2 +- .../ui/screens/habits/show/views/BarCard.kt | 2 +- .../habits/show/views/FrequencyCard.kt | 2 +- .../screens/habits/show/views/HistoryCard.kt | 2 +- .../screens/habits/show/views/OverviewCard.kt | 2 +- .../ui/screens/habits/show/views/ScoreCard.kt | 2 +- .../screens/habits/show/views/StreakCart.kt | 2 +- .../screens/habits/show/views/SubtitleCard.kt | 2 +- .../screens/habits/show/views/TargetCard.kt | 2 +- .../uhabits/core/ui/views/HistoryChart.kt | 2 +- .../isoron/uhabits/core/ui/views/Themes.kt | 2 +- .../commands/ChangeHabitColorCommandTest.kt | 2 +- .../uhabits/core/models/HabitListTest.kt | 1 + .../isoron/uhabits/core/models/HabitTest.kt | 1 + .../models/sqlite/records/HabitRecordTest.kt | 2 +- .../ListHabitsSelectionMenuBehaviorTest.kt | 2 +- .../uhabits/core/ui/views/HistoryChartTest.kt | 2 +- 42 files changed, 42 insertions(+), 58 deletions(-) rename uhabits-core/src/{jvmMain/java/org/isoron/uhabits/core => commonMain/kotlin/org/isoron/platform}/models/PaletteColor.kt (54%) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt index 657eaf086..532baac1b 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.kt @@ -24,8 +24,8 @@ import android.content.Intent import androidx.test.core.app.ApplicationProvider import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.UiDevice +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.HabitList -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.screens.habits.list.HabitCardListCache import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.kt index 9cbfc1f9c..f328a6713 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.kt @@ -18,6 +18,7 @@ */ package org.isoron.uhabits +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL import org.isoron.uhabits.core.models.Frequency @@ -27,7 +28,6 @@ import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.HabitType import org.isoron.uhabits.core.models.ModelFactory import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt index 20474090a..a57bab120 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt @@ -21,10 +21,10 @@ package org.isoron.uhabits.activities.habits.list.views import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.BaseViewTest import org.isoron.uhabits.R import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.utils.DateUtils import org.junit.Test diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt index 9a5fc81d3..f3cfe965e 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardViewTest.kt @@ -22,9 +22,9 @@ import android.view.LayoutInflater import android.view.View import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.BaseViewTest import org.isoron.uhabits.R -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.screens.habits.show.views.OverviewCardState import org.isoron.uhabits.core.ui.views.LightTheme import org.junit.Before diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt index 3323f78df..38bac50d7 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt @@ -21,10 +21,10 @@ package org.isoron.uhabits.activities.habits.show.views import android.view.LayoutInflater import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.BaseViewTest import org.isoron.uhabits.R import org.isoron.uhabits.core.models.Frequency -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.models.WeekdayList.Companion.EVERY_DAY import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardState diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.kt index 41477c0ae..bde1f75a1 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.kt @@ -21,11 +21,11 @@ package org.isoron.uhabits.widgets import android.widget.FrameLayout import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.MediumTest +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.BaseViewTest import org.isoron.uhabits.R import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.junit.Test import org.junit.runner.RunWith diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt index 5eeb67f19..1a6b70c48 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt @@ -22,9 +22,9 @@ import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.widget.FrameLayout +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.BuildConfig import org.isoron.uhabits.R -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.databinding.AboutBinding import org.isoron.uhabits.utils.currentTheme import org.isoron.uhabits.utils.setupToolbar diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt index 4e62b614b..30343e176 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt @@ -8,6 +8,7 @@ import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE import android.widget.Button import androidx.appcompat.app.AlertDialog import org.isoron.platform.gui.toInt +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.JavaLocalDateFormatter import org.isoron.platform.time.LocalDate import org.isoron.uhabits.R @@ -16,7 +17,6 @@ import org.isoron.uhabits.core.models.Entry.Companion.SKIP import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt index e4cfa015b..8df7f16c4 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt @@ -20,8 +20,8 @@ package org.isoron.uhabits.activities.common.dialogs import android.content.Context import org.isoron.platform.gui.toInt +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.R -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.views.Theme import org.isoron.uhabits.inject.ActivityContext import org.isoron.uhabits.inject.ActivityScope diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt index 572917d10..8143604e9 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt @@ -41,6 +41,7 @@ import kotlinx.android.synthetic.main.activity_edit_habit.questionInput import kotlinx.android.synthetic.main.activity_edit_habit.targetInput import kotlinx.android.synthetic.main.activity_edit_habit.unitInput import org.isoron.platform.gui.toInt +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.HabitsApplication import org.isoron.uhabits.R import org.isoron.uhabits.activities.AndroidThemeSwitcher @@ -54,7 +55,6 @@ import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitType import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.models.WeekdayList import org.isoron.uhabits.databinding.ActivityEditHabitBinding diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt index faa13173a..d127cd074 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt @@ -23,6 +23,7 @@ import android.content.Context import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.widget.FrameLayout import android.widget.RelativeLayout +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.views.ScrollableChart import org.isoron.uhabits.activities.common.views.TaskProgressBar @@ -33,7 +34,6 @@ import org.isoron.uhabits.activities.habits.list.views.HabitCardListViewFactory import org.isoron.uhabits.activities.habits.list.views.HeaderView import org.isoron.uhabits.activities.habits.list.views.HintView import org.isoron.uhabits.core.models.ModelObservable -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.tasks.TaskRunner import org.isoron.uhabits.core.ui.screens.habits.list.HintListFactory 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 4ec28f9f3..1dea14f9c 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 @@ -24,6 +24,7 @@ import android.content.Context import android.content.Intent import androidx.appcompat.app.AppCompatActivity import dagger.Lazy +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.LocalDate import org.isoron.uhabits.R import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog @@ -42,7 +43,6 @@ import org.isoron.uhabits.core.commands.EditHabitCommand import org.isoron.uhabits.core.commands.UnarchiveHabitsCommand import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.tasks.TaskRunner import org.isoron.uhabits.core.ui.ThemeSwitcher import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback 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 4af6948ad..112432836 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 @@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.LocalDate import org.isoron.uhabits.AndroidDirFinder import org.isoron.uhabits.HabitsApplication @@ -41,7 +42,6 @@ import org.isoron.uhabits.core.commands.Command import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.models.Frequency 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 diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt index 60a12ac17..e9e4ee0b1 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt @@ -21,10 +21,10 @@ package org.isoron.uhabits.activities.settings import android.os.Bundle import android.view.LayoutInflater import androidx.appcompat.app.AppCompatActivity +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.HabitsApplication import org.isoron.uhabits.R import org.isoron.uhabits.activities.AndroidThemeSwitcher -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.databinding.SettingsActivityBinding import org.isoron.uhabits.utils.setupToolbar diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt index 30c13c95d..497eb6cd9 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt @@ -28,10 +28,10 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.FrameLayout +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.R import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.databinding.AutomationBinding import org.isoron.uhabits.utils.currentTheme import org.isoron.uhabits.utils.setupToolbar diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt index 5f120c6af..353c53870 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt @@ -21,7 +21,7 @@ package org.isoron.uhabits.utils import android.content.Context import android.graphics.Color -import org.isoron.uhabits.core.models.PaletteColor +import org.isoron.platform.models.PaletteColor object PaletteUtils { @JvmStatic diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt index b6903b3b0..5d0aecb6a 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt @@ -43,10 +43,10 @@ import androidx.appcompat.widget.Toolbar import androidx.core.content.FileProvider import com.google.android.material.snackbar.Snackbar import org.isoron.platform.gui.toInt +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.HabitsApplication import org.isoron.uhabits.R import org.isoron.uhabits.activities.AndroidThemeSwitcher -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.views.Theme import java.io.File diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/PaletteColor.kt b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/models/PaletteColor.kt similarity index 54% rename from uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/PaletteColor.kt rename to uhabits-core/src/commonMain/kotlin/org/isoron/platform/models/PaletteColor.kt index 9cd4dac67..95f34107e 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/PaletteColor.kt +++ b/uhabits-core/src/commonMain/kotlin/org/isoron/platform/models/PaletteColor.kt @@ -1,23 +1,4 @@ -/* - * Copyright (C) 2016-2021 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -package org.isoron.uhabits.core.models +package org.isoron.platform.models data class PaletteColor(val paletteIndex: Int) { fun toCsvColor(): String { diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt index 466025f51..255c63590 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommand.kt @@ -18,9 +18,9 @@ */ package org.isoron.uhabits.core.commands +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList -import org.isoron.uhabits.core.models.PaletteColor data class ChangeHabitColorCommand( val habitList: HabitList, diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt index 68bbabc08..9c4da3891 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt @@ -18,6 +18,7 @@ */ package org.isoron.uhabits.core.models +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.utils.DateUtils import java.util.UUID diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.kt index dc0386799..95691c7ae 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecord.kt @@ -18,13 +18,13 @@ */ package org.isoron.uhabits.core.models.sqlite.records +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.database.Column import org.isoron.uhabits.core.database.Table import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitType import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.models.WeekdayList import java.util.Objects.requireNonNull diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt index fffe4ac85..8a0546a36 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/test/HabitFixtures.kt @@ -18,6 +18,7 @@ */ package org.isoron.uhabits.core.test +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit @@ -25,7 +26,6 @@ import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.HabitType import org.isoron.uhabits.core.models.ModelFactory import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.models.sqlite.SQLiteEntryList import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.kt index 1129fb973..b21f3075d 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/callbacks/OnColorPickedCallback.kt @@ -18,7 +18,7 @@ */ package org.isoron.uhabits.core.ui.callbacks -import org.isoron.uhabits.core.models.PaletteColor +import org.isoron.platform.models.PaletteColor fun interface OnColorPickedCallback { fun onColorPicked(color: PaletteColor) 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 278d904db..847fa9176 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 @@ -18,6 +18,7 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.LocalDate import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.commands.CreateRepetitionCommand @@ -25,7 +26,6 @@ import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.HabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.tasks.ExportCSVTask diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.kt index 00d90a1a7..d15d99b9b 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.kt @@ -18,6 +18,7 @@ */ package org.isoron.uhabits.core.ui.screens.habits.list +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.commands.ArchiveHabitsCommand import org.isoron.uhabits.core.commands.ChangeHabitColorCommand import org.isoron.uhabits.core.commands.CommandRunner @@ -25,7 +26,6 @@ import org.isoron.uhabits.core.commands.DeleteHabitsCommand import org.isoron.uhabits.core.commands.UnarchiveHabitsCommand import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback import javax.inject.Inject diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt index 4dc729aa4..c07f902ad 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabit.kt @@ -19,10 +19,10 @@ package org.isoron.uhabits.core.ui.screens.habits.show +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.screens.habits.show.views.BarCardPresenter import org.isoron.uhabits.core.ui.screens.habits.show.views.BarCardState diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt index 5bace9378..0dbbd5005 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/BarCard.kt @@ -19,9 +19,9 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.groupedSum import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt index fd46c3473..35b30c3de 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/FrequencyCard.kt @@ -19,8 +19,8 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.ui.views.Theme import java.util.HashMap 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 97d149906..7c0874ba4 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 @@ -19,6 +19,7 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.DayOfWeek import org.isoron.platform.time.LocalDate import org.isoron.uhabits.core.commands.CommandRunner @@ -32,7 +33,6 @@ import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.NumericalHabitType.AT_LEAST import org.isoron.uhabits.core.models.NumericalHabitType.AT_MOST -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt index d9d431112..66287b6dc 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/OverviewCard.kt @@ -19,9 +19,9 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.views.Theme import org.isoron.uhabits.core.utils.DateUtils diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt index 92268a7c0..7dc25cdf8 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/ScoreCard.kt @@ -19,8 +19,8 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Score import org.isoron.uhabits.core.preferences.Preferences import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt index 97700f633..181f1122b 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/StreakCart.kt @@ -19,8 +19,8 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Streak import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt index 4cbbd74ec..23ded39f5 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/SubtitleCard.kt @@ -19,10 +19,10 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Habit import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt index 9b8add0dc..37fffb979 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt @@ -19,8 +19,8 @@ package org.isoron.uhabits.core.ui.screens.habits.show.views +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.countSkippedDays import org.isoron.uhabits.core.models.groupedSum import org.isoron.uhabits.core.ui.views.Theme diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt index a752e271c..964e4e26f 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt @@ -23,10 +23,10 @@ import org.isoron.platform.gui.Canvas import org.isoron.platform.gui.Color import org.isoron.platform.gui.DataView import org.isoron.platform.gui.TextAlign +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.DayOfWeek import org.isoron.platform.time.LocalDate import org.isoron.platform.time.LocalDateFormatter -import org.isoron.uhabits.core.models.PaletteColor import kotlin.math.floor import kotlin.math.max import kotlin.math.min diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt index 1b1d989e4..0dda782bb 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt @@ -20,7 +20,7 @@ package org.isoron.uhabits.core.ui.views import org.isoron.platform.gui.Color -import org.isoron.uhabits.core.models.PaletteColor +import org.isoron.platform.models.PaletteColor abstract class Theme { open val appBackgroundColor = Color(0xf4f4f4) diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.kt index 086d0c3df..f9cb2d836 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/commands/ChangeHabitColorCommandTest.kt @@ -20,9 +20,9 @@ package org.isoron.uhabits.core.commands import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.junit.Before import org.junit.Test import java.util.LinkedList diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt index 0d2314be5..6c338674e 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitListTest.kt @@ -24,6 +24,7 @@ import junit.framework.Assert.assertNull import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.CoreMatchers.not import org.hamcrest.MatcherAssert.assertThat +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.BaseUnitTest import org.junit.Rule import org.junit.Test diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt index da568adf2..b5d7aa199 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt @@ -22,6 +22,7 @@ import junit.framework.Assert.assertFalse import junit.framework.Assert.assertTrue import org.hamcrest.CoreMatchers.`is` import org.hamcrest.core.IsEqual.equalTo +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday import org.junit.Assert.assertNotEquals diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.kt index d23c7d8a9..f94846a85 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/sqlite/records/HabitRecordTest.kt @@ -20,11 +20,11 @@ package org.isoron.uhabits.core.models.sqlite.records import org.hamcrest.CoreMatchers.equalTo import org.hamcrest.MatcherAssert.assertThat +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.HabitType import org.isoron.uhabits.core.models.NumericalHabitType -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.models.Reminder import org.isoron.uhabits.core.models.WeekdayList import org.junit.Test diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt index 56fe20a3f..fbc005663 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehaviorTest.kt @@ -29,9 +29,9 @@ import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalTo +import org.isoron.platform.models.PaletteColor import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Habit -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback import org.junit.Test diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt index 8a9d523ab..b0d664a95 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt @@ -25,11 +25,11 @@ import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import kotlinx.coroutines.runBlocking import org.isoron.platform.gui.assertRenders +import org.isoron.platform.models.PaletteColor import org.isoron.platform.time.DayOfWeek import org.isoron.platform.time.DayOfWeek.SUNDAY import org.isoron.platform.time.JavaLocalDateFormatter import org.isoron.platform.time.LocalDate -import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.core.ui.views.HistoryChart.Square.DIMMED import org.isoron.uhabits.core.ui.views.HistoryChart.Square.HATCHED import org.isoron.uhabits.core.ui.views.HistoryChart.Square.OFF