merge fix

bobf41 · Nov 3, 2024 · 88d0bef · 88d0bef
1 parent d7ad129
commit 88d0bef
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 33 deletions.
diff --git a/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift b/FreeAPS/Sources/Modules/Home/View/Header/PumpView.swift
@@ -250,24 +250,4 @@ struct PumpView: View {
                 }
         }
     }
-
-    private func podInsulinAmount(portion: Double) -> some View {
-        ZStack {
-            UIImage(imageLiteralResourceName: "pod_reservoir")
-                .fillImageUpToPortion(color: .insulin.opacity(0.8), portion: portion)
-                .resizable()
-                .aspectRatio(contentMode: .fit)
-                .frame(width: IAPSconfig.iconSize * 1.15, height: IAPSconfig.iconSize * 1.6)
-                .symbolRenderingMode(.palette)
-                .offset(x: 0, y: -5)
-                .shadow(radius: 1, x: 2, y: 2)
-                .foregroundStyle(.white)
-                .overlay {
-                    portion <= 0.3 ?
-                        Text("50+").foregroundStyle(.white).font(.system(size: 6))
-                        .offset(y: -4)
-                        : nil
-                }
-        }
-    }
 }
diff --git a/FreeAPS/Sources/Views/ViewModifiers.swift b/FreeAPS/Sources/Views/ViewModifiers.swift
@@ -351,19 +351,6 @@ struct ClearButton: ViewModifier {
     }
 }
 
-struct CarveOrDrop: ViewModifier {
-    let carve: Bool
-    func body(content: Content) -> some View {
-        if carve {
-            return content
-                .foregroundStyle(.shadow(.inner(color: .black, radius: 0.01, y: 1)))
-        } else {
-            return content
-                .foregroundStyle(.shadow(.drop(color: .black, radius: 0.02, y: 1)))
-        }
-    }
-}
-
 extension View {
     func roundedBackground() -> some View {
         modifier(RoundedBackground())