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

Fix linting

Browse Source
This commit is contained in:
Dharanish
2024-05-20 17:22:41 +02:00
parent c764461726
commit 053bfe116a
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
View File

@@ -248,7 +248,7 @@ class EditHabitActivity : AppCompatActivity() {
dialog.setListener { days: WeekdayList -> dialog.setListener { days: WeekdayList ->
reminderDays = days reminderDays = days
if (reminderDays.isEmpty) reminderDays = WeekdayList.EVERY_DAY if (reminderDays.isEmpty) reminderDays = WeekdayList.EVERY_DAY
if (isSkipDays) reminderDays = WeekdayList(reminderDays.toArray(),listSkipDays.toArray()) if (isSkipDays) reminderDays = WeekdayList(reminderDays.toArray(), listSkipDays.toArray())
populateReminder() populateReminder()
} }
dialog.setSelectedDays(reminderDays) dialog.setSelectedDays(reminderDays)
@@ -264,7 +264,7 @@ class EditHabitActivity : AppCompatActivity() {
if (listSkipDays.isEmpty) listSkipDays = WeekdayList.NO_DAY if (listSkipDays.isEmpty) listSkipDays = WeekdayList.NO_DAY
isSkipDays = (listSkipDays != WeekdayList.NO_DAY) isSkipDays = (listSkipDays != WeekdayList.NO_DAY)
if (reminderHour >= 0 && isSkipDays) { if (reminderHour >= 0 && isSkipDays) {
reminderDays = WeekdayList(reminderDays.toArray(),listSkipDays.toArray()) reminderDays = WeekdayList(reminderDays.toArray(), listSkipDays.toArray())
populateReminder() populateReminder()
} }
populateSkipDays() populateSkipDays()

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/EntryList.kt
View File

@@ -355,7 +355,7 @@ fun List<Entry>.countSkippedDays(
firstWeekday: Int = Calendar.SATURDAY, firstWeekday: Int = Calendar.SATURDAY,
skipDays: SkipDays skipDays: SkipDays
): List<Entry> { ): List<Entry> {
val thisIntervalStart = DateUtils.getTodayWithOffset().truncate(truncateField, firstWeekday) val thisIntervalStart = DateUtils.getTodayWithOffset().truncate(truncateField, firstWeekday)
return this.map { (timestamp, value) -> return this.map { (timestamp, value) ->
if (value == SKIP || skipDays.isDaySkipped(timestamp)) { if (value == SKIP || skipDays.isDaySkipped(timestamp)) {
Entry(timestamp, 1) Entry(timestamp, 1)

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Frequency.kt
View File

@@ -20,7 +20,7 @@ package org.isoron.uhabits.core.models
data class Frequency( data class Frequency(
var numerator: Int, var numerator: Int,
var denominator: Int, var denominator: Int
) { ) {
init { init {
if (numerator == denominator) { if (numerator == denominator) {

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
View File

@@ -25,7 +25,7 @@ data class Habit(
var color: PaletteColor = PaletteColor(8), var color: PaletteColor = PaletteColor(8),
var description: String = "", var description: String = "",
var frequency: Frequency = Frequency.DAILY, var frequency: Frequency = Frequency.DAILY,
var skipDays: SkipDays = SkipDays.NONE, var skipDays: SkipDays = SkipDays.NONE,
var id: Long? = null, var id: Long? = null,
var isArchived: Boolean = false, var isArchived: Boolean = false,
var name: String = "", var name: String = "",

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/SkipDays.kt
View File

@@ -38,4 +38,4 @@ data class SkipDays(
@JvmField @JvmField
val NONE = SkipDays(false, WeekdayList(0)) val NONE = SkipDays(false, WeekdayList(0))
} }
} }

1
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/sqlite/SQLiteEntryList.kt
View File

@@ -26,7 +26,6 @@ import org.isoron.uhabits.core.models.EntryList
import org.isoron.uhabits.core.models.Frequency import org.isoron.uhabits.core.models.Frequency
import org.isoron.uhabits.core.models.SkipDays import org.isoron.uhabits.core.models.SkipDays
import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.models.Timestamp
import org.isoron.uhabits.core.models.WeekdayList
import org.isoron.uhabits.core.models.sqlite.records.EntryRecord import org.isoron.uhabits.core.models.sqlite.records.EntryRecord
class SQLiteEntryList(database: Database) : EntryList() { class SQLiteEntryList(database: Database) : EntryList() {

10
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/TargetCard.kt
View File

@@ -58,7 +58,7 @@ class TargetCardPresenter {
val skippedDayToday = entriesForSkip.countSkippedDays( val skippedDayToday = entriesForSkip.countSkippedDays(
truncateField = DateUtils.TruncateField.DAY, truncateField = DateUtils.TruncateField.DAY,
skipDays = habit.skipDays, skipDays = habit.skipDays
).firstOrNull()?.value ?: 0 ).firstOrNull()?.value ?: 0
val valueThisWeek = entriesForSum.groupedSum( val valueThisWeek = entriesForSum.groupedSum(
@@ -70,7 +70,7 @@ class TargetCardPresenter {
val skippedDaysThisWeek = entriesForSkip.countSkippedDays( val skippedDaysThisWeek = entriesForSkip.countSkippedDays(
truncateField = DateUtils.TruncateField.WEEK_NUMBER, truncateField = DateUtils.TruncateField.WEEK_NUMBER,
firstWeekday = firstWeekday, firstWeekday = firstWeekday,
skipDays = habit.skipDays, skipDays = habit.skipDays
).firstOrNull()?.value ?: 0 ).firstOrNull()?.value ?: 0
val valueThisMonth = entriesForSum.groupedSum( val valueThisMonth = entriesForSum.groupedSum(
@@ -80,7 +80,7 @@ class TargetCardPresenter {
val skippedDaysThisMonth = entriesForSkip.countSkippedDays( val skippedDaysThisMonth = entriesForSkip.countSkippedDays(
truncateField = DateUtils.TruncateField.MONTH, truncateField = DateUtils.TruncateField.MONTH,
skipDays = habit.skipDays, skipDays = habit.skipDays
).firstOrNull()?.value ?: 0 ).firstOrNull()?.value ?: 0
val valueThisQuarter = entriesForSum.groupedSum( val valueThisQuarter = entriesForSum.groupedSum(
@@ -90,7 +90,7 @@ class TargetCardPresenter {
val skippedDaysThisQuarter = entriesForSkip.countSkippedDays( val skippedDaysThisQuarter = entriesForSkip.countSkippedDays(
truncateField = DateUtils.TruncateField.QUARTER, truncateField = DateUtils.TruncateField.QUARTER,
skipDays = habit.skipDays, skipDays = habit.skipDays
).firstOrNull()?.value ?: 0 ).firstOrNull()?.value ?: 0
val valueThisYear = entriesForSum.groupedSum( val valueThisYear = entriesForSum.groupedSum(
@@ -100,7 +100,7 @@ class TargetCardPresenter {
val skippedDaysThisYear = entriesForSkip.countSkippedDays( val skippedDaysThisYear = entriesForSkip.countSkippedDays(
truncateField = DateUtils.TruncateField.YEAR, truncateField = DateUtils.TruncateField.YEAR,
skipDays = habit.skipDays, skipDays = habit.skipDays
).firstOrNull()?.value ?: 0 ).firstOrNull()?.value ?: 0
val cal = DateUtils.getStartOfTodayCalendarWithOffset() val cal = DateUtils.getStartOfTodayCalendarWithOffset()