فهرست منبع

Layout fix for remotes.

Jon Mårtensson 2 سال پیش
والد
کامیت
ba6304d7b3
2فایلهای تغییر یافته به همراه4 افزوده شده و 4 حذف شده
  1. 1 1
      FreeAPS/Sources/Models/Announcement.swift
  2. 3 3
      FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

+ 1 - 1
FreeAPS/Sources/Models/Announcement.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-struct Announcement: JSON, Equatable {
+struct Announcement: JSON, Equatable, Hashable {
     let createdAt: Date
     let enteredBy: String
     let notes: String

+ 3 - 3
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -42,7 +42,7 @@ struct MainChartView: View {
         static let announcementSize: CGFloat = 8
         static let announcementScale: CGFloat = 2.5
         static let owlSeize: CGFloat = 25
-        static let owlOffset: CGFloat = 60
+        static let owlOffset: CGFloat = 80
     }
 
     private enum Command {
@@ -50,7 +50,7 @@ struct MainChartView: View {
         static let closed = "🔴"
         static let suspend = "❌"
         static let resume = "✅"
-        static let tempbasal = "💧..."
+        static let tempbasal = "basal"
         static let bolus = "💧"
     }
 
@@ -406,7 +406,7 @@ struct MainChartView: View {
                     info.note.contains("tempbasal") ?
                     Command.tempbasal : Command.bolus
                 VStack {
-                    Text(type).font(.caption2).foregroundStyle(Color(.tempBasal))
+                    Text(type).font(.caption2).foregroundStyle(.orange)
                     Image("owl").resizable().frame(maxWidth: Config.owlSeize, maxHeight: Config.owlSeize).scaledToFill()
                 }.position(position).asAny()
             }