Remove old todos

analysis_options.yaml

@@ -9,11 +9,6 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
-analyzer:
-  errors:
-    prefer_const_constructors: ignore
-    unused_element: ignore # mostly because of super.key
-
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -27,8 +22,9 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    - always_declare_return_types
+    always_declare_return_types: true
-    - always_use_package_imports
+    always_use_package_imports: true
-    - prefer_single_quotes
+    prefer_const_constructors: false
+    prefer_single_quotes: true
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -33,7 +33,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion flutter.compileSdkVersion
 
     defaultConfig {
         configurations.all {
@@ -47,9 +47,17 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+   }
    buildTypes {
        release {
-           signingConfig signingConfigs.debug
+           signingConfig signingConfigs.release
        }
    }
 

ios/Podfile.lock

@@ -4,21 +4,21 @@ PODS:
     - Flutter
   - google_maps_flutter_ios (0.0.1):
     - Flutter
-    - GoogleMaps (< 9.0)
+    - GoogleMaps
   - GoogleMaps (6.2.1):
     - GoogleMaps/Maps (= 6.2.1)
   - GoogleMaps/Base (6.2.1)
   - GoogleMaps/Maps (6.2.1):
     - GoogleMaps/Base
-  - home_widget (0.0.1):
+  - image_gallery_saver (1.5.0):
-    - Flutter
-  - image_gallery_saver (2.0.2):
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - share_plus (0.0.1):
+    - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -31,10 +31,10 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
-  - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
@@ -50,14 +50,14 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   google_maps_flutter_ios:
     :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
-  home_widget:
-    :path: ".symlinks/plugins/home_widget/ios"
   image_gallery_saver:
     :path: ".symlinks/plugins/image_gallery_saver/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
@@ -68,16 +68,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
+  google_maps_flutter_ios: 66201f392bf62d500f07670a30488a247b9bb5b9
   GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
+  image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2
-  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
-  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
+  webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.15.0
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -8,18 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		296251252AE7410D00D574FF /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 296251242AE7410D00D574FF /* Colors.swift */; };
-		2978ECDD2B62D00C00E36CE8 /* FlutterAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2978ECDC2B62D00C00E36CE8 /* FlutterAssets.swift */; };
-		297F6FC72AD06E0D00FF159E /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 297F6FC62AD06E0D00FF159E /* WidgetKit.framework */; };
-		297F6FC92AD06E0D00FF159E /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 297F6FC82AD06E0D00FF159E /* SwiftUI.framework */; };
-		297F6FCC2AD06E0D00FF159E /* WonderousWidgetBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297F6FCB2AD06E0D00FF159E /* WonderousWidgetBundle.swift */; };
-		297F6FCE2AD06E0D00FF159E /* WonderousWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297F6FCD2AD06E0D00FF159E /* WonderousWidget.swift */; };
-		297F6FD12AD06E0F00FF159E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 297F6FD02AD06E0F00FF159E /* Assets.xcassets */; };
-		297F6FD32AD06E0F00FF159E /* WonderousWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 297F6FCF2AD06E0D00FF159E /* WonderousWidget.intentdefinition */; };
-		297F6FD42AD06E0F00FF159E /* WonderousWidget.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 297F6FCF2AD06E0D00FF159E /* WonderousWidget.intentdefinition */; };
-		297F6FD72AD06E0F00FF159E /* Wonderous WidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 297F6FC52AD06E0D00FF159E /* Wonderous WidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		297FD5742AE18011008D8BFE /* WonderousWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297FD5732AE18011008D8BFE /* WonderousWidgetView.swift */; };
-		297FD5762AE19BD9008D8BFE /* WonderWidgetViewComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297FD5752AE19BD9008D8BFE /* WonderWidgetViewComponents.swift */; };
 		323DE3CFA8490EAB3C4E249C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A44ACC5DE81A9C3E5BDA151 /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@@ -29,13 +17,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		297F6FD52AD06E0F00FF159E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 297F6FC42AD06E0D00FF159E;
-			remoteInfo = WonderousWidgetExtension;
-		};
 		E214FC8827C5A18E005F78FB /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
@@ -46,17 +27,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		297F6FD82AD06E0F00FF159E /* Embed Foundation Extensions */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 13;
-			files = (
-				297F6FD72AD06E0F00FF159E /* Wonderous WidgetExtension.appex in Embed Foundation Extensions */,
-			);
-			name = "Embed Foundation Extensions";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -73,19 +43,6 @@
 		1475293CB8660AC785DF56AB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		296251242AE7410D00D574FF /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
-		2978ECDC2B62D00C00E36CE8 /* FlutterAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlutterAssets.swift; sourceTree = "<group>"; };
-		297F6FC52AD06E0D00FF159E /* Wonderous WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; name = "Wonderous WidgetExtension.appex"; path = WonderousWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
-		297F6FC62AD06E0D00FF159E /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
-		297F6FC82AD06E0D00FF159E /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
-		297F6FCB2AD06E0D00FF159E /* WonderousWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WonderousWidgetBundle.swift; sourceTree = "<group>"; };
-		297F6FCD2AD06E0D00FF159E /* WonderousWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WonderousWidget.swift; sourceTree = "<group>"; };
-		297F6FCF2AD06E0D00FF159E /* WonderousWidget.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = WonderousWidget.intentdefinition; sourceTree = "<group>"; };
-		297F6FD02AD06E0F00FF159E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		297F6FD22AD06E0F00FF159E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		297FD56C2ADF0DAB008D8BFE /* WonderousWidgetExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WonderousWidgetExtension.entitlements; sourceTree = "<group>"; };
-		297FD5732AE18011008D8BFE /* WonderousWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WonderousWidgetView.swift; sourceTree = "<group>"; };
-		297FD5752AE19BD9008D8BFE /* WonderWidgetViewComponents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WonderWidgetViewComponents.swift; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4A44ACC5DE81A9C3E5BDA151 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -105,15 +62,6 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		297F6FC22AD06E0D00FF159E /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				297F6FC92AD06E0D00FF159E /* SwiftUI.framework in Frameworks */,
-				297F6FC72AD06E0D00FF159E /* WidgetKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -132,28 +80,10 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		297F6FCA2AD06E0D00FF159E /* WonderousWidget */ = {
-			isa = PBXGroup;
-			children = (
-				297F6FCB2AD06E0D00FF159E /* WonderousWidgetBundle.swift */,
-				297F6FCD2AD06E0D00FF159E /* WonderousWidget.swift */,
-				297F6FCF2AD06E0D00FF159E /* WonderousWidget.intentdefinition */,
-				297F6FD02AD06E0F00FF159E /* Assets.xcassets */,
-				297F6FD22AD06E0F00FF159E /* Info.plist */,
-				297FD5732AE18011008D8BFE /* WonderousWidgetView.swift */,
-				297FD5752AE19BD9008D8BFE /* WonderWidgetViewComponents.swift */,
-				296251242AE7410D00D574FF /* Colors.swift */,
-				2978ECDC2B62D00C00E36CE8 /* FlutterAssets.swift */,
-			);
-			path = WonderousWidget;
-			sourceTree = "<group>";
-		};
 		5073AC1D92C10773F20D12A2 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				4A44ACC5DE81A9C3E5BDA151 /* Pods_Runner.framework */,
-				297F6FC62AD06E0D00FF159E /* WidgetKit.framework */,
-				297F6FC82AD06E0D00FF159E /* SwiftUI.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -172,10 +102,8 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
-				297FD56C2ADF0DAB008D8BFE /* WonderousWidgetExtension.entitlements */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
-				297F6FCA2AD06E0D00FF159E /* WonderousWidget */,
 				97C146EF1CF9000F007C117D /* Products */,
 				5073AC1D92C10773F20D12A2 /* Frameworks */,
 				E090BB04291350D10AF9DE4E /* Pods */,
@@ -187,7 +115,6 @@
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
 				E214FC8227C5A18D005F78FB /* wondersUITests.xctest */,
-				297F6FC52AD06E0D00FF159E /* Wonderous WidgetExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -221,23 +148,6 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		297F6FC42AD06E0D00FF159E /* WonderousWidgetExtension */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 297F6FDC2AD06E0F00FF159E /* Build configuration list for PBXNativeTarget "WonderousWidgetExtension" */;
-			buildPhases = (
-				297F6FC12AD06E0D00FF159E /* Sources */,
-				297F6FC22AD06E0D00FF159E /* Frameworks */,
-				297F6FC32AD06E0D00FF159E /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = WonderousWidgetExtension;
-			productName = WonderousWidgetExtension;
-			productReference = 297F6FC52AD06E0D00FF159E /* Wonderous WidgetExtension.appex */;
-			productType = "com.apple.product-type.app-extension";
-		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
@@ -247,7 +157,6 @@
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
-				297F6FD82AD06E0F00FF159E /* Embed Foundation Extensions */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				9DAF500633B345EE15CA82E0 /* [CP] Embed Pods Frameworks */,
@@ -256,7 +165,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				297F6FD62AD06E0F00FF159E /* PBXTargetDependency */,
 			);
 			name = Runner;
 			productName = Runner;
@@ -290,13 +198,10 @@
 				KnownAssetTags = (
 					New,
 				);
-				LastSwiftUpdateCheck = 1430;
+				LastSwiftUpdateCheck = 1320;
 				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
-					297F6FC42AD06E0D00FF159E = {
-						CreatedOnToolsVersion = 14.3.1;
-					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
 						LastSwiftMigration = 1100;
@@ -322,20 +227,11 @@
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
 				E214FC8127C5A18D005F78FB /* wondersUITests */,
-				297F6FC42AD06E0D00FF159E /* WonderousWidgetExtension */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		297F6FC32AD06E0D00FF159E /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				297F6FD12AD06E0F00FF159E /* Assets.xcassets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -447,25 +343,10 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		297F6FC12AD06E0D00FF159E /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				297FD5762AE19BD9008D8BFE /* WonderWidgetViewComponents.swift in Sources */,
-				296251252AE7410D00D574FF /* Colors.swift in Sources */,
-				297F6FD32AD06E0F00FF159E /* WonderousWidget.intentdefinition in Sources */,
-				2978ECDD2B62D00C00E36CE8 /* FlutterAssets.swift in Sources */,
-				297FD5742AE18011008D8BFE /* WonderousWidgetView.swift in Sources */,
-				297F6FCE2AD06E0D00FF159E /* WonderousWidget.swift in Sources */,
-				297F6FCC2AD06E0D00FF159E /* WonderousWidgetBundle.swift in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				297F6FD42AD06E0F00FF159E /* WonderousWidget.intentdefinition in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);
@@ -481,11 +362,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		297F6FD62AD06E0F00FF159E /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 297F6FC42AD06E0D00FF159E /* WonderousWidgetExtension */;
-			targetProxy = 297F6FD52AD06E0F00FF159E /* PBXContainerItemProxy */;
-		};
 		E214FC8927C5A18E005F78FB /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 97C146ED1CF9000F007C117D /* Runner */;
@@ -569,7 +445,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -594,120 +469,6 @@
 			};
 			name = Profile;
 		};
-		297F6FD92AD06E0F00FF159E /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = WonderousWidgetExtension.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S3TL5AY6Y3;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = WonderousWidget/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Wonderous Widget";
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.gskinner.flutter.wonders.Wonderous-Widget";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		297F6FDA2AD06E0F00FF159E /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = WonderousWidgetExtension.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S3TL5AY6Y3;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = WonderousWidget/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Wonderous Widget";
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.gskinner.flutter.wonders.Wonderous-Widget";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-		297F6FDB2AD06E0F00FF159E /* Profile */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "Wonderous WidgetExtension.entitlements";
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = S3TL5AY6Y3;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "Wonderous Widget/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "Wonderous Widget";
-				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
-				MARKETING_VERSION = 1.0;
-				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.gskinner.flutter.wonders.Wonderous-Widget";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Profile;
-		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -823,7 +584,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -853,7 +613,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
@@ -962,16 +721,6 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		297F6FDC2AD06E0F00FF159E /* Build configuration list for PBXNativeTarget "WonderousWidgetExtension" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				297F6FD92AD06E0F00FF159E /* Debug */,
-				297F6FDA2AD06E0F00FF159E /* Release */,
-				297F6FDB2AD06E0F00FF159E /* Profile */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/Runner/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
-	    <key>FlutterDeepLinkingEnabled</key>
-        <true/>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
 		<true/>
 		<key>CFBundleDevelopmentRegion</key>

