diff --git a/SwiftLeeds.xcodeproj/project.pbxproj b/SwiftLeeds.xcodeproj/project.pbxproj index e62990c..a012eeb 100644 --- a/SwiftLeeds.xcodeproj/project.pbxproj +++ b/SwiftLeeds.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 0B4CB3E928EAF5D200246E62 /* Local.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA534D8128A1909300A3BFBB /* Local.swift */; }; 0B4CB3EB28EAF5E300246E62 /* TalkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AED26F73286764F000E06064 /* TalkCell.swift */; }; 0B4CB3EC28EAF5E900246E62 /* ActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE5EFD74289E7CBF00464FE1 /* ActivityView.swift */; }; - 0B4CB3ED28EAF5F200246E62 /* SwiftLeedsContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE4A2875B06B00911F03 /* SwiftLeedsContainer.swift */; }; 0B4CB3EE28EAF5FB00246E62 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1C800F289E9F3800996659 /* String.swift */; }; 0B4CB3EF28EAF60200246E62 /* FancyHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A3831112884A96600030002 /* FancyHeaderView.swift */; }; 0B4CB3F028EAF60800246E62 /* SpeakerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394653AA288BB7C800212E1C /* SpeakerView.swift */; }; @@ -52,7 +51,6 @@ 0B910A382A49D09300648B32 /* Sponsor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B910A362A49D07700648B32 /* Sponsor.swift */; }; 2A3831122884A96600030002 /* FancyHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A3831112884A96600030002 /* FancyHeaderView.swift */; }; 39345FDA288F17EE0031BCFF /* BottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39345FD9288F17EE0031BCFF /* BottomSheetView.swift */; }; - 394653A9288BB47A00212E1C /* SectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394653A8288BB47A00212E1C /* SectionHeader.swift */; }; 394653AB288BB7C800212E1C /* SpeakerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 394653AA288BB7C800212E1C /* SpeakerView.swift */; }; 39ED0034288F113500AB337A /* LocalCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39ED0033288F113500AB337A /* LocalCell.swift */; }; 740162DA2A7053A000C2D1B3 /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 740162D92A7053A000C2D1B3 /* AppState.swift */; }; @@ -90,6 +88,7 @@ 7B31C8F12ED0A7BF00FEEDF7 /* Settings in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31C8F02ED0A7BF00FEEDF7 /* Settings */; }; 7B31C8F32ED0AB0E00FEEDF7 /* Settings in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31C8F22ED0AB0E00FEEDF7 /* Settings */; }; 7B31C8F52ED0AB1600FEEDF7 /* Settings in Frameworks */ = {isa = PBXBuildFile; productRef = 7B31C8F42ED0AB1600FEEDF7 /* Settings */; }; + 7B6278A22EEDDE1B00DE1473 /* SectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6278A12EEDDE1B00DE1473 /* SectionHeader.swift */; }; 7B8C3ECF2EE4A9F70089C6CF /* SharedAssets in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8C3ECE2EE4A9F70089C6CF /* SharedAssets */; }; 7BE081522EE5BDA8004BCD1F /* SharedAssets in Frameworks */ = {isa = PBXBuildFile; productRef = 7BE081512EE5BDA8004BCD1F /* SharedAssets */; }; 7BE081542EE5BF13004BCD1F /* SharedAssets in Frameworks */ = {isa = PBXBuildFile; productRef = 7BE081532EE5BF13004BCD1F /* SharedAssets */; }; @@ -105,9 +104,6 @@ AE8C1B2B28C4B39A00AF7318 /* TokenDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE8C1B2A28C4B39A00AF7318 /* TokenDetails.swift */; }; AE93678F2A93455400F2DB3F /* ScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE93678E2A93455400F2DB3F /* ScheduleView.swift */; }; AE9367902A93467500F2DB3F /* ScheduleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE93678E2A93455400F2DB3F /* ScheduleView.swift */; }; - AE9367962A9354CC00F2DB3F /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9367952A9354CC00F2DB3F /* Helper.swift */; }; - AE9367972A9354CC00F2DB3F /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9367952A9354CC00F2DB3F /* Helper.swift */; }; - AE9367982A9357D000F2DB3F /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9367952A9354CC00F2DB3F /* Helper.swift */; }; AEB06BD128CF8D2100E51967 /* WebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEB06BD028CF8D2100E51967 /* WebView.swift */; }; AECB295727417F9D00CDC983 /* SwiftLeedsApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AECB295627417F9D00CDC983 /* SwiftLeedsApp.swift */; }; AECB295927417F9D00CDC983 /* MyConferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AECB295827417F9D00CDC983 /* MyConferenceView.swift */; }; @@ -131,7 +127,6 @@ FA57DE462875B06500911F03 /* CommonTileButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE432875B06500911F03 /* CommonTileButton.swift */; }; FA57DE472875B06500911F03 /* CommonTileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE442875B06500911F03 /* CommonTileView.swift */; }; FA57DE482875B06500911F03 /* StackedTileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE452875B06500911F03 /* StackedTileView.swift */; }; - FA57DE4B2875B06B00911F03 /* SwiftLeedsContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE4A2875B06B00911F03 /* SwiftLeedsContainer.swift */; }; FA57DE502875B09900911F03 /* SponsorTileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA57DE4E2875B09900911F03 /* SponsorTileView.swift */; }; /* End PBXBuildFile section */ @@ -210,7 +205,6 @@ 0B910A362A49D07700648B32 /* Sponsor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sponsor.swift; sourceTree = ""; }; 2A3831112884A96600030002 /* FancyHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FancyHeaderView.swift; sourceTree = ""; }; 39345FD9288F17EE0031BCFF /* BottomSheetView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BottomSheetView.swift; sourceTree = ""; }; - 394653A8288BB47A00212E1C /* SectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionHeader.swift; sourceTree = ""; }; 394653AA288BB7C800212E1C /* SpeakerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeakerView.swift; sourceTree = ""; }; 39ED0033288F113500AB337A /* LocalCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalCell.swift; sourceTree = ""; }; 740162D92A7053A000C2D1B3 /* AppState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = ""; }; @@ -230,6 +224,7 @@ 74F5EF842A49CE6A008D9413 /* TabsMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsMainView.swift; sourceTree = ""; }; 74F5EF862A49CE9D008D9413 /* SidebarMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarMainView.swift; sourceTree = ""; }; 74F5EF882A49CECB008D9413 /* SidebarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarView.swift; sourceTree = ""; }; + 7B6278A12EEDDE1B00DE1473 /* SectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionHeader.swift; sourceTree = ""; }; 7B8108412E5CA00E00CCB2F5 /* SwiftLeedsPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SwiftLeedsPackage; sourceTree = ""; }; AE1C800F289E9F3800996659 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; AE1C801328A7BCD000996659 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; @@ -242,7 +237,6 @@ AE8C1B2A28C4B39A00AF7318 /* TokenDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenDetails.swift; sourceTree = ""; }; AE8C1B2C28C4B8D800AF7318 /* SwiftLeeds.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftLeeds.entitlements; sourceTree = ""; }; AE93678E2A93455400F2DB3F /* ScheduleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScheduleView.swift; sourceTree = ""; }; - AE9367952A9354CC00F2DB3F /* Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helper.swift; sourceTree = ""; }; AEB06BD028CF8D2100E51967 /* WebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebView.swift; sourceTree = ""; }; AECB295327417F9D00CDC983 /* SwiftLeeds.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftLeeds.app; sourceTree = BUILT_PRODUCTS_DIR; }; AECB295627417F9D00CDC983 /* SwiftLeedsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftLeedsApp.swift; sourceTree = ""; }; @@ -269,7 +263,6 @@ FA57DE432875B06500911F03 /* CommonTileButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommonTileButton.swift; sourceTree = ""; }; FA57DE442875B06500911F03 /* CommonTileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommonTileView.swift; sourceTree = ""; }; FA57DE452875B06500911F03 /* StackedTileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StackedTileView.swift; sourceTree = ""; }; - FA57DE4A2875B06B00911F03 /* SwiftLeedsContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftLeedsContainer.swift; sourceTree = ""; }; FA57DE4E2875B09900911F03 /* SponsorTileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SponsorTileView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -474,7 +467,6 @@ isa = PBXGroup; children = ( AED26F7628676A9200E06064 /* About */, - FA57DE412875B03800911F03 /* Common */, FA57DE422875B03B00911F03 /* Components */, AED26F7528676A8E00E06064 /* Local */, AEDC0DAF28675D060078A153 /* My Conference */, @@ -498,6 +490,7 @@ AED26F7528676A8E00E06064 /* Local */ = { isa = PBXGroup; children = ( + 7B6278A12EEDDE1B00DE1473 /* SectionHeader.swift */, 39345FD9288F17EE0031BCFF /* BottomSheetView.swift */, 39ED0033288F113500AB337A /* LocalCell.swift */, AED26F7928676AA300E06064 /* LocalView.swift */, @@ -543,16 +536,6 @@ path = "My Conference"; sourceTree = ""; }; - FA57DE412875B03800911F03 /* Common */ = { - isa = PBXGroup; - children = ( - AE9367952A9354CC00F2DB3F /* Helper.swift */, - 394653A8288BB47A00212E1C /* SectionHeader.swift */, - FA57DE4A2875B06B00911F03 /* SwiftLeedsContainer.swift */, - ); - path = Common; - sourceTree = ""; - }; FA57DE422875B03B00911F03 /* Components */ = { isa = PBXGroup; children = ( @@ -824,7 +807,6 @@ 0B4CB3F128EAF61000246E62 /* StackedTileView.swift in Sources */, 0B4CB3DE28EAF57E00246E62 /* MyConferenceViewModel.swift in Sources */, AE9367902A93467500F2DB3F /* ScheduleView.swift in Sources */, - 0B4CB3ED28EAF5F200246E62 /* SwiftLeedsContainer.swift in Sources */, 0B4CB3EC28EAF5E900246E62 /* ActivityView.swift in Sources */, 0B4CB3F228EAF61600246E62 /* WebView.swift in Sources */, 0B59B5712E70EA6600820C3C /* About.swift in Sources */, @@ -836,7 +818,6 @@ 0B4CB3E928EAF5D200246E62 /* Local.swift in Sources */, 0B910A352A48FEC100648B32 /* SponsorTileView.swift in Sources */, E3569B062E5B903800BC9556 /* ShimmerView.swift in Sources */, - AE9367972A9354CC00F2DB3F /* Helper.swift in Sources */, 0B4CB3E528EAF5B700246E62 /* Speaker.swift in Sources */, 0B4CB3E828EAF5CD00246E62 /* AnnouncementCell.swift in Sources */, 0B4CB3DD28EAF57900246E62 /* MyConferenceView.swift in Sources */, @@ -862,7 +843,6 @@ 74E62F7228CA98EA004422F9 /* SwiftLeedsSmallWidgetView.swift in Sources */, 7406572928E240720087F44F /* WidgetConstants.swift in Sources */, 0B59B5672E70E5D400820C3C /* TeamMember.swift in Sources */, - AE9367982A9357D000F2DB3F /* Helper.swift in Sources */, 74B14FB028CE21D7004C0A40 /* TimeineProvider.swift in Sources */, 74E62F7828CADBE0004422F9 /* Activity.swift in Sources */, 74E62F7A28CAE4DF004422F9 /* Speaker.swift in Sources */, @@ -884,8 +864,6 @@ 0B59B5692E70E5FE00820C3C /* TeamMemberView.swift in Sources */, 394653AB288BB7C800212E1C /* SpeakerView.swift in Sources */, 0B59B56F2E70EA4F00820C3C /* AboutViewModel.swift in Sources */, - 394653A9288BB47A00212E1C /* SectionHeader.swift in Sources */, - AE9367962A9354CC00F2DB3F /* Helper.swift in Sources */, AED26F7A28676AA300E06064 /* LocalView.swift in Sources */, 39ED0034288F113500AB337A /* LocalCell.swift in Sources */, AEDC22552898288F00746247 /* Schedule.swift in Sources */, @@ -895,7 +873,6 @@ AECB295927417F9D00CDC983 /* MyConferenceView.swift in Sources */, AE8C1B2428BFCFC700AF7318 /* Presentation.swift in Sources */, 2A3831122884A96600030002 /* FancyHeaderView.swift in Sources */, - FA57DE4B2875B06B00911F03 /* SwiftLeedsContainer.swift in Sources */, 0B59B5722E70EA6600820C3C /* About.swift in Sources */, 0B59B56B2E70E6AC00820C3C /* CompactActionItem.swift in Sources */, 74F5EF892A49CECB008D9413 /* SidebarView.swift in Sources */, @@ -912,6 +889,7 @@ AE8C1B2B28C4B39A00AF7318 /* TokenDetails.swift in Sources */, 0B910A372A49D07700648B32 /* Sponsor.swift in Sources */, AEDC0DAE286759630078A153 /* Tabs.swift in Sources */, + 7B6278A22EEDDE1B00DE1473 /* SectionHeader.swift in Sources */, AE8C1B2628BFCFE700AF7318 /* Speaker.swift in Sources */, AE8C1B2228BFCF4700AF7318 /* Activity.swift in Sources */, FA57DE482875B06500911F03 /* StackedTileView.swift in Sources */, diff --git a/SwiftLeeds/Views/About/AboutView.swift b/SwiftLeeds/Views/About/AboutView.swift index 14d8757..0f58b4a 100644 --- a/SwiftLeeds/Views/About/AboutView.swift +++ b/SwiftLeeds/Views/About/AboutView.swift @@ -28,11 +28,10 @@ struct AboutView: View { } var body: some View { - SwiftLeedsContainer { - ScrollView { - content - } + ScrollView { + content } + .background(Color.background, ignoresSafeAreaEdges: .all) .edgesIgnoringSafeArea(.top) } @@ -191,5 +190,6 @@ struct AboutView: View { struct AboutView_Previews: PreviewProvider { static var previews: some View { AboutView() + .preferredColorScheme(.dark) } } diff --git a/SwiftLeeds/Views/Common/Helper.swift b/SwiftLeeds/Views/Common/Helper.swift deleted file mode 100644 index 7f6c64e..0000000 --- a/SwiftLeeds/Views/Common/Helper.swift +++ /dev/null @@ -1,9 +0,0 @@ -import Foundation - -enum Helper { - static var shortDateFormatter: DateFormatter = { - let dateformatter = DateFormatter() - dateformatter.dateFormat = "dd-MM-yyyy" - return dateformatter - }() -} diff --git a/SwiftLeeds/Views/Common/SwiftLeedsContainer.swift b/SwiftLeeds/Views/Common/SwiftLeedsContainer.swift deleted file mode 100644 index a125281..0000000 --- a/SwiftLeeds/Views/Common/SwiftLeedsContainer.swift +++ /dev/null @@ -1,25 +0,0 @@ -import SharedAssets -import SwiftUI - -struct SwiftLeedsContainer: View { - private var content: () -> (Content) - - init(@ViewBuilder content: @escaping () -> (Content)) { - self.content = content - } - - var body: some View { - ZStack { - Color.background.edgesIgnoringSafeArea(.all) - content() - } - } -} - -struct SwiftLeedsContainer_Previews: PreviewProvider { - static var previews: some View { - SwiftLeedsContainer { - Text(verbatim: "SwiftLeeds 22") - } - } -} diff --git a/SwiftLeeds/Views/Local/BottomSheetView.swift b/SwiftLeeds/Views/Local/BottomSheetView.swift index 3e357b3..a788e5f 100644 --- a/SwiftLeeds/Views/Local/BottomSheetView.swift +++ b/SwiftLeeds/Views/Local/BottomSheetView.swift @@ -39,9 +39,11 @@ struct BottomSheetView: View { VStack { VStack(spacing: Padding.cellGap) { Spacer() - SectionHeader(title: "Local", - fontStyle: .title2.weight(.semibold), - foregroundColor: .primary) + SectionHeader( + title: "Local", + fontStyle: .title2.weight(.semibold), + foregroundColor: .primary + ) .fitToReadableContentGuide(type: .width) ScrollView { ForEach(categories) { category in diff --git a/SwiftLeeds/Views/Common/SectionHeader.swift b/SwiftLeeds/Views/Local/SectionHeader.swift similarity index 57% rename from SwiftLeeds/Views/Common/SectionHeader.swift rename to SwiftLeeds/Views/Local/SectionHeader.swift index 77829ae..8896c32 100644 --- a/SwiftLeeds/Views/Common/SectionHeader.swift +++ b/SwiftLeeds/Views/Local/SectionHeader.swift @@ -1,19 +1,20 @@ import SwiftUI struct SectionHeader: View { - let title: String - let fontStyle: Font - let foregroundColor: Color - let maxWidth: CGFloat - let alignment: Alignment - let accesibilityAddTraits: AccessibilityTraits - - internal init(title: String, - fontStyle: Font = .callout.weight(.semibold), - foregroundColor : Color = .secondary, - maxWidth: CGFloat = .infinity, - alignment: Alignment = .leading, - accessbilityAddTraits: AccessibilityTraits = .isHeader + private let title: String + private let fontStyle: Font + private let foregroundColor: Color + private let maxWidth: CGFloat + private let alignment: Alignment + private let accesibilityAddTraits: AccessibilityTraits + + init( + title: String, + fontStyle: Font = .callout.weight(.semibold), + foregroundColor : Color = .secondary, + maxWidth: CGFloat = .infinity, + alignment: Alignment = .leading, + accessbilityAddTraits: AccessibilityTraits = .isHeader ) { self.title = title self.fontStyle = fontStyle diff --git a/SwiftLeeds/Views/My Conference/ActivityView.swift b/SwiftLeeds/Views/My Conference/ActivityView.swift index 85b8ec3..c65c844 100644 --- a/SwiftLeeds/Views/My Conference/ActivityView.swift +++ b/SwiftLeeds/Views/My Conference/ActivityView.swift @@ -7,11 +7,10 @@ struct ActivityView: View { @Environment(\.openURL) var openURL var body: some View { - SwiftLeedsContainer { - ScrollView { - content - } + ScrollView { + content } + .background(Color.background, ignoresSafeAreaEdges: .all) .edgesIgnoringSafeArea(.top) } diff --git a/SwiftLeeds/Views/My Conference/SpeakerView.swift b/SwiftLeeds/Views/My Conference/SpeakerView.swift index ac936d4..5150b1e 100644 --- a/SwiftLeeds/Views/My Conference/SpeakerView.swift +++ b/SwiftLeeds/Views/My Conference/SpeakerView.swift @@ -10,11 +10,10 @@ struct SpeakerView: View { @Environment(\.openURL) var openURL var body: some View { - SwiftLeedsContainer { - ScrollView { - content - } + ScrollView { + content } + .background(Color.background, ignoresSafeAreaEdges: .all) .edgesIgnoringSafeArea(.top) } diff --git a/SwiftLeeds/Views/Sponsors/SponsorsView.swift b/SwiftLeeds/Views/Sponsors/SponsorsView.swift index 7698724..4d81870 100644 --- a/SwiftLeeds/Views/Sponsors/SponsorsView.swift +++ b/SwiftLeeds/Views/Sponsors/SponsorsView.swift @@ -10,20 +10,13 @@ struct SponsorsView: View { @State private var selectedSponsorLevel: SponsorLevel? var body: some View { - SwiftLeedsContainer { - content - } - .edgesIgnoringSafeArea(.top) - } - - private var content: some View { ScrollView { VStack(spacing: 0) { FancyHeaderView( title: "Sponsors", foregroundImageName: Assets.Image.swiftLeedsIcon ) - + if isLoading { loadingView .padding(.top, Padding.screen) @@ -35,6 +28,8 @@ struct SponsorsView: View { } } } + .background(Color.background, ignoresSafeAreaEdges: .all) + .edgesIgnoringSafeArea(.top) .scrollIndicators(.hidden) .task { await loadSponsors() diff --git a/SwiftLeedsPackage/Package.swift b/SwiftLeedsPackage/Package.swift index 92a76d5..6ea2c94 100644 --- a/SwiftLeedsPackage/Package.swift +++ b/SwiftLeedsPackage/Package.swift @@ -37,7 +37,7 @@ let package = Package( targets: [ "SharedAssets", ] - ) + ), ], dependencies: [ .package(url: "https://github.com/shadone/SwiftGenPlugin", branch: "6.6.2+deriveddatafix"),