Просмотр исходного кода

Merge branch 'dev' of github.com:nightscout/Trio into fix/stats-meals-current-day-zero

Deniz Cengiz 1 день назад
Родитель
Сommit
227b2309d0
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      Config.xcconfig
  2. 3 1
      LiveActivity/Views/LiveActivityChartView.swift

+ 1 - 1
Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.8.1
-APP_DEV_VERSION = 0.8.1.5
+APP_DEV_VERSION = 0.8.1.6
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

+ 3 - 1
LiveActivity/Views/LiveActivityChartView.swift

@@ -117,7 +117,9 @@ struct LiveActivityChartView: View {
         let duration = context.state.detailedViewState.overrideDuration
         let durationAsTimeInterval = TimeInterval((duration as NSDecimalNumber).doubleValue * 60) // return seconds
 
-        let end: Date = start.addingTimeInterval(durationAsTimeInterval)
+        let end: Date = duration == 0
+            ? Date(timeIntervalSinceNow: 7200)
+            : start.addingTimeInterval(durationAsTimeInterval)
         let target = context.state.detailedViewState.overrideTarget
 
         return RuleMark(