ios/Runner/Runner.entitlements

@@ -4,9 +4,5 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.com.gskinner.flutter.wonders.widget</string>
-	</array>
 </dict>
 </plist>

ios/Wonderous Widget/Assets.xcassets/WidgetBackground.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Wonderous Widget/Wonderous_Widget.swift

@@ -0,0 +1,66 @@
+//
+//  Wonderous_Widget.swift
+//  Wonderous Widget
+//
+//  Created by Shawn on 2023-06-08.
+//
+
+import WidgetKit
+import SwiftUI
+
+struct Provider: TimelineProvider {
+    func placeholder(in context: Context) -> SimpleEntry {
+        SimpleEntry(date: Date())
+    }
+
+    func getSnapshot(in context: Context, completion: @escaping (SimpleEntry) -> ()) {
+        let entry = SimpleEntry(date: Date())
+        completion(entry)
+    }
+
+    func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> ()) {
+        var entries: [SimpleEntry] = []
+
+        // Generate a timeline consisting of five entries an hour apart, starting from the current date.
+        let currentDate = Date()
+        for hourOffset in 0 ..< 5 {
+            let entryDate = Calendar.current.date(byAdding: .hour, value: hourOffset, to: currentDate)!
+            let entry = SimpleEntry(date: entryDate)
+            entries.append(entry)
+        }
+
+        let timeline = Timeline(entries: entries, policy: .atEnd)
+        completion(timeline)
+    }
+}
+
+struct SimpleEntry: TimelineEntry {
+    let date: Date
+}
+
+struct Wonderous_WidgetEntryView : View {
+    var entry: Provider.Entry
+
+    var body: some View {
+        Text(entry.date, style: .time)
+    }
+}
+
+struct Wonderous_Widget: Widget {
+    let kind: String = "Wonderous_Widget"
+
+    var body: some WidgetConfiguration {
+        StaticConfiguration(kind: kind, provider: Provider()) { entry in
+            Wonderous_WidgetEntryView(entry: entry)
+        }
+        .configurationDisplayName("My Widget")
+        .description("This is an example widget.")
+    }
+}
+
+struct Wonderous_Widget_Previews: PreviewProvider {
+    static var previews: some View {
+        Wonderous_WidgetEntryView(entry: SimpleEntry(date: Date()))
+            .previewContext(WidgetPreviewContext(family: .systemSmall))
+    }
+}

ios/Wonderous Widget/Wonderous_WidgetBundle.swift

@@ -0,0 +1,16 @@
+//
+//  Wonderous_WidgetBundle.swift
+//  Wonderous Widget
+//
+//  Created by Shawn on 2023-06-08.
+//
+
+import WidgetKit
+import SwiftUI
+
+@main
+struct Wonderous_WidgetBundle: WidgetBundle {
+    var body: some Widget {
+        Wonderous_Widget()
+    }
+}

ios/WonderousWidget/Colors.swift

@@ -1,11 +0,0 @@
-import Foundation
-import SwiftUI
-
-/// Define some custom extensions on the Color class, so we can use the shorthand syntax `..myColor`
-extension Color {
-    public static let accent = Color(red: 0.89, green: 0.58, blue: 0.36)
-    public static let offWhite = Color(red: 0.97, green: 0.92, blue: 0.9)
-    public static let mediumGrey = Color(red: 0.62, green: 0.6, blue: 0.58)
-    public static let darkGrey = Color(red: 0.15, green: 0.15, blue: 0.15)
-    public static let body = Color(red: 0.32, green: 0.31, blue: 0.3);
-}

ios/WonderousWidget/FlutterAssets.swift

@@ -1,22 +0,0 @@
-import Foundation
-
-struct FlutterImages {
-    static let bgEmpty = getAssetPath("/assets/images/widget/background-empty.jpg")
-    static let icon = getAssetPath("/assets/images/widget/wonderous-icon.png")
-}
-
-func getAssetPath(_ path : String) -> String {
-    return assetBundleUrl.appending(path: path).path()
-}
-
-// Returns a file path to the location of the flutter assetBundle
-var assetBundleUrl: URL {
-    let bundle = Bundle.main
-    if bundle.bundleURL.pathExtension == "appex" {
-        // Peel off two directory levels - MY_APP.app/PlugIns/MY_APP_EXTENSION.appex
-        var url = bundle.bundleURL.deletingLastPathComponent().deletingLastPathComponent()
-        url.append(component: "Frameworks/App.framework/flutter_assets")
-        return url
-    }
-    return bundle.bundleURL
-}

ios/WonderousWidget/FlutterUtils.swift

@@ -1,11 +0,0 @@
-//
-//  FlutterUtils.swift
-//  Wonderous WidgetExtension
-//
-//  Created by Shawn on 2023-10-19.
-//
-
-import Foundation
-
-
-

ios/WonderousWidget/WonderWidgetViewComponents.swift

@@ -1,63 +0,0 @@
-import Foundation
-import SwiftUI
-
-
-// Loads a default image from the flutter assets bundle,
-// or  displays a base64 encoded image that has been saved from the flutter application
-struct BgImage : View {
-    var entry: WonderousTimelineEntry
-    var body: some View {
-        var uiImage:UIImage?;
-        // If there is no saved imageData, use the default bg image
-        if(entry.imageData.isEmpty){
-            uiImage = UIImage(contentsOfFile: FlutterImages.bgEmpty);
-        }
-        // Load a base64 encoded image that has been written by the flutter app
-        else {
-            uiImage = UIImage(data: Data(base64Encoded: entry.imageData)!)
-        }
-        if(uiImage != nil){
-            // Use geometry reader to prevent an oversized bg image from pushing the other content out of the widgets bounds (https://stackoverflow.com/questions/57593552/swiftui-prevent-image-from-expanding-view-rect-outside-of-screen-bounds)
-            let image = GeometryReader { geometry in
-                Image(uiImage: uiImage!)
-                    .resizable()
-                    .aspectRatio(contentMode: .fill)
-                    .edgesIgnoringSafeArea(.all) // Ignore the safe area
-                    .frame(maxWidth: geometry.size.width, maxHeight: geometry.size.height)
-            }
-            return AnyView(image)
-        }
-        debugPrint("The image file could not be loaded")
-        return AnyView(EmptyView())
-    }
-    
-}
-
-// Declares a restyled version of the native ProgressView
-struct GaugeProgressStyle: ProgressViewStyle {
-    func makeBody(configuration: Configuration) -> some View {
-        let fractionCompleted = configuration.fractionCompleted ?? 0
-        return ZStack {
-            Circle()
-                .stroke(Color.body, style: StrokeStyle(lineWidth: 2))
-            Circle()
-                .trim(from: 0, to: fractionCompleted)
-                .stroke(Color.accent, style: StrokeStyle(lineWidth: 4, lineCap: .round))
-                .rotationEffect(.degrees(90))
-        }
-    }
-}
-
-// Create an extension to support new containerBackground API on
-// iOS 17 while still supporting iOS 16 and less (https://nemecek.be/blog/192/hotfixing-widgets-for-ios-17-containerbackground-padding)
-extension View {
-    func widgetBackground(_ backgroundView: some View) -> some View {
-        if #available(iOSApplicationExtension 17.0, iOS 17.0, macOSApplicationExtension 14.0, *) {
-            return containerBackground(for: .widget) {
-                backgroundView
-            }
-        } else {
-            return background(backgroundView)
-        }
-    }
-}

ios/WonderousWidget/WonderousWidget.intentdefinition

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>INEnums</key>
-	<array/>
-	<key>INIntentDefinitionModelVersion</key>
-	<string>1.2</string>
-	<key>INIntentDefinitionNamespace</key>
-	<string>88xZPY</string>
-	<key>INIntentDefinitionSystemVersion</key>
-	<string>20A294</string>
-	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>12A6144</string>
-	<key>INIntentDefinitionToolsVersion</key>
-	<string>12.0</string>
-	<key>INIntents</key>
-	<array>
-		<dict>
-			<key>INIntentCategory</key>
-			<string>information</string>
-			<key>INIntentDescriptionID</key>
-			<string>tVvJ9c</string>
-			<key>INIntentEligibleForWidgets</key>
-			<true/>
-			<key>INIntentIneligibleForSuggestions</key>
-			<true/>
-			<key>INIntentName</key>
-			<string>Configuration</string>
-			<key>INIntentResponse</key>
-			<dict>
-				<key>INIntentResponseCodes</key>
-				<array>
-					<dict>
-						<key>INIntentResponseCodeName</key>
-						<string>success</string>
-						<key>INIntentResponseCodeSuccess</key>
-						<true/>
-					</dict>
-					<dict>
-						<key>INIntentResponseCodeName</key>
-						<string>failure</string>
-					</dict>
-				</array>
-			</dict>
-			<key>INIntentTitle</key>
-			<string>Configuration</string>
-			<key>INIntentTitleID</key>
-			<string>gpCwrM</string>
-			<key>INIntentType</key>
-			<string>Custom</string>
-			<key>INIntentVerb</key>
-			<string>View</string>
-		</dict>
-	</array>
-	<key>INTypes</key>
-	<array/>
-</dict>
-</plist>

ios/WonderousWidget/WonderousWidget.swift

@@ -1,72 +0,0 @@
-import WidgetKit
-import SwiftUI
-import Intents
-
-/// Every home-widget requires a TimelineEntry. This is passed into the view and propvides any data it needs
-struct WonderousTimelineEntry : TimelineEntry {
-    // Date is a mandatory field for all TimelineEntries
-    let date: Date
-    // Custom field for the wonderous view
-    let discoveredCount:Int;
-    var title:String = "";
-    var subTitle:String = "";
-    var imageData:String = "";
-}
-
-/// Widget, defines some high level configuration options as well as the primary view that will display the widget.
-struct WonderousWidget: Widget {
-    let kind: String = "WonderousWidget"
-    var body: some WidgetConfiguration {
-        StaticConfiguration(kind: kind, provider: WonderousTimelineProvider()) { entry in
-            WonderousWidgetView(entry: entry)
-        }
-        .contentMarginsDisabled()
-        .configurationDisplayName("Wonderous Widget")
-        .description("Track your collected artifacts!")
-        .supportedFamilies([.systemSmall, .systemMedium, .systemLarge])
-    }
-}
-
-struct WonderousConfig {
-    let iosKey = "group.com.gskinner.flutter.wonders.widget"
-    let discoveredCountKey = "dicoveredCount"
-}
-
-/// TimelineProvider, returns various WonderousTimelineEntry configurations for different contexts
-struct WonderousTimelineProvider: TimelineProvider {
-    // Provide an entry for a placeholder version of the widget
-    func placeholder(in context: Context) -> WonderousTimelineEntry {
-        WonderousTimelineEntry(date: Date(), discoveredCount: 0)
-    }
-    
-    // Provide an entry for the current time and state of the widget
-    func getSnapshot(in context: Context, completion: @escaping (WonderousTimelineEntry) -> ()) {
-        let entry:WonderousTimelineEntry
-        let userDefaults = UserDefaults(suiteName: "group.com.gskinner.flutter.wonders.widget")
-        let discoveredCount = userDefaults?.integer(forKey: "discoveredCount") ?? 0
-        let title = userDefaults?.string(forKey: "lastDiscoveredTitle") ?? ""
-        let subTitle = userDefaults?.string(forKey: "lastDiscoveredSubTitle") ?? ""
-        let imageData = userDefaults?.string(forKey: "lastDiscoveredImageData") ?? ""
-        entry = WonderousTimelineEntry(
-            date: Date(),
-            discoveredCount:discoveredCount,
-            title: title,
-            subTitle: subTitle.prefix(1).capitalized + subTitle.dropFirst(),
-            imageData: imageData
-        )
-        completion(entry);
-    }
-    
-    // Provide an array of entries for the current time and, optionally, any future times
-    func getTimeline(in context: Context, completion: @escaping (Timeline<WonderousTimelineEntry>) -> ()) {
-        getSnapshot(in: context) { (entry) in
-            let timeline = Timeline(entries: [entry], policy: .atEnd)
-            completion(timeline)
-        }
-    }
-}
-
-
-
-
-

