From c071798b02ac67caf24c6ab47864cd3a2a5e1e50 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 6 Nov 2023 18:31:50 -0700 Subject: [PATCH] Fixes for iOS 17 / xCode 15 --- ios/Runner.xcodeproj/project.pbxproj | 2 +- ios/WonderousWidget/WonderousWidget.swift | 5 +---- lib/logic/collectibles_logic.dart | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d716f001..2d5075ca 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -244,11 +244,11 @@ 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, + 297F6FD82AD06E0F00FF159E /* Embed Foundation Extensions */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 9DAF500633B345EE15CA82E0 /* [CP] Embed Pods Frameworks */, B727DC94BF66FDBF036EDFA6 /* [CP] Copy Pods Resources */, - 297F6FD82AD06E0F00FF159E /* Embed Foundation Extensions */, ); buildRules = ( ); diff --git a/ios/WonderousWidget/WonderousWidget.swift b/ios/WonderousWidget/WonderousWidget.swift index d7d65fd0..64bc89f6 100644 --- a/ios/WonderousWidget/WonderousWidget.swift +++ b/ios/WonderousWidget/WonderousWidget.swift @@ -9,7 +9,6 @@ struct WonderousTimelineEntry : TimelineEntry { var title:String = ""; var subTitle:String = ""; var imageData:String = ""; - } // Widget, defines the display name and description and also declared the main View @@ -20,6 +19,7 @@ struct WonderousWidget: Widget { StaticConfiguration(kind: kind, provider: WonderousTimelineProvider()) { entry in WonderousWidgetView(entry: entry) } + .contentMarginsDisabled() .configurationDisplayName("Wonderous Widget") .description("Track your collected artifacts!") .supportedFamilies([.systemSmall, .systemMedium, .systemLarge]) @@ -41,9 +41,6 @@ struct WonderousTimelineProvider: TimelineProvider { let title = userDefaults?.string(forKey: "lastDiscoveredTitle") ?? "" let subTitle = userDefaults?.string(forKey: "lastDiscoveredSubTitle") ?? "" let imageData = userDefaults?.string(forKey: "lastDiscoveredImageData") ?? "" -// if(context.isPreview){ -// entry = WonderousEntry(date: Date(), discoveredCount: discoveredCount) -// } entry = WonderousTimelineEntry( date: Date(), discoveredCount:discoveredCount, diff --git a/lib/logic/collectibles_logic.dart b/lib/logic/collectibles_logic.dart index e24329b9..cc210229 100644 --- a/lib/logic/collectibles_logic.dart +++ b/lib/logic/collectibles_logic.dart @@ -96,7 +96,6 @@ class CollectiblesLogic with ThrottledSaveLoadMixin { scheduleSave(); } - // TODO: Optimize to send both network requests simultaneously Future _updateHomeWidgetTextData({String title = '', String id = '', String imageUrl = ''}) async { // Save title HomeWidget.saveWidgetData('lastDiscoveredTitle', title);