Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrationen #31

Merged
merged 5 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
14 changes: 14 additions & 0 deletions HealthcheckWidget/HealthcheckWidget.swift
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ struct HealthcheckWidget: Widget {
.supportedFamilies(supportedFamilies)
.configurationDisplayName("Meine Healthchecks")
.description("Hier werden dir deine Healthchecks angezeigt.")
.contentMarginsDisabled()
}
}

Expand All @@ -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)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions HealthcheckWidget/WidgetSizes/AccessoryInlineView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct AccessoryRectangleView : View {
.padding(0)
}
.privacySensitive()
.frame(maxHeight: .infinity)
}

fileprivate func GetLastXMonitorPills(count: Int, events: [EventSymbol]) -> [Color] {
Expand Down
3 changes: 2 additions & 1 deletion HealthcheckWidget/WidgetSizes/LargeSizeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -73,6 +72,8 @@ struct LargeSizeView : View {
}
.padding()
}
.frame(maxHeight: .infinity)
.widgetBackground(backgroundView: Color("circleBG"))
}

fileprivate func GetLastXMonitorPills(count: Int, domain: HealthCheck) -> [Color] {
Expand Down
3 changes: 2 additions & 1 deletion HealthcheckWidget/WidgetSizes/MediumSizeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -73,6 +72,8 @@ struct MediumSizeView : View {
}
.padding()
}
.frame(maxHeight: .infinity)
.widgetBackground(backgroundView: Color("circleBG"))
}

fileprivate func GetLastXMonitorPills(count: Int, domain: HealthCheck) -> [Color] {
Expand Down
3 changes: 2 additions & 1 deletion HealthcheckWidget/WidgetSizes/SmallSizeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -64,6 +63,8 @@ struct SmallSizeView : View {
}
.padding()
}
.frame(maxHeight: .infinity)
.widgetBackground(backgroundView: Color("circleBG"))
}

fileprivate func GetLastXMonitorPills(count: Int, events: [EventSymbol]) -> [Color] {
Expand Down
97 changes: 91 additions & 6 deletions IPv64.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file not shown.
Loading
Loading