FPU colors and Watch Icons

mountrcg · Aug 8, 2023 · 5f1c470 · 5f1c470
1 parent 56089f7
commit 5f1c470
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/FreeAPS/Sources/APS/FetchAnnouncementsManager.swift b/FreeAPS/Sources/APS/FetchAnnouncementsManager.swift
@@ -33,8 +33,8 @@ final class BaseFetchAnnouncementsManager: FetchAnnouncementsManager, Injectable
             }
             .sink { announcements in
                 guard let last = announcements.filter({ $0.createdAt > self.announcementsStorage.syncDate() })
-                                    .sorted(by: { $0.createdAt < $1.createdAt })
-                                    .last
+                    .sorted(by: { $0.createdAt < $1.createdAt })
+                    .last
                 else { return }
 
                 self.announcementsStorage.storeAnnouncements([last], enacted: false)

diff --git a/FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift b/FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift
@@ -115,7 +115,12 @@ extension DataTable {
                     if item
                         .type == .tempTarget
                     { Image(systemName: "circle").foregroundColor(Color.basal.opacity(0.8))
-                    }}
+                    }
+                    if item
+                        .type == .fpus
+                    { Image(systemName: "circle").foregroundColor(.orange)
+                    }
+                }
                 Text(dateFormatter.string(from: item.date))
                     .moveDisabled(true)
                 Text(item.type.name)

diff --git a/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift b/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift
@@ -412,7 +412,7 @@ struct MainChartView: View {
             fpuPath
                 .fill(Color.red)
             fpuPath
-                .stroke(Color.primary, lineWidth: 0.5)
+                .stroke(Color.orange)
 
             ForEach(fpuDots, id: \.rect.minX) { info -> AnyView in
                 let position = CGPoint(x: info.rect.midX, y: info.rect.minY - 8)

diff --git a/FreeAPSWatch WatchKit Extension/Views/CarbsView.swift b/FreeAPSWatch WatchKit Extension/Views/CarbsView.swift
@@ -33,10 +33,10 @@ struct CarbsView: View {
             // nutrient
             carbs
             if state.displayFatAndProteinOnWatch {
-                Spacer()
-                protein
                 Spacer()
                 fat
+                Spacer()
+                protein
             }
             buttonStack
         }
@@ -68,7 +68,7 @@ struct CarbsView: View {
                     .tint(selection == .carbs ? .blue : .none)
             }
             Spacer()
-            Text("🥨")
+            Text("Carbs")
             Spacer()
             Text(numberFormatter.string(from: carbAmount as NSNumber)! + " g")
                 .font(selection == .carbs ? .title : .title3)
@@ -112,7 +112,8 @@ struct CarbsView: View {
                     .tint(selection == .protein ? .blue : .none)
             }
             Spacer()
-            Text("🍗")
+            Text("Protein")
+                .foregroundStyle(.red)
             Spacer()
             Text(numberFormatter.string(from: proteinAmount as NSNumber)! + " g")
                 .font(selection == .protein ? .title : .title3)
@@ -155,11 +156,12 @@ struct CarbsView: View {
                     .tint(selection == .fat ? .blue : .none)
             }
             Spacer()
-            Text("🧀")
+            Text("Fat")
+                .foregroundStyle(.orange)
             Spacer()
             Text(numberFormatter.string(from: fatAmount as NSNumber)! + " g")
                 .font(selection == .fat ? .title : .title3)
-                .foregroundColor(.loopYellow)
+                .foregroundStyle(.orange)
                 .focusable(selection == .fat)
                 .digitalCrownRotation(
                     $fatAmount,