Skip to content

fix: Force second display when less than 1 minute #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: Force second display when less than 1 minute #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordViewDataMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,12 @@ class RecordViewDataMapper @Inject constructor(
timeEnded: Long,
showSeconds: Boolean,
): Long {
return if (showSeconds) {
timeEnded - timeStarted
} else {
timeEnded.dropSeconds() - timeStarted.dropSeconds()
var delta: Long = timeEnded - timeStarted
if (!showSeconds && delta >= 60000L) {
// If we don't want seconds, return duration without taking them into account.
// However, if the result would be "0 minute", don't round the duration.
delta = timeEnded.dropSeconds() - timeStarted.dropSeconds()
}
return delta
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ class TimeMapper @Inject constructor(
val willShowMinutes: Boolean
val willShowSeconds: Boolean

if (forceSeconds) {
if (forceSeconds || (hr == 0L && min == 0L)) {
willShowHours = hr != 0L
willShowMinutes = willShowHours || min != 0L
willShowSeconds = true
Expand Down