ios/WonderousWidget/WonderousWidgetBundle.swift

@@ -1,12 +0,0 @@
-import WidgetKit
-import SwiftUI
-
-// WonderousWidgetBundle
-// -> WonderousWidgetView
-//  -> WonderousWidgetViewComponents
-@main
-struct WonderousWidgetBundle: WidgetBundle {
-    var body: some Widget {
-        WonderousWidget()
-    }
-}

ios/WonderousWidget/WonderousWidgetView.swift

@@ -1,76 +0,0 @@
-import WidgetKit
-import SwiftUI
-import Intents
-
-/// Defines the view / layout of the widget
-struct WonderousWidgetView : View {
-    @Environment(\.widgetFamily) var family: WidgetFamily
-    var entry: WonderousTimelineProvider.Entry
-    var body: some View {
-        let showTitle = family == .systemLarge
-        let showIcon = family != .systemSmall
-        let showTitleAndDesc = family != .systemSmall
-        let progressPct = Double(entry.discoveredCount) / 24.0
-        let iconImage = FlutterImages.icon;
-        let title = entry.title.isEmpty ? "Wonderous" : entry.title;
-        let subTitle = entry.subTitle.isEmpty ? "Search for hidden artifacts" : entry.subTitle;
-        
-        let content = VStack{
-            // Top row with optional Title and Icon
-            HStack {
-                if(showTitle) {
-                    Text("Collection")
-                        .font(.system(size: 15))
-                        .foregroundColor(.offWhite)
-                }
-                Spacer();
-                if(showIcon) {
-                    Image(uiImage: UIImage(contentsOfFile: iconImage)!)
-                        .resizable()
-                        .scaledToFit()
-                        .frame(height: 24)
-                }
-            }
-            
-            Spacer();
-            
-            // Bottom hz row with title, desc and progress gauge
-            HStack {
-                if(showTitleAndDesc) {
-                    VStack(alignment: .leading){
-                        Text(title)
-                            .font(.system(size: 22))
-                            .foregroundColor(.white);
-                        Text(subTitle)
-                            .font(.system(size: 15))
-                            .foregroundColor(.mediumGrey);
-                    }
-                }
-                Spacer();
-                ZStack{
-                    ProgressView(value: progressPct)
-                        .progressViewStyle(GaugeProgressStyle())
-                        .frame(width: 48, height: 48)
-                    
-                    Text("\(Int((progressPct * 100).rounded()))%").font(.system(size: 13)).foregroundColor(.white)
-                }
-            }
-        }
-        
-        // Stack content on top of the background image and a gradient
-        return ZStack{
-            BgImage(entry: entry).opacity(0.8)
-            LinearGradient(
-                gradient: Gradient(colors: [.black.opacity(0), .black]),
-                startPoint: .center,
-                endPoint: .bottom)
-            content.padding(16)
-        }
-        // Ios requires that widgets have a background color
-        .widgetBackground(Color.darkGrey)
-        // Deeplink into collections view when tapped
-        .widgetURL(URL(string: "wonderous:///home/collection"))
-        
-    }
-}
-

ios/WonderousWidgetExtension.entitlements

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.application-groups</key>
-	<array>
-		<string>group.com.gskinner.flutter.wonders.widget</string>
-	</array>
-</dict>
-</plist>

lib/_tools/artifact_search_helper.dart

