From 2c5322439b6d13c7005edeeeb624613767c49d38 Mon Sep 17 00:00:00 2001 From: Jakub Kalinowski Date: Sun, 20 Mar 2022 19:22:21 +0100 Subject: [PATCH] Code style fixes --- .../activities/common/dialogs/NumberPickerFactory.kt | 2 +- .../java/org/isoron/uhabits/core/models/EntryList.kt | 6 +++--- .../java/org/isoron/uhabits/core/models/ScoreList.kt | 2 +- .../core/ui/screens/habits/list/ListHabitsBehavior.kt | 7 ++++++- .../core/ui/screens/habits/show/views/HistoryCard.kt | 7 ++++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt index 4b450ec9a..b7f47074d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt @@ -115,7 +115,7 @@ class NumberPickerFactory callback.onNumberPickerDismissed() } - if(frequency == DAILY){ + if (frequency == DAILY) { dialogBuilder.setNegativeButton(R.string.skip_day) { _, _ -> picker.clearFocus() val v = Entry.SKIP.toDouble() / 1000 diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt index e3596eecb..3c6a1ed58 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt @@ -291,7 +291,7 @@ fun List.groupedSum( ): List { return this.map { (timestamp, value) -> if (isNumerical) { - if(value == SKIP) + if (value == SKIP) Entry(timestamp, 0) else Entry(timestamp, max(0, value)) @@ -306,7 +306,7 @@ fun List.groupedSum( }.entries.map { (timestamp, entries) -> Entry(timestamp, entries.sumOf { it.value }) }.sortedBy { (timestamp, _) -> - - timestamp.unixTime + -timestamp.unixTime } } @@ -332,6 +332,6 @@ fun List.countSkippedDays( }.entries.map { (timestamp, entries) -> Entry(timestamp, entries.sumOf { it.value }) }.sortedBy { (timestamp, _) -> - - timestamp.unixTime + -timestamp.unixTime } } diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt index 74a66342e..385ee0f0c 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt @@ -100,7 +100,7 @@ class ScoreList { } val normalizedRollingSum = rollingSum / 1000 - if(values[offset] != Entry.SKIP) { + if (values[offset] != Entry.SKIP) { val percentageCompleted = if (!isAtMost) { if (targetValue > 0) min(1.0, normalizedRollingSum / targetValue) 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 e93c8f220..278d904db 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 @@ -21,7 +21,12 @@ package org.isoron.uhabits.core.ui.screens.habits.list import org.isoron.platform.time.LocalDate import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.commands.CreateRepetitionCommand -import org.isoron.uhabits.core.models.* +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 import org.isoron.uhabits.core.tasks.TaskRunner 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 e9ac10a52..97d149906 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 @@ -23,12 +23,17 @@ import org.isoron.platform.time.DayOfWeek import org.isoron.platform.time.LocalDate import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.commands.CreateRepetitionCommand -import org.isoron.uhabits.core.models.* +import org.isoron.uhabits.core.models.Entry import org.isoron.uhabits.core.models.Entry.Companion.SKIP 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.Frequency +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 import org.isoron.uhabits.core.ui.views.HistoryChart