yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 17:59:51 +02:00
Code Issues Projects Releases Wiki Activity

Fix incorrect used time at rules that apply per day at days where they do not apply

Browse source
This commit is contained in:
Jonas Lochmann 2024-10-28 01:00:00 +01:00
parent d5bc1f9881
commit 1cdaed60e1
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/io/timelimit/android/ui/manage/category/appsandrules/AppAndRuleAdapter.kt
View file

@ -31,6 +31,7 @@ import io.timelimit.android.logic.RemainingTime
import io.timelimit.android.ui.manage.category.timelimit_rules.TimeLimitRulesHandlers import io.timelimit.android.ui.manage.category.timelimit_rules.TimeLimitRulesHandlers
import io.timelimit.android.ui.util.DateUtil import io.timelimit.android.ui.util.DateUtil
import io.timelimit.android.util.DayNameUtil import io.timelimit.android.util.DayNameUtil
import io.timelimit.android.util.Option
import io.timelimit.android.util.TimeTextUtil import io.timelimit.android.util.TimeTextUtil
import kotlin.properties.Delegates import kotlin.properties.Delegates
@ -159,12 +160,24 @@ class AppAndRuleAdapter: RecyclerView.Adapter<AppAndRuleAdapter.Holder>() {
val binding = holder.itemView.tag as FragmentCategoryTimeLimitRuleItemBinding val binding = holder.itemView.tag as FragmentCategoryTimeLimitRuleItemBinding
val context = binding.root.context val context = binding.root.context
val usedTime = date?.let { date -> val usedTime = date?.let { date ->
RemainingTime.getUsedTime( val dayOfWeekForDailyRule: Option<Int?>? =
usedTimes = usedTimes, if (rule.perDay) {
rule = rule, (0 until 7)
firstDayOfWeekAsEpochDay = date.firstDayOfWeekAsEpochDay, .map { (7 + date.dayOfWeek - it) % 7 } // make the current day the last one
dayOfWeekForDailyRule = if (rule.perDay) date.dayOfWeek else null .firstOrNull { rule.dayMask.toInt() and (1 shl it) != 0 }
).toInt() ?.let { Option.Some(it) } // skip calculation if no day matches
} else Option.Some(null) // use the value null
dayOfWeekForDailyRule?.let {
RemainingTime.getUsedTime(
usedTimes = usedTimes,
rule = rule,
firstDayOfWeekAsEpochDay = date.firstDayOfWeekAsEpochDay,
dayOfWeekForDailyRule =
if (it is Option.Some) it.value
else null
).toInt()
}
} ?: 0 } ?: 0
binding.maxTimeString = rule.maximumTimeInMillis.let { time -> binding.maxTimeString = rule.maximumTimeInMillis.let { time ->