@@ -16,7 +16,7 @@ final int maxYear = wondersLogic.timelineEndYear;
 const int maxRequests = 32;
 
 class ArtifactSearchHelper extends StatefulWidget {
-  const ArtifactSearchHelper({super.key});
+  const ArtifactSearchHelper({Key? key}) : super(key: key);
 
   @override
   State<ArtifactSearchHelper> createState() => _ArtifactSearchHelperState();
@@ -161,14 +161,10 @@ class _ArtifactSearchHelperState extends State<ArtifactSearchHelper> {
     //if (!json.containsKey('isPublicDomain') || !json['isPublicDomain']) return _logError(id, 'not public domain')
 
     final int year = ((json['objectBeginDate'] as int) + (json['objectEndDate'] as int)) ~/ 2;
-    if (year < minYear || year > maxYear) {
+    if (year < minYear || year > maxYear) return _logError(id, 'year is out of range');
-      return _logError(id, 'year is out of range');
-    }
 
     String? imageUrlSmall = json['primaryImageSmall'];
-    if (imageUrlSmall == null || imageUrlSmall.isEmpty) {
+    if (imageUrlSmall == null || imageUrlSmall.isEmpty) return _logError(id, 'no small image url');
-      return _logError(id, 'no small image url');
-    }
     // if (!imageUrlSmall.startsWith(SearchData.baseImagePath)) {
     //   return _logError(id, 'unexpected image uri: "$imageUrlSmall"');
     // }

lib/assets.dart

@@ -43,16 +43,24 @@ class SvgPaths {
 /// For wonder specific assets, add an extension to [WonderType] for easy lookup
 extension WonderAssetExtensions on WonderType {
   String get assetPath {
-    return switch (this) {
+    switch (this) {
-      WonderType.pyramidsGiza => '${ImagePaths.root}/pyramids',
+      case WonderType.pyramidsGiza:
-      WonderType.greatWall => '${ImagePaths.root}/great_wall_of_china',
+        return '${ImagePaths.root}/pyramids';
-      WonderType.petra => '${ImagePaths.root}/petra',
+      case WonderType.greatWall:
-      WonderType.colosseum => '${ImagePaths.root}/colosseum',
+        return '${ImagePaths.root}/great_wall_of_china';
-      WonderType.chichenItza => '${ImagePaths.root}/chichen_itza',
+      case WonderType.petra:
-      WonderType.machuPicchu => '${ImagePaths.root}/machu_picchu',
+        return '${ImagePaths.root}/petra';
-      WonderType.tajMahal => '${ImagePaths.root}/taj_mahal',
+      case WonderType.colosseum:
-      WonderType.christRedeemer => '${ImagePaths.root}/christ_the_redeemer'
+        return '${ImagePaths.root}/colosseum';
-    };
+      case WonderType.chichenItza:
+        return '${ImagePaths.root}/chichen_itza';
+      case WonderType.machuPicchu:
+        return '${ImagePaths.root}/machu_picchu';
+      case WonderType.tajMahal:
+        return '${ImagePaths.root}/taj_mahal';
+      case WonderType.christRedeemer:
+        return '${ImagePaths.root}/christ_the_redeemer';
+    }
   }
 
   String get homeBtn => '$assetPath/wonder-button.png';

lib/common_libs.dart

@@ -1,5 +1,4 @@
 /// Consolidate imports that are common across the app.
-library;
 
 export 'dart:math';
 

lib/l10n/app_en.arb

@@ -427,7 +427,5 @@
 	"timelineEvent1969ce": "Apollo 11 mission lands on the moon",
 	"privacyPolicy": "Privacy Policy",
 	"privacyStatement": "As explained in our {privacyUrl} we do not collect any personal information.",
-	"@privacyStatement": {"placeholders": {"privacyUrl": {}}},
+	"@privacyStatement": {"placeholders": {"privacyUrl": {}}}
-	"pageNotFoundBackButton": "Back to civilization",
-	"pageNotFoundMessage": "The page you are looking for does not exist."
 }

lib/l10n/app_zh.arb

@@ -405,7 +405,5 @@
 	"timelineEvent1957ce": "苏联发射斯普特尼克1号",
 	"timelineEvent1969ce": "阿波罗11号在月球着陆",
 	"privacyPolicy": "隐私政策",
-	"privacyStatement": "gskinner 非常重视对用户隐私的保护，正如{privacyUrl}里所诉，gskinner 不会收集您的个人信息。",
+	"privacyStatement": "gskinner 非常重视对用户隐私的保护，正如{privacyUrl}里所诉，gskinner 不会收集您的个人信息。"
-    "pageNotFoundBackButton": "回到文明",
-    "pageNotFoundMessage": "您正在寻找的页面不存在"
 }

lib/logic/app_logic.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:ui';
 
+import 'package:desktop_window/desktop_window.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:wonders/common_libs.dart';
@@ -33,6 +34,10 @@ class AppLogic {
   /// Loads settings, sets up services etc.
   Future<void> bootstrap() async {
     debugPrint('bootstrap start...');
+    // Set min-sizes for desktop apps
+    if (PlatformInfo.isDesktop) {
+      await DesktopWindow.setMinWindowSize($styles.sizes.minAppSize);
+    }
 
     if (kIsWeb) {
       // SB: This is intentionally not a debugPrint, as it's a message for users who open the console on web.
@@ -65,7 +70,6 @@ class AppLogic {
     timelineLogic.init();
 
     // Collectibles
-    collectiblesLogic.init();
     await collectiblesLogic.load();
 
     // Flag bootStrap as complete

lib/logic/collectibles_logic.dart

@@ -1,10 +1,6 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
 import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/common/save_load_mixin.dart';
 import 'package:wonders/logic/data/collectible_data.dart';
-import 'package:wonders/logic/native_widget_service.dart';
 
 class CollectiblesLogic with ThrottledSaveLoadMixin {
   @override
@@ -17,17 +13,11 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
   late final statesById = ValueNotifier<Map<String, int>>({})..addListener(_updateCounts);
 
   int _discoveredCount = 0;
-
   int get discoveredCount => _discoveredCount;
 
   int _exploredCount = 0;
-
   int get exploredCount => _exploredCount;
 
-  late final _nativeWidget = GetIt.I<NativeWidgetService>();
-
-  void init() => _nativeWidget.init();
-
   CollectibleData? fromId(String? id) => id == null ? null : all.firstWhereOrNull((o) => o.id == id);
 
   List<CollectibleData> forWonder(WonderType wonder) {
@@ -38,14 +28,6 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
     Map<String, int> states = Map.of(statesById.value);
     states[id] = state;
     statesById.value = states;
-    if (state == CollectibleState.discovered) {
-      final data = fromId(id)!;
-      _updateNativeHomeWidgetData(
-        title: data.title,
-        id: data.id,
-        imageUrl: data.imageUrlSmall,
-      );
-    }
     scheduleSave();
   }
 
@@ -55,12 +37,6 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
       if (state == CollectibleState.discovered) _discoveredCount++;
       if (state == CollectibleState.explored) _exploredCount++;
     });
-    final foundCount = discoveredCount + exploredCount;
-    _nativeWidget.save<int>('discoveredCount', foundCount).then((value) {
-      _nativeWidget.markDirty();
-    });
-
-    debugPrint('setting discoveredCount for home widget $foundCount');
   }
 
   /// Get a discovered item, sorted by the order of wondersLogic.all
@@ -91,35 +67,11 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
     for (int i = 0; i < all.length; i++) {
       states[all[i].id] = CollectibleState.lost;
     }
-    _updateNativeHomeWidgetData(); // clear home widget data
     statesById.value = states;
     debugPrint('collection reset');
     scheduleSave();
   }
 
-  Future<void> _updateNativeHomeWidgetData({String title = '', String id = '', String imageUrl = ''}) async {
-    if (!_nativeWidget.isSupported) return;
-    // Save title
-    await _nativeWidget.save<String>('lastDiscoveredTitle', title);
-    // Subtitle
-    String subTitle = '';
-    if (id.isNotEmpty) {
-      final artifactData = await artifactLogic.getArtifactByID(id);
-      subTitle = artifactData?.date ?? '';
-    }
-    await _nativeWidget.save<String>('lastDiscoveredSubTitle', subTitle);
-    // Image,
-    // Download, convert to base64 string and write to shared widget data
-    String imageBase64 = '';
-    if (imageUrl.isNotEmpty) {
-      var bytes = await http.readBytes(Uri.parse(imageUrl));
-      imageBase64 = base64Encode(bytes);
-      debugPrint('Saving base64 bytes for homeWidget');
-    }
-    await _nativeWidget.save<String>('lastDiscoveredImageData', imageBase64);
-    await _nativeWidget.markDirty();
-  }
-
   @override
   void copyFromJson(Map<String, dynamic> value) {
     Map<String, int> states = {};

lib/logic/common/retry_image.dart

@@ -90,7 +90,7 @@ class RetryImage extends ImageProvider<Object> {
     if (other.runtimeType != runtimeType) {
       return false;
     }
-    return other is RetryImage && other.imageProvider == imageProvider && other.scale == scale;
+    return other is RetryImage && other.imageProvider == other.imageProvider && other.scale == scale;
   }
 
   @override

lib/logic/data/unsplash_photo_data.dart

@@ -14,11 +14,18 @@ class UnsplashPhotoData {
   String getUnsplashUrl(int size) => '$url?q=90&fm=jpg&w=$size&fit=max';
 
   static String getSelfHostedUrl(String id, UnsplashPhotoSize targetSize) {
-    int size = switch (targetSize) {
+    late int size;
-      UnsplashPhotoSize.med => 400,
+    switch (targetSize) {
-      UnsplashPhotoSize.large => 800,
+      case UnsplashPhotoSize.med:
-      UnsplashPhotoSize.xl => 1200
+        size = 400;
-    };
+        break;
+      case UnsplashPhotoSize.large:
+        size = 800;
+        break;
+      case UnsplashPhotoSize.xl:
+        size = 1200;
+        break;
+    }
     if (PlatformInfo.pixelRatio >= 1.5 || PlatformInfo.isDesktop) {
       size *= 2;
     }

lib/logic/native_widget_service.dart

@@ -1,28 +0,0 @@
-import 'package:home_widget/home_widget.dart';
-import 'package:wonders/logic/common/platform_info.dart';
-
-/// Small facade for the HomeWidget package
-class NativeWidgetService {
-  static const _iosAppGroupId = 'group.com.gskinner.flutter.wonders.widget';
-  static const _iosAppName = 'WonderousWidget';
-
-  final bool isSupported = PlatformInfo.isIOS;
-
-  Future<void> init() async {
-    if (!isSupported) return;
-    await HomeWidget.setAppGroupId(_iosAppGroupId);
-  }
-
-  Future<bool?> save<T>(String s, T value, {void Function(bool?)? onSaveComplete}) async {
-    if (!isSupported) return false;
-    return await HomeWidget.saveWidgetData<T>(s, value).then((value) {
-      onSaveComplete?.call(value);
-      return null;
-    });
-  }
-
-  Future<bool?> markDirty() async {
-    if (!isSupported) return false;
-    return await HomeWidget.updateWidget(iOSName: _iosAppName);
-  }
-}

lib/logic/unsplash_logic.dart

@@ -8,4 +8,5 @@ class UnsplashLogic {
   UnsplashService get service => GetIt.I.get<UnsplashService>();
 
   List<String>? getCollectionPhotos(String collectionId) => _idsByCollection[collectionId];
+
 }

lib/main.dart

@@ -5,7 +5,6 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/artifact_api_logic.dart';
 import 'package:wonders/logic/artifact_api_service.dart';
 import 'package:wonders/logic/collectibles_logic.dart';
-import 'package:wonders/logic/native_widget_service.dart';
 import 'package:wonders/logic/locale_logic.dart';
 import 'package:wonders/logic/timeline_logic.dart';
 import 'package:wonders/logic/unsplash_logic.dart';
@@ -30,7 +29,7 @@ void main() async {
 
 /// Creates an app using the [MaterialApp.router] constructor and the global `appRouter`, an instance of [GoRouter].
 class WondersApp extends StatelessWidget with GetItMixin {
-  WondersApp({super.key});
+  WondersApp({Key? key}) : super(key: key);
   @override
   Widget build(BuildContext context) {
     final locale = watchX((SettingsLogic s) => s.currentLocale);
@@ -42,7 +41,6 @@ class WondersApp extends StatelessWidget with GetItMixin {
       routerDelegate: appRouter.routerDelegate,
       shortcuts: AppShortcuts.defaults,
       theme: ThemeData(fontFamily: $styles.text.body.fontFamily, useMaterial3: true),
-      color: $styles.colors.black,
       localizationsDelegates: const [
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
@@ -73,8 +71,6 @@ void registerSingletons() {
   GetIt.I.registerLazySingleton<CollectiblesLogic>(() => CollectiblesLogic());
   // Localizations
   GetIt.I.registerLazySingleton<LocaleLogic>(() => LocaleLogic());
-  // Home Widget Service
-  GetIt.I.registerLazySingleton<NativeWidgetService>(() => NativeWidgetService());
 }
 
 /// Add syntax sugar for quickly accessing the main "logic" controllers in the app
@@ -84,7 +80,7 @@ WondersLogic get wondersLogic => GetIt.I.get<WondersLogic>();
 TimelineLogic get timelineLogic => GetIt.I.get<TimelineLogic>();
 SettingsLogic get settingsLogic => GetIt.I.get<SettingsLogic>();
 UnsplashLogic get unsplashLogic => GetIt.I.get<UnsplashLogic>();
-ArtifactAPILogic get artifactLogic => GetIt.I.get<ArtifactAPILogic>();
+ArtifactAPILogic get metAPILogic => GetIt.I.get<ArtifactAPILogic>();
 CollectiblesLogic get collectiblesLogic => GetIt.I.get<CollectiblesLogic>();
 LocaleLogic get localeLogic => GetIt.I.get<LocaleLogic>();
 

lib/styles/colors.dart

@@ -13,9 +13,6 @@ class AppColors {
   final Color greyStrong = const Color(0xFF272625);
   final Color greyMedium = const Color(0xFF9D9995);
   final Color white = Colors.white;
-  // NOTE: If this color is changed, also change it in
-  // - web/manifest.json
-  // - web/index.html -
   final Color black = const Color(0xFF1E1B18);
 
   final bool isDark = false;

lib/styles/styles.dart

@@ -1,5 +1,7 @@
 // ignore_for_file: library_private_types_in_public_api
 
+import 'dart:ui';
+
 import 'package:wonders/common_libs.dart';
 
 export 'colors.dart';
@@ -14,13 +16,20 @@ class AppStyle {
     final shortestSide = screenSize.shortestSide;
     const tabletXl = 1000;
     const tabletLg = 800;
+    const tabletSm = 600;
+    const phoneLg = 400;
     if (shortestSide > tabletXl) {
-      scale = 1.2;
+      scale = 1.25;
     } else if (shortestSide > tabletLg) {
-      scale = 1.1;
+      scale = 1.15;
-    } else {
+    } else if (shortestSide > tabletSm) {
       scale = 1;
+    } else if (shortestSide > phoneLg) {
+      scale = .9; // phone
+    } else {
+      scale = .85; // small phone
     }
+    //debugPrint('screenSize=$screenSize, scale=$scale');
   }
 
   late final double scale;
@@ -146,11 +155,11 @@ class _Corners {
   late final double lg = 32;
 }
 
-// TODO: add, @immutable when design is solidified
+@immutable
 class _Sizes {
-  double get maxContentWidth1 => 800;
+  final double maxContentWidth1 = 800;
-  double get maxContentWidth2 => 600;
+  final double maxContentWidth2 = 600;
-  double get maxContentWidth3 => 500;
+  final double maxContentWidth3 = 500;
   final Size minAppSize = Size(380, 650);
 }
 

lib/styles/wonders_color_extensions.dart

@@ -2,29 +2,45 @@ import 'package:wonders/common_libs.dart';
 
 extension WonderColorExtensions on WonderType {
   Color get bgColor {
-    return switch (this) {
+    switch (this) {
-      WonderType.pyramidsGiza => const Color(0xFF16184D),
+      case WonderType.pyramidsGiza:
-      WonderType.greatWall => const Color(0xFF642828),
+        return const Color(0xFF16184D);
-      WonderType.petra => const Color(0xFF444B9B),
+      case WonderType.greatWall:
-      WonderType.colosseum => const Color(0xFF1E736D),
+        return const Color(0xFF642828);
-      WonderType.chichenItza => const Color(0xFF164F2A),
+      case WonderType.petra:
-      WonderType.machuPicchu => const Color(0xFF0E4064),
+        return const Color(0xFF444B9B);
-      WonderType.tajMahal => const Color(0xFFC96454),
+      case WonderType.colosseum:
-      WonderType.christRedeemer => const Color(0xFF1C4D46)
+        return const Color(0xFF1E736D);
-    };
+      case WonderType.chichenItza:
+        return const Color(0xFF164F2A);
+      case WonderType.machuPicchu:
+        return const Color(0xFF0E4064);
+      case WonderType.tajMahal:
+        return const Color(0xFFC96454);
+      case WonderType.christRedeemer:
+        return const Color(0xFF1C4D46);
+    }
   }
 
   Color get fgColor {
-    return switch (this) {
+    switch (this) {
-      WonderType.pyramidsGiza => const Color(0xFF444B9B),
+      case WonderType.pyramidsGiza:
-      WonderType.greatWall => const Color(0xFF688750),
+        return const Color(0xFF444B9B);
-      WonderType.petra => const Color(0xFF1B1A65),
+      case WonderType.greatWall:
-      WonderType.colosseum => const Color(0xFF4AA39D),
+        return const Color(0xFF688750);
-      WonderType.chichenItza => const Color(0xFFE2CFBB),
+      case WonderType.petra:
-      WonderType.machuPicchu => const Color(0xFFC1D9D1),
+        return const Color(0xFF1B1A65);
-      WonderType.tajMahal => const Color(0xFF642828),
+      case WonderType.colosseum:
-      WonderType.christRedeemer => const Color(0xFFED7967)
+        return const Color(0xFF4AA39D);
-    };
+      case WonderType.chichenItza:
+        return const Color(0xFFE2CFBB);
+      case WonderType.machuPicchu:
+        return const Color(0xFFC1D9D1);
+      case WonderType.tajMahal:
+        return const Color(0xFF642828);
+      case WonderType.christRedeemer:
+        return const Color(0xFFED7967);
+    }
   }
 }
 

lib/ui/app_scaffold.dart

@@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/app_scroll_behavior.dart';
 
 class WondersAppScaffold extends StatelessWidget {
-  const WondersAppScaffold({super.key, required this.child});
+  const WondersAppScaffold({Key? key, required this.child}) : super(key: key);
   final Widget child;
   static AppStyle get style => _style;
   static AppStyle _style = AppStyle();

lib/ui/common/app_backdrop.dart

@@ -1,13 +1,14 @@
 import 'dart:ui';
 
+import 'package:flutter/foundation.dart';
 import 'package:wonders/common_libs.dart';
 
 class AppBackdrop extends StatelessWidget {
   const AppBackdrop({
-    super.key,
+    Key? key,
     this.strength = 1,
     this.child,
-  });
+  }) : super(key: key);
 
   final double strength;
   final Widget? child;

lib/ui/common/app_icons.dart

@@ -2,7 +2,7 @@
 import 'package:wonders/common_libs.dart';
 
 class AppIcon extends StatelessWidget {
-  const AppIcon(this.icon, {super.key, this.size = 22, this.color});
+  const AppIcon(this.icon, {Key? key, this.size = 22, this.color}) : super(key: key);
   final AppIcons icon;
   final double size;
   final Color? color;

lib/ui/common/app_shortcuts.dart

@@ -34,11 +34,14 @@ class AppShortcuts {
   };
 
   static Map<ShortcutActivator, Intent>? get defaults {
-    return switch (defaultTargetPlatform) {
+    switch (defaultTargetPlatform) {
       // fall back to default shortcuts for ios and android
-      TargetPlatform.iOS || TargetPlatform.android => null,
+      case TargetPlatform.iOS:
+      case TargetPlatform.android:
+        return null;
       // unify shortcuts for desktop/web
-      _ => _defaultWebAndDesktopShortcuts
+      default:
-    };
+        return _defaultWebAndDesktopShortcuts;
+    }
   }
 }

lib/ui/common/blend_mask.dart

@@ -5,7 +5,8 @@ class BlendMask extends SingleChildRenderObjectWidget {
   final List<BlendMode> blendModes;
   final double opacity;
 
-  const BlendMask({required this.blendModes, this.opacity = 1.0, super.key, required Widget super.child});
+  const BlendMask({required this.blendModes, this.opacity = 1.0, Key? key, required Widget child})
+      : super(key: key, child: child);
 
   @override
   RenderObject createRenderObject(context) => RenderBlendMask(blendModes, opacity);

lib/ui/common/centered_box.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class CenteredBox extends StatelessWidget {
-  const CenteredBox({super.key, required this.child, this.width, this.height, this.padding});
+  const CenteredBox({Key? key, required this.child, this.width, this.height, this.padding}) : super(key: key);
   final Widget child;
   final double? width;
   final double? height;

lib/ui/common/collectible_item.dart

@@ -6,7 +6,7 @@ import 'package:wonders/ui/common/utils/app_haptics.dart';
 import 'package:wonders/ui/screens/collectible_found/collectible_found_screen.dart';
 
 class CollectibleItem extends StatelessWidget with GetItMixin {
-  CollectibleItem(this.collectible, {this.size = 64.0, super.key, this.focus}) {
+  CollectibleItem(this.collectible, {this.size = 64.0, Key? key}) : super(key: key) {
     // pre-fetch the image, so it's ready if we show the collectible found screen.
     _imageProvider = NetworkImage(collectible.imageUrl);
     _imageProvider.resolve(ImageConfiguration()).addListener(ImageStreamListener((_, __) {}));
@@ -15,7 +15,6 @@ class CollectibleItem extends StatelessWidget with GetItMixin {
   final CollectibleData collectible;
   final double size;
   late final ImageProvider _imageProvider;
-  final FocusNode? focus;
 
   void _handleTap(BuildContext context) async {
     final screen = CollectibleFoundScreen(collectible: collectible, imageProvider: _imageProvider);
@@ -40,7 +39,6 @@ class CollectibleItem extends StatelessWidget with GetItMixin {
           // Note: In order for the collapse animation to run properly, we must return a non-zero height or width.
           closedBuilder: (_) => SizedBox(width: 1, height: 0),
           openBuilder: (_) => AppBtn.basic(
-            focusNode: focus,
             semanticLabel: $strings.collectibleItemSemanticCollectible,
             onPressed: () => _handleTap(context),
             enableFeedback: false,
@@ -56,9 +54,9 @@ class CollectibleItem extends StatelessWidget with GetItMixin {
                 .animate(onPlay: (controller) => controller.repeat())
                 .shimmer(delay: 4000.ms, duration: $styles.times.med * 3)
                 .shake(curve: Curves.easeInOutCubic, hz: 4)
-                .scale(begin: Offset(1.0, 1.0), end: Offset(1.1, 1.1), duration: $styles.times.med)
+                .scale(begin: 1.0, end: 1.1, duration: $styles.times.med)
                 .then(delay: $styles.times.med)
-                .scale(begin: Offset(1.0, 1.0), end: Offset(1 / 1.1, 1 / 1.1)),
+                .scale(begin: 1.0, end: 1 / 1.1),
           ),
         ),
       ),

lib/ui/common/compass_divider.dart

@@ -2,7 +2,8 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:wonders/common_libs.dart';
 
 class CompassDivider extends StatelessWidget {
-  const CompassDivider({super.key, required this.isExpanded, this.duration, this.linesColor, this.compassColor});
+  const CompassDivider({Key? key, required this.isExpanded, this.duration, this.linesColor, this.compassColor})
+      : super(key: key);
   final bool isExpanded;
   final Duration? duration;
   final Color? linesColor;

lib/ui/common/controls/app_header.dart

@@ -3,7 +3,7 @@ import 'package:wonders/ui/common/app_icons.dart';
 
 class AppHeader extends StatelessWidget {
   const AppHeader(
-      {super.key,
+      {Key? key,
       this.title,
       this.subtitle,
       this.showBackBtn = true,
@@ -11,7 +11,8 @@ class AppHeader extends StatelessWidget {
       this.onBack,
       this.trailing,
       this.backIcon = AppIcons.prev,
-      this.backBtnSemantics});
+      this.backBtnSemantics})
+      : super(key: key);
   final String? title;
   final String? subtitle;
   final bool showBackBtn;

lib/ui/common/controls/app_image.dart

@@ -6,7 +6,7 @@ import 'package:wonders/ui/common/controls/app_loading_indicator.dart';
 
 class AppImage extends StatefulWidget {
   const AppImage({
-    super.key,
+    Key? key,
     required this.image,
     this.fit = BoxFit.scaleDown,
     this.alignment = Alignment.center,
@@ -16,7 +16,7 @@ class AppImage extends StatefulWidget {
     this.progress = false,
     this.color,
     this.scale,
-  });
+  }) : super(key: key);
 
   final ImageProvider? image;
   final BoxFit fit;
@@ -88,9 +88,7 @@ class _AppImageState extends State<AppImage> {
 
   ImageProvider? _capImageSize(ImageProvider? image) {
     // Disable resizing for web as it is currently single-threaded and causes the UI to lock up when resizing large images
-    if (kIsWeb) {
+    if (kIsWeb) return image; // TODO: Remove this when the web engine is updated to support non-blocking image resizing
-      return image; // TODO: Remove this when the web engine is updated to support non-blocking image resizing
-    }
     if (image == null || widget.scale == null) return image;
     final MediaQueryData mq = MediaQuery.of(context);
     final Size screenSize = mq.size * mq.devicePixelRatio * widget.scale!;

lib/ui/common/controls/app_loading_indicator.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class AppLoadingIndicator extends StatelessWidget {
-  const AppLoadingIndicator({super.key, this.value, this.color});
+  const AppLoadingIndicator({Key? key, this.value, this.color}) : super(key: key);
   final Color? color;
   final double? value;
 

lib/ui/common/controls/app_page_indicator.dart

@@ -3,14 +3,15 @@ import 'package:wonders/common_libs.dart';
 
 class AppPageIndicator extends StatefulWidget {
   AppPageIndicator({
-    super.key,
+    Key? key,
     required this.count,
     required this.controller,
     this.onDotPressed,
     this.color,
     this.dotSize,
     String? semanticPageTitle,
-  }) : semanticPageTitle = semanticPageTitle ?? $strings.appPageDefaultTitlePage;
+  })  : semanticPageTitle = semanticPageTitle ?? $strings.appPageDefaultTitlePage,
+        super(key: key);
   final int count;
   final PageController controller;
   final void Function(int index)? onDotPressed;

lib/ui/common/controls/buttons.dart

@@ -9,7 +9,7 @@ Widget _buildIcon(BuildContext context, AppIcons icon, {required bool isSecondar
 class AppBtn extends StatelessWidget {
   // ignore: prefer_const_constructors_in_immutables
   AppBtn({
-    super.key,
+    Key? key,
     required this.onPressed,
     required this.semanticLabel,
     this.enableFeedback = true,
@@ -24,10 +24,11 @@ class AppBtn extends StatelessWidget {
     this.border,
     this.focusNode,
     this.onFocusChanged,
-  }) : _builder = null;
+  })  : _builder = null,
+        super(key: key);
 
   AppBtn.from({
-    super.key,
+    Key? key,
     required this.onPressed,
     this.enableFeedback = true,
     this.pressEffect = true,
@@ -44,10 +45,9 @@ class AppBtn extends StatelessWidget {
     AppIcons? icon,
     double? iconSize,
   })  : child = null,
-        circular = false {
+        circular = false,
-    if (semanticLabel == null && text == null) {
+        super(key: key) {
-      throw ('AppBtn.from must include either text or semanticLabel');
+    if (semanticLabel == null && text == null) throw ('AppBtn.from must include either text or semanticLabel');
-    }
     this.semanticLabel = semanticLabel ?? text ?? '';
     _builder = (context) {
       if (text == null && icon == null) return SizedBox.shrink();
@@ -70,7 +70,7 @@ class AppBtn extends StatelessWidget {
 
   // ignore: prefer_const_constructors_in_immutables
   AppBtn.basic({
-    super.key,
+    Key? key,
     required this.onPressed,
     required this.semanticLabel,
     this.enableFeedback = true,
@@ -85,7 +85,8 @@ class AppBtn extends StatelessWidget {
   })  : expand = false,
         bgColor = Colors.transparent,
         border = null,
-        _builder = null;
+        _builder = null,
+        super(key: key);
 
   // interaction:
   final VoidCallback? onPressed;
@@ -184,7 +185,7 @@ class AppBtn extends StatelessWidget {
 /// Add a transparency-based press effect to buttons.
 /// //////////////////////////////////////////////////
 class _ButtonPressEffect extends StatefulWidget {
-  const _ButtonPressEffect(this.child);
+  const _ButtonPressEffect(this.child, {Key? key}) : super(key: key);
   final Widget child;
 
   @override
@@ -211,7 +212,7 @@ class _ButtonPressEffectState extends State<_ButtonPressEffect> {
 }
 
 class _CustomFocusBuilder extends StatefulWidget {
-  const _CustomFocusBuilder({required this.builder, this.focusNode, this.onFocusChanged});
+  const _CustomFocusBuilder({Key? key, required this.builder, this.focusNode, this.onFocusChanged}) : super(key: key);
   final Widget Function(BuildContext context, FocusNode focus) builder;
   final void Function(bool hasFocus)? onFocusChanged;
   final FocusNode? focusNode;
@@ -231,9 +232,7 @@ class _CustomFocusBuilderState extends State<_CustomFocusBuilder> {
 
   void _handleFocusChanged() {
     widget.onFocusChanged?.call(_focusNode.hasFocus);
-    if (mounted) {
+    setState(() {});
-      setState(() {});
-    }
   }
 
   @override

lib/ui/common/controls/checkbox.dart

@@ -2,7 +2,8 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/utils/app_haptics.dart';
 
 class SimpleCheckbox extends StatelessWidget {
-  const SimpleCheckbox({super.key, required this.active, required this.onToggled, required this.label});
+  const SimpleCheckbox({Key? key, required this.active, required this.onToggled, required this.label})
+      : super(key: key);
   final bool active;
   final String label;
   final Function(bool? onToggle) onToggled;

lib/ui/common/controls/circle_buttons.dart

@@ -4,14 +4,14 @@ import 'package:wonders/ui/common/fullscreen_keyboard_listener.dart';
 
 class CircleBtn extends StatelessWidget {
   const CircleBtn({
-    super.key,
+    Key? key,
     required this.child,
     required this.onPressed,
     this.border,
     this.bgColor,
     this.size,
     required this.semanticLabel,
-  });
+  }) : super(key: key);
 
   static double defaultSize = 48;
 
@@ -40,7 +40,7 @@ class CircleBtn extends StatelessWidget {
 
 class CircleIconBtn extends StatelessWidget {
   const CircleIconBtn({
-    super.key,
+    Key? key,
     required this.icon,
     required this.onPressed,
     this.border,
@@ -50,9 +50,8 @@ class CircleIconBtn extends StatelessWidget {
     this.iconSize,
     this.flipIcon = false,
     required this.semanticLabel,
-  });
+  }) : super(key: key);
 
-  //TODO: Reduce size if design re-exports icon-images without padding
   static double defaultSize = 28;
 
   final AppIcons icon;
@@ -87,13 +86,13 @@ class CircleIconBtn extends StatelessWidget {
 
 class BackBtn extends StatelessWidget {
   const BackBtn({
-    super.key,
+    Key? key,
     this.icon = AppIcons.prev,
     this.onPressed,
     this.semanticLabel,
     this.bgColor,
     this.iconColor,
-  });
+  }) : super(key: key);
 
   final Color? bgColor;
   final Color? iconColor;
@@ -126,15 +125,7 @@ class BackBtn extends StatelessWidget {
         icon: icon,
         bgColor: bgColor,
         color: iconColor,
-        onPressed: onPressed ??
+        onPressed: () => _handleOnPressed(context),
-            () {
-              final nav = Navigator.of(context);
-              if (nav.canPop()) {
-                Navigator.pop(context);
-              } else {
-                context.go(ScreenPaths.home);
-              }
-            },
         semanticLabel: semanticLabel ?? $strings.circleButtonsSemanticBack,
       ),
     );
@@ -156,7 +147,7 @@ class BackBtn extends StatelessWidget {
 }
 
 class _SafeAreaWithPadding extends StatelessWidget {
-  const _SafeAreaWithPadding({required this.child});
+  const _SafeAreaWithPadding({Key? key, required this.child}) : super(key: key);
 
   final Widget child;
 

lib/ui/common/controls/diagonal_text_page_indicator.dart

@@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/static_text_scale.dart';
 
 class DiagonalTextPageIndicator extends StatelessWidget {
-  const DiagonalTextPageIndicator({super.key, required this.current, required this.total});
+  const DiagonalTextPageIndicator({Key? key, required this.current, required this.total}) : super(key: key);
   final int current;
   final int total;
   static final _fontSize = 26 * $styles.scale;

lib/ui/common/controls/eight_way_swipe_detector.dart

@@ -1,7 +1,8 @@
 import 'package:wonders/common_libs.dart';
 
 class EightWaySwipeDetector extends StatefulWidget {
-  const EightWaySwipeDetector({super.key, required this.child, this.threshold = 50, required this.onSwipe});
+  const EightWaySwipeDetector({Key? key, required this.child, this.threshold = 50, required this.onSwipe})
+      : super(key: key);
   final Widget child;
   final double threshold;
   final void Function(Offset dir)? onSwipe;

lib/ui/common/controls/locale_switcher.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class LocaleSwitcher extends StatelessWidget with GetItMixin {
-  LocaleSwitcher({super.key});
+  LocaleSwitcher({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -11,7 +11,6 @@ class LocaleSwitcher extends StatelessWidget with GetItMixin {
       await settingsLogic.changeLocale(newLocale);
     }
 
-    return AppBtn.from(
+    return AppBtn.from(text: $strings.localeSwapButton, onPressed: handleSwapLocale, padding: EdgeInsets.all($styles.insets.sm));
-        text: $strings.localeSwapButton, onPressed: handleSwapLocale, padding: EdgeInsets.all($styles.insets.sm));
   }
 }

lib/ui/common/controls/scroll_decorator.dart

@@ -6,19 +6,19 @@ class ScrollDecorator extends StatefulWidget {
   /// its ScrollController.
   // ignore: prefer_const_constructors_in_immutables
   ScrollDecorator({
-    super.key,
+    Key? key,
     required this.builder,
     this.fgBuilder,
     this.bgBuilder,
     this.controller,
     this.onInit,
-  });
+  }) : super(key: key);
 
   /// Creates a ScrollDecorator that fades a widget in at the begin or end of the scrolling widget based on the scroll
   /// position. For example on a vertical list, it would fade in the `begin` widget when the list is not scrolled to the
   /// top.
   ScrollDecorator.fade({
-    super.key,
+    Key? key,
     required this.builder,
     this.controller,
     this.onInit,
@@ -27,7 +27,7 @@ class ScrollDecorator extends StatefulWidget {
     bool bg = false,
     Axis direction = Axis.vertical,
     Duration duration = const Duration(milliseconds: 150),
-  }) {
+  }) : super(key: key) {
     Flex flexBuilder(controller) {
       return Flex(
         direction: direction,
@@ -55,12 +55,12 @@ class ScrollDecorator extends StatefulWidget {
 
   /// Creates an ScrollDecorator that adds a shadow to the top of a vertical list when it is scrolled down.
   ScrollDecorator.shadow({
-    super.key,
+    Key? key,
     required this.builder,
     this.controller,
     this.onInit,
     Color color = Colors.black54,
-  }) {
+  }) : super(key: key) {
     bgBuilder = null;
     fgBuilder = (controller) {
       final double ratio = controller.hasClients ? min(1, controller.position.extentBefore / 60) : 0;

lib/ui/common/curved_clippers.dart

@@ -40,29 +40,33 @@ class ArchPoint {
 
 List<ArchPoint> _getArchPts(Size size, ArchType type) {
   double distanceFromTop = size.width / 3;
-  return switch (type) {
+  switch (type) {
-    ArchType.pyramid => [
+    case ArchType.pyramid:
+      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, distanceFromTop)),
         ArchPoint(Offset(size.width / 2, 0)),
         ArchPoint(Offset(size.width, distanceFromTop)),
         ArchPoint(Offset(size.width, size.height)),
-      ],
+      ];
-    ArchType.spade => [
+    case ArchType.spade:
+      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, distanceFromTop)),
         ArchPoint(Offset(size.width / 2, 0), Offset(0, distanceFromTop * .66)),
         ArchPoint(Offset(size.width, distanceFromTop), Offset(size.width, distanceFromTop * .66)),
         ArchPoint(Offset(size.width, size.height)),
-      ],
+      ];
-    ArchType.arch => [
+    case ArchType.arch:
+      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, size.width / 2)),
         ArchPoint(Offset(size.width / 2, 0), Offset(0, 0)),
         ArchPoint(Offset(size.width, size.width / 2), Offset(size.width, 0)),
         ArchPoint(Offset(size.width, size.height)),
-      ],
+      ];
-    ArchType.wideArch => [
+    case ArchType.wideArch:
+      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, size.width / 2)),
         ArchPoint(Offset(0, distanceFromTop)),
@@ -70,16 +74,17 @@ List<ArchPoint> _getArchPts(Size size, ArchType type) {
         ArchPoint(Offset(size.width, distanceFromTop), Offset(size.width, 0)),
         ArchPoint(Offset(size.width, size.width / 2)),
         ArchPoint(Offset(size.width, size.height)),
-      ],
+      ];
-    ArchType.flatPyramid => [
+    case ArchType.flatPyramid:
+      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, distanceFromTop)),
         ArchPoint(Offset(size.width * 0.8 / 2, 0)),
         ArchPoint(Offset(size.width * 1.2 / 2, 0)),
         ArchPoint(Offset(size.width, distanceFromTop)),
         ArchPoint(Offset(size.width, size.height)),
-      ]
+      ];
-  };
+  }
 }
 
 class CurvedTopClipper extends CustomClipper<Path> {

lib/ui/common/dashed_line.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class DashedLine extends StatelessWidget {
-  const DashedLine({super.key, this.vertical = false});
+  const DashedLine({Key? key, this.vertical = false}) : super(key: key);
   final bool vertical;
 
   @override

lib/ui/common/fade_color_transition.dart

@@ -3,7 +3,7 @@ import 'package:wonders/common_libs.dart';
 /// Colored box that can fade in and out, should yield better performance than
 /// fading with an additional Opacity layer.
 class FadeColorTransition extends StatelessWidget {
-  const FadeColorTransition({super.key, required this.animation, required this.color});
+  const FadeColorTransition({Key? key, required this.animation, required this.color}) : super(key: key);
   final Animation<double> animation;
   final Color color;
 

lib/ui/common/gradient_container.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 class GradientContainer extends StatelessWidget {
   const GradientContainer(this.colors, this.stops,
-      {super.key,
+      {Key? key,
       this.child,
       this.width,
       this.height,
@@ -10,7 +10,8 @@ class GradientContainer extends StatelessWidget {
       this.begin,
       this.end,
       this.blendMode,
-      this.borderRadius});
+      this.borderRadius})
+      : super(key: key);
   final List<Color> colors;
   final List<double> stops;
   final double? width;
@@ -44,12 +45,41 @@ class GradientContainer extends StatelessWidget {
 }
 
 class HzGradient extends GradientContainer {
-  const HzGradient(super.colors, super.stops,
+  const HzGradient(List<Color> colors, List<double> stops,
-      {super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius});
+      {Key? key,
+      Widget? child,
+      double? width,
+      double? height,
+      Alignment? alignment,
+      BlendMode? blendMode,
+      BorderRadius? borderRadius})
+      : super(colors, stops,
+            key: key,
+            child: child,
+            width: width,
+            height: height,
+            alignment: alignment,
+            blendMode: blendMode,
+            borderRadius: borderRadius);
 }
 
 class VtGradient extends GradientContainer {
-  const VtGradient(super.colors, super.stops,
+  const VtGradient(List<Color> colors, List<double> stops,
-      {super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius})
+      {Key? key,
-      : super(begin: Alignment.topCenter, end: Alignment.bottomCenter);
+      Widget? child,
+      double? width,
+      double? height,
+      Alignment? alignment,
+      BlendMode? blendMode,
+      BorderRadius? borderRadius})
+      : super(colors, stops,
+            key: key,
+            child: child,
+            width: width,
+            height: height,
+            alignment: alignment,
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            blendMode: blendMode,
+            borderRadius: borderRadius);
 }

lib/ui/common/hidden_collectible.dart

@@ -5,14 +5,13 @@ import 'package:wonders/ui/common/collectible_item.dart';
 /// The item is looked up via index, and expects that 3 items always exist for each wonder.
 /// If `wonders` is empty, then the collectible is always shown.
 class HiddenCollectible extends StatelessWidget with GetItMixin {
-  HiddenCollectible(this.currentWonder,
+  HiddenCollectible(this.currentWonder, {Key? key, required this.index, this.matches = const [], this.size = 64})
-      {super.key, required this.index, this.matches = const [], this.size = 64, this.focus})
+      : assert(index <= 2, 'index should not exceed 2'),
-      : assert(index <= 2, 'index should not exceed 2');
+        super(key: key);
   final int index;
   final double size;
   final List<WonderType> matches;
   final WonderType currentWonder;
-  final FocusNode? focus;
   @override
   Widget build(BuildContext context) {
     final data = collectiblesLogic.forWonder(currentWonder);
@@ -20,6 +19,6 @@ class HiddenCollectible extends StatelessWidget with GetItMixin {
     if (matches.isNotEmpty && matches.contains(currentWonder) == false) {
       return SizedBox.shrink();
     }
-    return CollectibleItem(data[index], size: size, focus: focus);
+    return CollectibleItem(data[index], size: size);
   }
 }

lib/ui/common/keyboard_arrows_listener.dart

@@ -9,7 +9,7 @@ class ArrowDir {
 }
 
 class KeyboardArrowsListener extends StatefulWidget {
-  const KeyboardArrowsListener({super.key, required this.child, required this.onArrow});
+  const KeyboardArrowsListener({Key? key, required this.child, required this.onArrow}) : super(key: key);
   final Widget child;
   final void Function(ArrowDir dir) onArrow;
   @override

lib/ui/common/lazy_indexed_stack.dart

@@ -3,13 +3,13 @@ import 'package:flutter/material.dart';
 /// A lazy-loading [IndexedStack] that loads [children] accordingly.
 class LazyIndexedStack extends StatefulWidget {
   const LazyIndexedStack({
-    super.key,
+    Key? key,
     this.alignment = AlignmentDirectional.topStart,
     this.textDirection,
     this.sizing = StackFit.loose,
     this.index = 0,
     this.children = const [],
-  });
+  }) : super(key: key);
 
   final AlignmentGeometry alignment;
   final TextDirection? textDirection;

lib/ui/common/list_gradient.dart

@@ -4,7 +4,7 @@ import 'package:wonders/ui/common/gradient_container.dart';
 /// Used for situations where the list content should blend into a background color.
 /// Can be placed at the top or bottom of a list, using the `flip' option when on the bottom
 class ListOverscollGradient extends StatelessWidget {
-  const ListOverscollGradient({super.key, this.size = 100, this.color, this.bottomUp = false});
+  const ListOverscollGradient({Key? key, this.size = 100, this.color, this.bottomUp = false}) : super(key: key);
   final bool bottomUp;
   final double size;
   final Color? color;

lib/ui/common/measurable_widget.dart

@@ -4,7 +4,7 @@ import 'package:flutter/rendering.dart';
 import 'package:wonders/common_libs.dart';
 
 class MeasurableWidget extends SingleChildRenderObjectWidget {
-  const MeasurableWidget({super.key, required this.onChange, required Widget super.child});
+  const MeasurableWidget({Key? key, required this.onChange, required Widget child}) : super(key: key, child: child);
   final void Function(Size size) onChange;
   @override
   RenderObject createRenderObject(BuildContext context) => MeasureSizeRenderObject(onChange);

lib/ui/common/modals/app_modals.dart

@@ -11,7 +11,7 @@ Future<bool?> showModal(BuildContext context, {required Widget child}) async {
 }
 
 class LoadingModal extends StatelessWidget {
-  const LoadingModal({super.key, this.title, this.msg, this.child});
+  const LoadingModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
   final String? title;
   final String? msg;
   final Widget? child;
@@ -28,7 +28,7 @@ class LoadingModal extends StatelessWidget {
 }
 
 class OkModal extends StatelessWidget {
-  const OkModal({super.key, this.title, this.msg, this.child});
+  const OkModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
   final String? title;
   final String? msg;
   final Widget? child;
@@ -51,7 +51,7 @@ class OkModal extends StatelessWidget {
 }
 
 class OkCancelModal extends StatelessWidget {
-  const OkCancelModal({super.key, this.title, this.msg, this.child});
+  const OkCancelModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
   final String? title;
   final String? msg;
   final Widget? child;
@@ -83,7 +83,7 @@ class _BaseContentModal extends StatelessWidget {
   final Widget? child;
   final List<Widget> buttons;
 
-  const _BaseContentModal({this.title, this.msg, required this.buttons, this.child});
+  const _BaseContentModal({Key? key, this.title, this.msg, required this.buttons, this.child}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

lib/ui/common/modals/fullscreen_maps_viewer.dart

@@ -5,7 +5,7 @@ import 'package:wonders/ui/common/controls/app_header.dart';
 import 'package:wonders/ui/common/google_maps_marker.dart';
 
 class FullscreenMapsViewer extends StatelessWidget {
-  FullscreenMapsViewer({super.key, required this.type});
+  FullscreenMapsViewer({Key? key, required this.type}) : super(key: key);
   final WonderType type;
 
   WonderData get data => wondersLogic.getData(type);

lib/ui/common/modals/fullscreen_url_img_viewer.dart

@@ -7,7 +7,7 @@ import 'package:wonders/ui/common/fullscreen_keyboard_listener.dart';
 import 'package:wonders/ui/common/utils/app_haptics.dart';
 
 class FullscreenUrlImgViewer extends StatefulWidget {
-  const FullscreenUrlImgViewer({super.key, required this.urls, this.index = 0});
+  const FullscreenUrlImgViewer({Key? key, required this.urls, this.index = 0}) : super(key: key);
   final List<String> urls;
   final int index;
 
@@ -126,7 +126,7 @@ class _FullscreenUrlImgViewerState extends State<FullscreenUrlImgViewer> {
 }
 
 class _Viewer extends StatefulWidget {
-  const _Viewer(this.url, this.isZoomed);
+  const _Viewer(this.url, this.isZoomed, {Key? key}) : super(key: key);
 
   final String url;
   final ValueNotifier<bool> isZoomed;

lib/ui/common/modals/fullscreen_video_viewer.dart

@@ -5,7 +5,7 @@ import 'package:wonders/logic/common/platform_info.dart';
 import 'package:youtube_player_iframe/youtube_player_iframe.dart';
 
 class FullscreenVideoViewer extends StatefulWidget {
-  const FullscreenVideoViewer({super.key, required this.id});
+  const FullscreenVideoViewer({Key? key, required this.id}) : super(key: key);
   final String id;
 
   @override

lib/ui/common/modals/fullscreen_web_view.dart

@@ -2,7 +2,7 @@ import 'package:webview_flutter/webview_flutter.dart';
 import 'package:wonders/common_libs.dart';
 
 class FullscreenWebView extends StatelessWidget {
-  FullscreenWebView(this.url, {super.key});
+  FullscreenWebView(this.url, {Key? key}) : super(key: key);
   final String url;
 
   late final controller = WebViewController()

lib/ui/common/opening_card.dart

@@ -3,12 +3,13 @@ import 'package:wonders/ui/common/measurable_widget.dart';
 
 class OpeningCard extends StatefulWidget {
   const OpeningCard(
-      {super.key,
+      {Key? key,
       required this.closedBuilder,
       required this.openBuilder,
       required this.isOpen,
       this.background,
-      this.padding});
+      this.padding})
+      : super(key: key);
 
   final Widget Function(BuildContext) closedBuilder;
   final Widget Function(BuildContext) openBuilder;

lib/ui/common/pop_navigator_underlay.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class PopNavigatorUnderlay extends StatelessWidget {
-  const PopNavigatorUnderlay({super.key});
+  const PopNavigatorUnderlay({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

lib/ui/common/pop_router_on_over_scroll.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class PopRouterOnOverScroll extends StatefulWidget {
-  const PopRouterOnOverScroll({super.key, required this.child, required this.controller});
+  const PopRouterOnOverScroll({Key? key, required this.child, required this.controller}) : super(key: key);
   final ScrollController controller;
   final Widget child;
 

lib/ui/common/scaling_list_item.dart

@@ -2,7 +2,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/utils/context_utils.dart';
 
 class AnimatedListItem extends StatelessWidget {
-  const AnimatedListItem({super.key, required this.scrollPos, required this.builder});
+  const AnimatedListItem({Key? key, required this.scrollPos, required this.builder}) : super(key: key);
   final ValueNotifier<double> scrollPos;
   final Widget Function(BuildContext context, double pctVisible) builder;
 
@@ -35,7 +35,7 @@ class AnimatedListItem extends StatelessWidget {
 /// Takes a scroll position notifier and a child.
 /// Scales its child as it scrolls onto screen for a nice effect.
 class ScalingListItem extends StatelessWidget {
-  const ScalingListItem({super.key, required this.scrollPos, required this.child});
+  const ScalingListItem({Key? key, required this.scrollPos, required this.child}) : super(key: key);
   final ValueNotifier<double> scrollPos;
   final Widget child;
 

lib/ui/common/stacked_page_view_builder.dart

@@ -11,12 +11,12 @@ import 'package:wonders/common_libs.dart';
 ///
 class StackedPageViewBuilder extends StatefulWidget {
   const StackedPageViewBuilder({
-    super.key,
+    Key? key,
     this.initialIndex = 0,
     required this.pageCount,
     required this.builder,
     this.onInit,
-  });
+  }) : super(key: key);
   final int initialIndex;
   final int pageCount;
   final Widget Function(BuildContext builder, PageController controller, PageController follower) builder;

lib/ui/common/static_text_scale.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class StaticTextScale extends StatelessWidget {
-  const StaticTextScale({super.key, required this.child, this.scale = 1});
+  const StaticTextScale({Key? key, required this.child, this.scale = 1}) : super(key: key);
   final Widget child;
   final double scale;
 

lib/ui/common/themed_text.dart

@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class DefaultTextColor extends StatelessWidget {
-  const DefaultTextColor({super.key, required this.color, required this.child});
+  const DefaultTextColor({Key? key, required this.color, required this.child}) : super(key: key);
   final Color color;
   final Widget child;
 
@@ -15,7 +15,7 @@ class DefaultTextColor extends StatelessWidget {
 }
 
 class LightText extends StatelessWidget {
-  const LightText({super.key, required this.child});
+  const LightText({Key? key, required this.child}) : super(key: key);
   final Widget child;
 
   @override
@@ -26,7 +26,7 @@ class LightText extends StatelessWidget {
 }
 
 class DarkText extends StatelessWidget {
-  const DarkText({super.key, required this.child});
+  const DarkText({Key? key, required this.child}) : super(key: key);
   final Widget child;
 
   @override

lib/ui/common/timeline_event_card.dart

@@ -3,7 +3,7 @@ import 'package:wonders/logic/common/string_utils.dart';
 import 'package:wonders/ui/common/themed_text.dart';
 
 class TimelineEventCard extends StatelessWidget {
-  const TimelineEventCard({super.key, required this.year, required this.text, this.darkMode = false});
+  const TimelineEventCard({Key? key, required this.year, required this.text, this.darkMode = false}) : super(key: key);
   final int year;
   final String text;
   final bool darkMode;

lib/ui/common/unsplash_photo.dart

@@ -2,7 +2,8 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/data/unsplash_photo_data.dart';
 
 class UnsplashPhoto extends StatelessWidget {
-  const UnsplashPhoto(this.id, {super.key, this.fit = BoxFit.cover, required this.size, this.showCredits = false});
+  const UnsplashPhoto(this.id, {Key? key, this.fit = BoxFit.cover, required this.size, this.showCredits = false})
+      : super(key: key);
   final String id;
   final BoxFit fit;
   final UnsplashPhotoSize size;

lib/ui/common/utils/page_routes.dart

@@ -9,7 +9,6 @@ class PageRoutes {
       return CupertinoPageRoute(builder: (_) => child);
     }
 
-    // SB: Removed this in favor of Cupertino routes, we could restore with a `useFade` option
     return PageRouteBuilder<T>(
       transitionDuration: duration,
       reverseTransitionDuration: duration,

lib/ui/common/wonders_timeline_builder.dart

@@ -6,13 +6,13 @@ import 'package:wonders/logic/data/wonder_data.dart';
 /// Provides a builder, so the visual representation of each track entry can be customized
 class WondersTimelineBuilder extends StatelessWidget {
   const WondersTimelineBuilder({
-    super.key,
+    Key? key,
     this.selectedWonders = const [],
     this.timelineBuilder,
     this.axis = Axis.horizontal,
     this.crossAxisGap,
     this.minSize = 10,
-  });
+  }) : super(key: key);
   final List<WonderType> selectedWonders;
   final Widget Function(BuildContext, WonderData type, bool isSelected)? timelineBuilder;
   final Axis axis;
@@ -96,7 +96,7 @@ class WondersTimelineBuilder extends StatelessWidget {
 }
 
 class _DefaultTrackEntry extends StatelessWidget {
-  const _DefaultTrackEntry({required this.isSelected});
+  const _DefaultTrackEntry({Key? key, required this.isSelected}) : super(key: key);
   final bool isSelected;
 
   @override

lib/ui/screens/artifact/artifact_carousel/artifact_carousel_screen.dart

@@ -12,7 +12,7 @@ part 'widgets/_bottom_text_content.dart';
 part 'widgets/_collapsing_carousel_item.dart';
 
 class ArtifactCarouselScreen extends StatefulWidget {
-  const ArtifactCarouselScreen({super.key, required this.type, this.contentPadding = EdgeInsets.zero});
+  const ArtifactCarouselScreen({Key? key, required this.type, this.contentPadding = EdgeInsets.zero}) : super(key: key);
   final WonderType type;
   final EdgeInsets contentPadding;
 

lib/ui/screens/artifact/artifact_carousel/widgets/_blurred_image_bg.dart

@@ -2,7 +2,7 @@ part of '../artifact_carousel_screen.dart';
 
 /// Blurry image background for the Artifact Highlights view. Contains horizontal and vertical gradients that stack overtop the blended image.
 class _BlurredImageBg extends StatelessWidget {
-  const _BlurredImageBg({super.key, this.url});
+  const _BlurredImageBg({Key? key, this.url}) : super(key: key);
   final String? url;
 
   @override

lib/ui/screens/artifact/artifact_carousel/widgets/_bottom_text_content.dart

@@ -2,7 +2,8 @@ part of '../artifact_carousel_screen.dart';
 
 class _BottomTextContent extends StatelessWidget {
   const _BottomTextContent(
-      {super.key, required this.artifact, required this.height, required this.state, required this.shortMode});
+      {Key? key, required this.artifact, required this.height, required this.state, required this.shortMode})
+      : super(key: key);
 
   final HighlightData artifact;
   final double height;

lib/ui/screens/artifact/artifact_carousel/widgets/_collapsing_carousel_item.dart

@@ -4,12 +4,13 @@ part of '../artifact_carousel_screen.dart';
 /// This lets the child simply render it's contents
 class _CollapsingCarouselItem extends StatelessWidget {
   const _CollapsingCarouselItem(
-      {super.key,
+      {Key? key,
       required this.child,
       required this.indexOffset,
       required this.width,
       required this.onPressed,
-      required this.title});
+      required this.title})
+      : super(key: key);
   final Widget child;
   final int indexOffset;
   final double width;
@@ -49,11 +50,11 @@ class _CollapsingCarouselItem extends StatelessWidget {
 
 class _AnimatedTranslate extends StatelessWidget {
   const _AnimatedTranslate({
-    super.key,
+    Key? key,
     required this.duration,
     required this.offset,
     required this.child,
-  });
+  }) : super(key: key);
   final Duration duration;
   final Offset offset;
   final Widget child;
@@ -70,7 +71,7 @@ class _AnimatedTranslate extends StatelessWidget {
 }
 
 class _DoubleBorderImage extends StatelessWidget {
-  const _DoubleBorderImage(this.data, {super.key});
+  const _DoubleBorderImage(this.data, {Key? key}) : super(key: key);
   final HighlightData data;
   @override
   Widget build(BuildContext context) => Container(

lib/ui/screens/artifact/artifact_details/artifact_details_screen.dart

@@ -10,7 +10,7 @@ part 'widgets/_info_column.dart';
 part 'widgets/_artifact_image_btn.dart';
 
 class ArtifactDetailsScreen extends StatefulWidget {
-  const ArtifactDetailsScreen({super.key, required this.artifactId});
+  const ArtifactDetailsScreen({Key? key, required this.artifactId}) : super(key: key);
   final String artifactId;
 
   @override
@@ -18,7 +18,7 @@ class ArtifactDetailsScreen extends StatefulWidget {
 }
 
 class _ArtifactDetailsScreenState extends State<ArtifactDetailsScreen> {
-  late final _future = artifactLogic.getArtifactByID(widget.artifactId, selfHosted: true);
+  late final _future = metAPILogic.getArtifactByID(widget.artifactId, selfHosted: true);
 
   @override
   Widget build(BuildContext context) {

lib/ui/screens/artifact/artifact_details/widgets/_artifact_image_btn.dart

@@ -1,7 +1,7 @@
 part of '../artifact_details_screen.dart';
 
 class _ArtifactImageBtn extends StatelessWidget {
-  const _ArtifactImageBtn({super.key, required this.data});
+  const _ArtifactImageBtn({Key? key, required this.data}) : super(key: key);
   final ArtifactData data;
 
   @override

lib/ui/screens/artifact/artifact_details/widgets/_info_column.dart

@@ -1,7 +1,7 @@
 part of '../artifact_details_screen.dart';
 
 class _InfoColumn extends StatelessWidget {
-  const _InfoColumn({super.key, required this.data});
+  const _InfoColumn({Key? key, required this.data}) : super(key: key);
   final ArtifactData data;
 
   @override
@@ -67,7 +67,7 @@ class _InfoColumn extends StatelessWidget {
 }
 
 class _InfoRow extends StatelessWidget {
-  const _InfoRow(this.label, this.value, {super.key});
+  const _InfoRow(this.label, this.value, {Key? key}) : super(key: key);
 
   final String label;
   final String value;

lib/ui/screens/artifact/artifact_search/artifact_search_screen.dart

@@ -15,7 +15,7 @@ part 'widgets/_search_input.dart';
 /// User can use this screen to search the MET server for an artifact by name or timeline. Artifacts results will
 /// appear as images, which the user can click on to being up the details view for more information.
 class ArtifactSearchScreen extends StatefulWidget with GetItStatefulWidgetMixin {
-  ArtifactSearchScreen({super.key, required this.type});
+  ArtifactSearchScreen({Key? key, required this.type}) : super(key: key);
   final WonderType type;
 
   @override
@@ -203,7 +203,7 @@ class _ArtifactSearchScreenState extends State<ArtifactSearchScreen> with GetItS
 }
 
 class PanelController extends ValueNotifier<bool> {
-  PanelController(super.value);
+  PanelController(bool value) : super(value);
   void toggle() => value = !value;
 }
 

lib/ui/screens/artifact/artifact_search/time_range_selector/expanding_time_range_selector.dart

@@ -11,14 +11,14 @@ import 'package:wonders/ui/screens/artifact/artifact_search/time_range_selector/
 // Expandable timerange selector component that further refines Artifact Search based on date range.
 class ExpandingTimeRangeSelector extends StatefulWidget {
   const ExpandingTimeRangeSelector({
-    super.key,
+    Key? key,
     required this.wonder,
     required this.startYear,
     required this.endYear,
     required this.onChanged,
     required this.panelController,
     required this.vizController,
-  });
+  }) : super(key: key);
   final WonderData wonder;
   final double startYear;
   final double endYear;
@@ -95,9 +95,10 @@ class _ExpandingTimeRangeSelectorState extends State<ExpandingTimeRangeSelector>
 
 class _ClosedTimeRange extends StatelessWidget {
   const _ClosedTimeRange({
+    Key? key,
     required this.startYear,
     required this.endYear,
-  });
+  }) : super(key: key);
   final double startYear, endYear;
 
   @override
@@ -119,13 +120,14 @@ class _ClosedTimeRange extends StatelessWidget {
 
 class _OpenedTimeRange extends StatelessWidget {
   const _OpenedTimeRange({
+    Key? key,
     required this.onChange,
     required this.startYear,
     required this.endYear,
     required this.wonder,
     required this.painter,
     required this.onClose,
-  });
+  }) : super(key: key);
   final double startYear;
   final double endYear;
   final void Function(double start, double end) onChange;

lib/ui/screens/artifact/artifact_search/time_range_selector/range_selector.dart

@@ -6,7 +6,7 @@ class RangeSelector extends StatefulWidget {
   static const double handleWidth = 20;
 
   const RangeSelector({
-    super.key,
+    Key? key,
     required this.start,
     required this.end,
     required this.min,
@@ -15,7 +15,7 @@ class RangeSelector extends StatefulWidget {
     this.isLocked = false,
     this.onUpdated,
     this.onChanged,
-  });
+  }) : super(key: key);
   final double start;
   final double end;
   final double min;

lib/ui/screens/artifact/artifact_search/widgets/_result_tile.dart

@@ -1,7 +1,7 @@
 part of '../artifact_search_screen.dart';
 
 class _ResultTile extends StatelessWidget {
-  const _ResultTile({super.key, required this.onPressed, required this.data});
+  const _ResultTile({Key? key, required this.onPressed, required this.data}) : super(key: key);
 
   final void Function(SearchData data) onPressed;
   final SearchData data;

lib/ui/screens/artifact/artifact_search/widgets/_results_grid.dart

@@ -2,7 +2,7 @@ part of '../artifact_search_screen.dart';
 
 /// Staggered Masonry styled grid for displaying two columns of different aspect-ratio images.
 class _ResultsGrid extends StatefulWidget {
-  const _ResultsGrid({super.key, required this.searchResults, required this.onPressed});
+  const _ResultsGrid({Key? key, required this.searchResults, required this.onPressed}) : super(key: key);
   final void Function(SearchData) onPressed;
   final List<SearchData> searchResults;
 

lib/ui/screens/artifact/artifact_search/widgets/_search_input.dart

@@ -2,7 +2,7 @@ part of '../artifact_search_screen.dart';
 
 /// Autopopulating textfield used for searching for Artifacts by name.
 class _SearchInput extends StatelessWidget {
-  const _SearchInput({super.key, required this.onSubmit, required this.wonder});
+  const _SearchInput({Key? key, required this.onSubmit, required this.wonder}) : super(key: key);
   final void Function(String) onSubmit;
   final WonderData wonder;
 
@@ -23,9 +23,7 @@ class _SearchInput extends StatelessWidget {
   }
 
   Iterable<String> _getSuggestions(TextEditingValue textEditingValue) {
-    if (textEditingValue.text == '') {
+    if (textEditingValue.text == '') return wonder.searchSuggestions.getRange(0, 10);
-      return wonder.searchSuggestions.getRange(0, 10);
-    }
 
     return wonder.searchSuggestions.where((str) {
       return str.startsWith(textEditingValue.text.toLowerCase());

lib/ui/screens/collectible_found/collectible_found_screen.dart

@@ -12,7 +12,7 @@ part 'widgets/_celebration_particles.dart';
 class CollectibleFoundScreen extends StatelessWidget {
   // CollectibleItem passes in a (theoretically) pre-loaded imageProvider.
   // we could check for load completion, and hold after introT, but that shouldn't be necessary in a real-world scenario.
-  const CollectibleFoundScreen({required this.collectible, required this.imageProvider, super.key});
+  const CollectibleFoundScreen({required this.collectible, required this.imageProvider, Key? key}) : super(key: key);
 
   final CollectibleData collectible;
   final ImageProvider imageProvider;
@@ -44,10 +44,7 @@ class CollectibleFoundScreen extends StatelessWidget {
               fit: BoxFit.contain,
             ),
           ),
-        )
+        ).animate().scale(begin: 1.5, end: 3, curve: Curves.easeInExpo, delay: t, duration: t * 3).fadeOut(),
-            .animate()
-            .scale(begin: Offset(1.5, 1.5), end: Offset(3, 3), curve: Curves.easeInExpo, delay: t, duration: t * 3)
-            .fadeOut(),
       )
     ]);
   }
@@ -143,14 +140,14 @@ class CollectibleFoundScreen extends StatelessWidget {
             child: child,
           ),
         )
-        .scale(begin: Offset(0.3, 0.3), duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, 0.7));
+        .scale(begin: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, 0.7));
   }
 
   Widget _buildRibbon(BuildContext context) {
     Duration t = $styles.times.fast;
     return _AnimatedRibbon($strings.collectibleFoundTitleArtifactDiscovered.toUpperCase())
         .animate()
-        .scale(begin: Offset(0.3, 0.3), duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, -1));
+        .scale(begin: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, -1));
   }
 
   Widget _buildTitle(BuildContext context, String text, TextStyle style, Color color, Duration delay) {

lib/ui/screens/collectible_found/widgets/_animated_ribbon.dart

@@ -1,7 +1,7 @@
 part of '../collectible_found_screen.dart';
 
 class _AnimatedRibbon extends StatelessWidget {
-  const _AnimatedRibbon(this.text, {super.key});
+  const _AnimatedRibbon(this.text, {Key? key}) : super(key: key);
 
   final String text;
   static const double height = 48;

lib/ui/screens/collectible_found/widgets/_celebration_particles.dart

@@ -1,7 +1,7 @@
 part of '../collectible_found_screen.dart';
 
 class _CelebrationParticles extends StatelessWidget {
-  const _CelebrationParticles({super.key, this.fadeMs = 1000});
+  const _CelebrationParticles({Key? key, this.fadeMs = 1000}) : super(key: key);
 
   final int fadeMs;
 

lib/ui/screens/collection/collection_screen.dart

@@ -16,7 +16,7 @@ part 'widgets/_collection_list_card.dart';
 part 'widgets/_newly_discovered_items_btn.dart';
 
 class CollectionScreen extends StatefulWidget with GetItStatefulWidgetMixin {
-  CollectionScreen({required this.fromId, super.key});
+  CollectionScreen({required this.fromId, Key? key}) : super(key: key);
 
   final String fromId;