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

Replace RepetitionList by Entries

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-24 20:35:33 -06:00
parent c904e22c0f
commit 3f74c77755
35 changed files with 192 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.kt
View File

@@ -52,7 +52,9 @@ class FrequencyCardPresenter(
) {
fun present() = FrequencyCardViewModel(
color = habit.color,
frequency = habit.originalEntries.weekdayFrequency,
frequency = habit.originalEntries.computeWeekdayFrequency(
isNumerical = habit.isNumerical
),
firstWeekday = firstWeekday,
)
}

7
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.kt
View File

@@ -25,6 +25,7 @@ import android.widget.*
import kotlinx.coroutines.*
import org.isoron.uhabits.*
import org.isoron.uhabits.core.models.*
import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
import org.isoron.uhabits.core.utils.*
import org.isoron.uhabits.databinding.*
import org.isoron.uhabits.utils.*
@@ -74,12 +75,16 @@ class OverviewCardPresenter(val habit: Habit) {
val scoreToday = scores.todayValue.toFloat()
val scoreLastMonth = scores.getValue(lastMonth).toFloat()
val scoreLastYear = scores.getValue(lastYear).toFloat()
val totalCount = habit.originalEntries.getKnown()
.filter { it.value == YES_MANUAL }
.count()
.toLong()
return@IO OverviewCardViewModel(
color = habit.color,
scoreToday = scoreToday,
scoreMonthDiff = scoreToday - scoreLastMonth,
scoreYearDiff = scoreToday - scoreLastYear,
totalCount = habit.originalEntries.totalCount,
totalCount = totalCount,
)
}
}

2
android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/FrequencyWidget.kt
View File

@@ -44,7 +44,7 @@ class FrequencyWidget(
(widgetView.dataView as FrequencyChart).apply {
setFirstWeekday(firstWeekday)
setColor(habit.color.toThemedAndroidColor(context))
setFrequency(habit.originalEntries.weekdayFrequency)
setFrequency(habit.originalEntries.computeWeekdayFrequency(habit.isNumerical))
}
}