diff --git a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt index 49c08330..d8ea356b 100644 --- a/core/base/src/main/java/de/mm20/launcher2/search/Location.kt +++ b/core/base/src/main/java/de/mm20/launcher2/search/Location.kt @@ -11,6 +11,7 @@ import java.time.DayOfWeek import java.time.Duration import java.time.LocalDateTime import java.time.LocalTime +import java.time.temporal.TemporalAdjusters import android.location.Location as AndroidLocation interface Location : SavableSearchable { @@ -235,9 +236,9 @@ data class OpeningHours( ) { fun isOpen(date: LocalDateTime = LocalDateTime.now()): Boolean { - return date.dayOfWeek == dayOfWeek && - date.toLocalTime().isAfter(startTime) && - date.toLocalTime().isBefore(startTime.plus(duration)) + val startTime = date.with(TemporalAdjusters.previousOrSame(dayOfWeek)).with(startTime) + val endTime = startTime.plus(duration) + return date in startTime..