Merge pull request #31 from androidseb25/integrationen

Integrationen
androidseb25 · Sep 29, 2023 · 5e459ed · 5e459ed
2 parents 09543c1 + 2a505ac
commit 5e459ed
Show file tree

Hide file tree

Showing 53 changed files with 3,023 additions and 338 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/HealthcheckWidget/HealthcheckWidget.swift b/HealthcheckWidget/HealthcheckWidget.swift
@@ -280,6 +280,7 @@ struct HealthcheckWidget: Widget {
         .supportedFamilies(supportedFamilies)
         .configurationDisplayName("Meine Healthchecks")
         .description("Hier werden dir deine Healthchecks angezeigt.")
+        .contentMarginsDisabled()
     }
 }
 
@@ -300,6 +301,19 @@ struct HealthcheckWidgetStatic: Widget {
         .supportedFamilies(supportedFamilies)
         .configurationDisplayName("Meine Healthchecks")
         .description("Hier werden dir deine Healthchecks angezeigt.")
+        .contentMarginsDisabled()
+    }
+}
+
+extension View {
+    func widgetBackground(backgroundView: some View) -> some View {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return containerBackground(for: .widget) {
+                backgroundView
+            }
+        } else {
+            return background(backgroundView)
+        }
     }
 }
 

diff --git a/HealthcheckWidget/WidgetSizes/AccessoryInlineView.swift b/HealthcheckWidget/WidgetSizes/AccessoryInlineView.swift
@@ -46,6 +46,7 @@ struct AccessoryRectangleView : View {
             .padding(0)
         }
         .privacySensitive()
+        .frame(maxHeight: .infinity)
     }
 
     fileprivate func GetLastXMonitorPills(count: Int, events: [EventSymbol]) -> [Color] {

diff --git a/HealthcheckWidget/WidgetSizes/LargeSizeView.swift b/HealthcheckWidget/WidgetSizes/LargeSizeView.swift
@@ -16,7 +16,6 @@ struct LargeSizeView : View {
 
     var body: some View {
         ZStack {
-            Color("circleBG")
             HStack {
                 let firstColumn = GetColumn(start: 0, end: 4)
                 let secondColumn = GetColumn(start: 5, end: 9)
@@ -73,6 +72,8 @@ struct LargeSizeView : View {
             }
             .padding()
         }
+        .frame(maxHeight: .infinity)
+        .widgetBackground(backgroundView: Color("circleBG"))
     }
 
     fileprivate func GetLastXMonitorPills(count: Int, domain: HealthCheck) -> [Color] {

diff --git a/HealthcheckWidget/WidgetSizes/MediumSizeView.swift b/HealthcheckWidget/WidgetSizes/MediumSizeView.swift
@@ -16,7 +16,6 @@ struct MediumSizeView : View {
 
     var body: some View {
         ZStack {
-            Color("circleBG")
             HStack {
                 let firstColumn = GetColumn(start: 0, end: 1)
                 let secondColumn = GetColumn(start: 2, end: 3)
@@ -73,6 +72,8 @@ struct MediumSizeView : View {
             }
             .padding()
         }
+        .frame(maxHeight: .infinity)
+        .widgetBackground(backgroundView: Color("circleBG"))
     }
 
     fileprivate func GetLastXMonitorPills(count: Int, domain: HealthCheck) -> [Color] {

diff --git a/HealthcheckWidget/WidgetSizes/SmallSizeView.swift b/HealthcheckWidget/WidgetSizes/SmallSizeView.swift
@@ -16,7 +16,6 @@ struct SmallSizeView : View {
 
     var body: some View {
         ZStack {
-            Color("circleBG")
             VStack {
                 if (entry.configuration.healthcheckSymbol1 != nil || entry.configuration.healthcheckSymbol2 != nil) {
                     if (entry.configuration.healthcheckSymbol1 != nil) {
@@ -64,6 +63,8 @@ struct SmallSizeView : View {
             }
             .padding()
         }
+        .frame(maxHeight: .infinity)
+        .widgetBackground(backgroundView: Color("circleBG"))
     }
 
     fileprivate func GetLastXMonitorPills(count: Int, events: [EventSymbol]) -> [Color] {

diff --git a/IPv64.xcodeproj/project.pbxproj b/IPv64.xcodeproj/project.pbxproj
diff --git a/IPv64.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IPv64.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -116,6 +116,15 @@
         "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24",
         "version" : "0.1.4"
       }
+    },
+    {
+      "identity" : "toast-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/BastiaanJansen/toast-swift",
+      "state" : {
+        "revision" : "7e9e3fa6c85dc76ab996abb09b26f5fc14bec26b",
+        "version" : "1.3.2"
+      }
     }
   ],
   "version" : 2

diff --git a/...j/project.xcworkspace/xcuserdata/sebastianrank.xcuserdatad/UserInterfaceState.xcuserstate b/...j/project.xcworkspace/xcuserdata/sebastianrank.xcuserdatad/UserInterfaceState.xcuserstate