remove dependency: desktop_window

Wire up final color details for PWA install

analysis_options.yaml

@@ -9,6 +9,11 @@
 # 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`
@@ -22,9 +27,8 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    always_declare_return_types: true
+    - always_declare_return_types
-    always_use_package_imports: true
+    - always_use_package_imports
-    prefer_const_constructors: false
+    - prefer_single_quotes
-    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 flutter.compileSdkVersion
+    compileSdkVersion 34
 
     defaultConfig {
         configurations.all {

ios/Podfile.lock

@@ -80,4 +80,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.0

ios/Runner.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* 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 */; };
@@ -73,6 +74,7 @@
 		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; };
@@ -141,6 +143,7 @@
 				297FD5732AE18011008D8BFE /* WonderousWidgetView.swift */,
 				297FD5752AE19BD9008D8BFE /* WonderWidgetViewComponents.swift */,
 				296251242AE7410D00D574FF /* Colors.swift */,
+				2978ECDC2B62D00C00E36CE8 /* FlutterAssets.swift */,
 			);
 			path = WonderousWidget;
 			sourceTree = "<group>";
@@ -451,6 +454,7 @@
 				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 */,
@@ -640,14 +644,14 @@
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_ENTITLEMENTS = "WonderousWidgetExtension.entitlements";
+				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_FILE = WonderousWidget/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Wonderous Widget";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;

ios/WonderousWidget/Colors.swift

@@ -1,6 +1,7 @@
 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)

ios/WonderousWidget/FlutterAssets.swift

@@ -0,0 +1,22 @@
+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/WonderWidgetViewComponents.swift

@@ -10,15 +10,14 @@ struct BgImage : View {
         var uiImage:UIImage?;
         // If there is no saved imageData, use the default bg image
         if(entry.imageData.isEmpty){
-            let defaultImage = flutterAssetBundle.appending(path: "/assets/images/widget/background-empty.jpg").path();
+            uiImage = UIImage(contentsOfFile: FlutterImages.bgEmpty);
-            uiImage = UIImage(contentsOfFile: defaultImage);
         }
         // 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 the 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)
+            // 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()
@@ -34,6 +33,7 @@ struct BgImage : View {
     
 }
 
+// Declares a restyled version of the native ProgressView
 struct GaugeProgressStyle: ProgressViewStyle {
     func makeBody(configuration: Configuration) -> some View {
         let fractionCompleted = configuration.fractionCompleted ?? 0

ios/WonderousWidget/WonderousWidget.swift

@@ -2,19 +2,20 @@ import WidgetKit
 import SwiftUI
 import Intents
 
-/// Entry, is passed into the view and defines the data it needs
+/// 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 the display name and description and also declared the main View
+/// 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)
@@ -26,7 +27,12 @@ struct WonderousWidget: Widget {
     }
 }
 
-// Provider,returns various WonderousEntry configs based on current context
+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 {

ios/WonderousWidget/WonderousWidgetBundle.swift

@@ -1,13 +1,9 @@
-//
-//  WonderousWidgetBundle.swift
-//  Wonderous Widget
-//
-//  Created by Shawn on 2023-10-06.
-//
-
 import WidgetKit
 import SwiftUI
 
+// WonderousWidgetBundle
+// -> WonderousWidgetView
+//  -> WonderousWidgetViewComponents
 @main
 struct WonderousWidgetBundle: WidgetBundle {
     var body: some Widget {

ios/WonderousWidget/WonderousWidgetView.swift

@@ -2,7 +2,7 @@ import WidgetKit
 import SwiftUI
 import Intents
 
-// Defines the view / layout of the widget
+/// Defines the view / layout of the widget
 struct WonderousWidgetView : View {
     @Environment(\.widgetFamily) var family: WidgetFamily
     var entry: WonderousTimelineProvider.Entry
@@ -10,14 +10,13 @@ struct WonderousWidgetView : View {
         let showTitle = family == .systemLarge
         let showIcon = family != .systemSmall
         let showTitleAndDesc = family != .systemSmall
-        
+        let progressPct = Double(entry.discoveredCount) / 24.0
-        let progress = Double(entry.discoveredCount) / 24.0
+        let iconImage = FlutterImages.icon;
-        let iconImage = flutterAssetBundle.appending(
-            path: "/assets/images/widget/wonderous-icon.png"
-        ).path()
         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")
@@ -32,7 +31,10 @@ struct WonderousWidgetView : View {
                         .frame(height: 24)
                 }
             }
+            
             Spacer();
+            
+            // Bottom hz row with title, desc and progress gauge
             HStack {
                 if(showTitleAndDesc) {
                     VStack(alignment: .leading){
@@ -46,14 +48,16 @@ struct WonderousWidgetView : View {
                 }
                 Spacer();
                 ZStack{
-                    ProgressView(value: progress)
+                    ProgressView(value: progressPct)
                         .progressViewStyle(GaugeProgressStyle())
                         .frame(width: 48, height: 48)
-                    Text("\(Int(progress * 100))%").font(.system(size: 13)).foregroundColor(.white)
+                    
+                    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(
@@ -62,21 +66,11 @@ struct WonderousWidgetView : View {
                 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"))
         
     }
 }
 
-// Todo: Refactor to getFlutterAsset(String path), include /assets, or maybe just getFlutterImage(String path), include assets/images
-// Returns a file path to the location of the flutter assetBundle
-var flutterAssetBundle: 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
-}

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({Key? key}) : super(key: key);
+  const ArtifactSearchHelper({super.key});
 
   @override
   State<ArtifactSearchHelper> createState() => _ArtifactSearchHelperState();
@@ -161,10 +161,14 @@ 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) return _logError(id, 'year is out of range');
+    if (year < minYear || year > maxYear) {
+      return _logError(id, 'year is out of range');
+    }
 
     String? imageUrlSmall = json['primaryImageSmall'];
-    if (imageUrlSmall == null || imageUrlSmall.isEmpty) return _logError(id, 'no small image url');
+    if (imageUrlSmall == null || imageUrlSmall.isEmpty) {
+      return _logError(id, 'no small image url');
+    }
     // if (!imageUrlSmall.startsWith(SearchData.baseImagePath)) {
     //   return _logError(id, 'unexpected image uri: "$imageUrlSmall"');
     // }

lib/assets.dart

@@ -43,24 +43,16 @@ class SvgPaths {
 /// For wonder specific assets, add an extension to [WonderType] for easy lookup
 extension WonderAssetExtensions on WonderType {
   String get assetPath {
-    switch (this) {
+    return switch (this) {
-      case WonderType.pyramidsGiza:
+      WonderType.pyramidsGiza => '${ImagePaths.root}/pyramids',
-        return '${ImagePaths.root}/pyramids';
+      WonderType.greatWall => '${ImagePaths.root}/great_wall_of_china',
-      case WonderType.greatWall:
+      WonderType.petra => '${ImagePaths.root}/petra',
-        return '${ImagePaths.root}/great_wall_of_china';
+      WonderType.colosseum => '${ImagePaths.root}/colosseum',
-      case WonderType.petra:
+      WonderType.chichenItza => '${ImagePaths.root}/chichen_itza',
-        return '${ImagePaths.root}/petra';
+      WonderType.machuPicchu => '${ImagePaths.root}/machu_picchu',
-      case WonderType.colosseum:
+      WonderType.tajMahal => '${ImagePaths.root}/taj_mahal',
-        return '${ImagePaths.root}/colosseum';
+      WonderType.christRedeemer => '${ImagePaths.root}/christ_the_redeemer'
-      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,4 +1,5 @@
 /// Consolidate imports that are common across the app.
+library;
 
 export 'dart:math';
 

lib/logic/app_logic.dart

@@ -1,7 +1,6 @@
 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';
@@ -34,10 +33,6 @@ 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.

lib/logic/collectibles_logic.dart

@@ -40,7 +40,7 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
     statesById.value = states;
     if (state == CollectibleState.discovered) {
       final data = fromId(id)!;
-      _updateNativeWidgetTextData(
+      _updateNativeHomeWidgetData(
         title: data.title,
         id: data.id,
         imageUrl: data.imageUrlSmall,
@@ -91,15 +91,14 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
     for (int i = 0; i < all.length; i++) {
       states[all[i].id] = CollectibleState.lost;
     }
-    if (_nativeWidget.isSupported) {
+    _updateNativeHomeWidgetData(); // clear home widget data
-      _updateNativeWidgetTextData(); // clear home widget data
-    }
     statesById.value = states;
     debugPrint('collection reset');
     scheduleSave();
   }
 
-  Future<void> _updateNativeWidgetTextData({String title = '', String id = '', String imageUrl = ''}) async {
+  Future<void> _updateNativeHomeWidgetData({String title = '', String id = '', String imageUrl = ''}) async {
+    if (!_nativeWidget.isSupported) return;
     // Save title
     await _nativeWidget.save<String>('lastDiscoveredTitle', title);
     // Subtitle
@@ -115,7 +114,7 @@ class CollectiblesLogic with ThrottledSaveLoadMixin {
     if (imageUrl.isNotEmpty) {
       var bytes = await http.readBytes(Uri.parse(imageUrl));
       imageBase64 = base64Encode(bytes);
-      debugPrint('Saving base64 bytes: $imageBase64');
+      debugPrint('Saving base64 bytes for homeWidget');
     }
     await _nativeWidget.save<String>('lastDiscoveredImageData', imageBase64);
     await _nativeWidget.markDirty();

lib/logic/data/unsplash_photo_data.dart

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

lib/logic/unsplash_logic.dart

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

lib/main.dart

@@ -30,7 +30,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({Key? key}) : super(key: key);
+  WondersApp({super.key});
   @override
   Widget build(BuildContext context) {
     final locale = watchX((SettingsLogic s) => s.currentLocale);
@@ -42,6 +42,7 @@ 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,

lib/styles/colors.dart

@@ -13,6 +13,9 @@ 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,7 +1,5 @@
 // ignore_for_file: library_private_types_in_public_api
 
-import 'dart:ui';
-
 import 'package:wonders/common_libs.dart';
 
 export 'colors.dart';
@@ -16,20 +14,13 @@ class AppStyle {
     final shortestSide = screenSize.shortestSide;
     const tabletXl = 1000;
     const tabletLg = 800;
-    const tabletSm = 600;
-    const phoneLg = 400;
     if (shortestSide > tabletXl) {
-      scale = 1.25;
+      scale = 1.2;
     } else if (shortestSide > tabletLg) {
-      scale = 1.15;
+      scale = 1.1;
-    } else if (shortestSide > tabletSm) {
-      scale = 1;
-    } else if (shortestSide > phoneLg) {
-      scale = .9; // phone
     } else {
-      scale = .85; // small phone
+      scale = 1;
     }
-    //debugPrint('screenSize=$screenSize, scale=$scale');
   }
 
   late final double scale;

lib/styles/wonders_color_extensions.dart

@@ -2,45 +2,29 @@ import 'package:wonders/common_libs.dart';
 
 extension WonderColorExtensions on WonderType {
   Color get bgColor {
-    switch (this) {
+    return switch (this) {
-      case WonderType.pyramidsGiza:
+      WonderType.pyramidsGiza => const Color(0xFF16184D),
-        return const Color(0xFF16184D);
+      WonderType.greatWall => const Color(0xFF642828),
-      case WonderType.greatWall:
+      WonderType.petra => const Color(0xFF444B9B),
-        return const Color(0xFF642828);
+      WonderType.colosseum => const Color(0xFF1E736D),
-      case WonderType.petra:
+      WonderType.chichenItza => const Color(0xFF164F2A),
-        return const Color(0xFF444B9B);
+      WonderType.machuPicchu => const Color(0xFF0E4064),
-      case WonderType.colosseum:
+      WonderType.tajMahal => const Color(0xFFC96454),
-        return const Color(0xFF1E736D);
+      WonderType.christRedeemer => const Color(0xFF1C4D46)
-      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 {
-    switch (this) {
+    return switch (this) {
-      case WonderType.pyramidsGiza:
+      WonderType.pyramidsGiza => const Color(0xFF444B9B),
-        return const Color(0xFF444B9B);
+      WonderType.greatWall => const Color(0xFF688750),
-      case WonderType.greatWall:
+      WonderType.petra => const Color(0xFF1B1A65),
-        return const Color(0xFF688750);
+      WonderType.colosseum => const Color(0xFF4AA39D),
-      case WonderType.petra:
+      WonderType.chichenItza => const Color(0xFFE2CFBB),
-        return const Color(0xFF1B1A65);
+      WonderType.machuPicchu => const Color(0xFFC1D9D1),
-      case WonderType.colosseum:
+      WonderType.tajMahal => const Color(0xFF642828),
-        return const Color(0xFF4AA39D);
+      WonderType.christRedeemer => const Color(0xFFED7967)
-      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({Key? key, required this.child}) : super(key: key);
+  const WondersAppScaffold({super.key, required this.child});
   final Widget child;
   static AppStyle get style => _style;
   static AppStyle _style = AppStyle();

lib/ui/common/app_backdrop.dart

@@ -1,14 +1,13 @@
 import 'dart:ui';
 
-import 'package:flutter/foundation.dart';
 import 'package:wonders/common_libs.dart';
 
 class AppBackdrop extends StatelessWidget {
   const AppBackdrop({
-    Key? key,
+    super.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, {Key? key, this.size = 22, this.color}) : super(key: key);
+  const AppIcon(this.icon, {super.key, this.size = 22, this.color});
   final AppIcons icon;
   final double size;
   final Color? color;

lib/ui/common/app_shortcuts.dart

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

lib/ui/common/blend_mask.dart

@@ -5,8 +5,7 @@ class BlendMask extends SingleChildRenderObjectWidget {
   final List<BlendMode> blendModes;
   final double opacity;
 
-  const BlendMask({required this.blendModes, this.opacity = 1.0, Key? key, required Widget child})
+  const BlendMask({required this.blendModes, this.opacity = 1.0, super.key, required Widget super.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({Key? key, required this.child, this.width, this.height, this.padding}) : super(key: key);
+  const CenteredBox({super.key, required this.child, this.width, this.height, this.padding});
   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, Key? key, this.focus}) : super(key: key) {
+  CollectibleItem(this.collectible, {this.size = 64.0, super.key, this.focus}) {
     // pre-fetch the image, so it's ready if we show the collectible found screen.
     _imageProvider = NetworkImage(collectible.imageUrl);
     _imageProvider.resolve(ImageConfiguration()).addListener(ImageStreamListener((_, __) {}));
@@ -56,9 +56,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: 1.0, end: 1.1, duration: $styles.times.med)
+                .scale(begin: Offset(1.0, 1.0), end: Offset(1.1, 1.1), duration: $styles.times.med)
                 .then(delay: $styles.times.med)
-                .scale(begin: 1.0, end: 1 / 1.1),
+                .scale(begin: Offset(1.0, 1.0), end: Offset(1 / 1.1, 1 / 1.1)),
           ),
         ),
       ),

lib/ui/common/compass_divider.dart

@@ -2,8 +2,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:wonders/common_libs.dart';
 
 class CompassDivider extends StatelessWidget {
-  const CompassDivider({Key? key, required this.isExpanded, this.duration, this.linesColor, this.compassColor})
+  const CompassDivider({super.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(
-      {Key? key,
+      {super.key,
       this.title,
       this.subtitle,
       this.showBackBtn = true,
@@ -11,8 +11,7 @@ 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({
-    Key? key,
+    super.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,7 +88,9 @@ 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) return image; // TODO: Remove this when the web engine is updated to support non-blocking image resizing
+    if (kIsWeb) {
+      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({Key? key, this.value, this.color}) : super(key: key);
+  const AppLoadingIndicator({super.key, this.value, this.color});
   final Color? color;
   final double? value;
 

lib/ui/common/controls/app_page_indicator.dart

@@ -3,15 +3,14 @@ import 'package:wonders/common_libs.dart';
 
 class AppPageIndicator extends StatefulWidget {
   AppPageIndicator({
-    Key? key,
+    super.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({
-    Key? key,
+    super.key,
     required this.onPressed,
     required this.semanticLabel,
     this.enableFeedback = true,
@@ -24,11 +24,10 @@ class AppBtn extends StatelessWidget {
     this.border,
     this.focusNode,
     this.onFocusChanged,
-  })  : _builder = null,
+  }) : _builder = null;
-        super(key: key);
 
   AppBtn.from({
-    Key? key,
+    super.key,
     required this.onPressed,
     this.enableFeedback = true,
     this.pressEffect = true,
@@ -45,9 +44,10 @@ class AppBtn extends StatelessWidget {
     AppIcons? icon,
     double? iconSize,
   })  : child = null,
-        circular = false,
+        circular = false {
-        super(key: key) {
+    if (semanticLabel == null && text == null) {
-    if (semanticLabel == null && text == null) throw ('AppBtn.from must include either text or semanticLabel');
+      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({
-    Key? key,
+    super.key,
     required this.onPressed,
     required this.semanticLabel,
     this.enableFeedback = true,
@@ -85,8 +85,7 @@ class AppBtn extends StatelessWidget {
   })  : expand = false,
         bgColor = Colors.transparent,
         border = null,
-        _builder = null,
+        _builder = null;
-        super(key: key);
 
   // interaction:
   final VoidCallback? onPressed;
@@ -185,7 +184,7 @@ class AppBtn extends StatelessWidget {
 /// Add a transparency-based press effect to buttons.
 /// //////////////////////////////////////////////////
 class _ButtonPressEffect extends StatefulWidget {
-  const _ButtonPressEffect(this.child, {Key? key}) : super(key: key);
+  const _ButtonPressEffect(this.child);
   final Widget child;
 
   @override
@@ -212,7 +211,7 @@ class _ButtonPressEffectState extends State<_ButtonPressEffect> {
 }
 
 class _CustomFocusBuilder extends StatefulWidget {
-  const _CustomFocusBuilder({Key? key, required this.builder, this.focusNode, this.onFocusChanged}) : super(key: key);
+  const _CustomFocusBuilder({required this.builder, this.focusNode, this.onFocusChanged});
   final Widget Function(BuildContext context, FocusNode focus) builder;
   final void Function(bool hasFocus)? onFocusChanged;
   final FocusNode? focusNode;

lib/ui/common/controls/checkbox.dart

@@ -2,8 +2,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/utils/app_haptics.dart';
 
 class SimpleCheckbox extends StatelessWidget {
-  const SimpleCheckbox({Key? key, required this.active, required this.onToggled, required this.label})
+  const SimpleCheckbox({super.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({
-    Key? key,
+    super.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({
-    Key? key,
+    super.key,
     required this.icon,
     required this.onPressed,
     this.border,
@@ -50,7 +50,7 @@ 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;
@@ -87,13 +87,13 @@ class CircleIconBtn extends StatelessWidget {
 
 class BackBtn extends StatelessWidget {
   const BackBtn({
-    Key? key,
+    super.key,
     this.icon = AppIcons.prev,
     this.onPressed,
     this.semanticLabel,
     this.bgColor,
     this.iconColor,
-  }) : super(key: key);
+  });
 
   final Color? bgColor;
   final Color? iconColor;
@@ -121,20 +121,23 @@ class BackBtn extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return FullscreenKeyboardListener(
-    onKeyDown: (event) => _handleKeyDown(context, event), child: CircleIconBtn(
+      onKeyDown: (event) => _handleKeyDown(context, event),
+      child: CircleIconBtn(
         icon: icon,
         bgColor: bgColor,
         color: iconColor,
-      onPressed: onPressed ?? () {
+        onPressed: onPressed ??
+            () {
               final nav = Navigator.of(context);
-        if(nav.canPop()){
+              if (nav.canPop()) {
                 Navigator.pop(context);
               } else {
                 context.go(ScreenPaths.home);
               }
             },
         semanticLabel: semanticLabel ?? $strings.circleButtonsSemanticBack,
-    ),);
+      ),
+    );
   }
 
   Widget safe() => _SafeAreaWithPadding(child: this);
@@ -153,7 +156,7 @@ class BackBtn extends StatelessWidget {
 }
 
 class _SafeAreaWithPadding extends StatelessWidget {
-  const _SafeAreaWithPadding({Key? key, required this.child}) : super(key: key);
+  const _SafeAreaWithPadding({required this.child});
 
   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({Key? key, required this.current, required this.total}) : super(key: key);
+  const DiagonalTextPageIndicator({super.key, required this.current, required this.total});
   final int current;
   final int total;
   static final _fontSize = 26 * $styles.scale;

lib/ui/common/controls/eight_way_swipe_detector.dart

@@ -1,8 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
 class EightWaySwipeDetector extends StatefulWidget {
-  const EightWaySwipeDetector({Key? key, required this.child, this.threshold = 50, required this.onSwipe})
+  const EightWaySwipeDetector({super.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({Key? key}) : super(key: key);
+  LocaleSwitcher({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -11,6 +11,7 @@ class LocaleSwitcher extends StatelessWidget with GetItMixin {
       await settingsLogic.changeLocale(newLocale);
     }
 
-    return AppBtn.from(text: $strings.localeSwapButton, onPressed: handleSwapLocale, padding: EdgeInsets.all($styles.insets.sm));
+    return AppBtn.from(
+        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({
-    Key? key,
+    super.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({
-    Key? key,
+    super.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({
-    Key? key,
+    super.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,33 +40,29 @@ class ArchPoint {
 
 List<ArchPoint> _getArchPts(Size size, ArchType type) {
   double distanceFromTop = size.width / 3;
-  switch (type) {
+  return switch (type) {
-    case ArchType.pyramid:
+    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)),
-      ];
+      ],
-    case ArchType.spade:
+    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)),
-      ];
+      ],
-    case ArchType.arch:
+    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)),
-      ];
+      ],
-    case ArchType.wideArch:
+    ArchType.wideArch => [
-      return [
         ArchPoint(Offset(0, size.height)),
         ArchPoint(Offset(0, size.width / 2)),
         ArchPoint(Offset(0, distanceFromTop)),
@@ -74,17 +70,16 @@ 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)),
-      ];
+      ],
-    case ArchType.flatPyramid:
+    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({Key? key, this.vertical = false}) : super(key: key);
+  const DashedLine({super.key, this.vertical = false});
   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({Key? key, required this.animation, required this.color}) : super(key: key);
+  const FadeColorTransition({super.key, required this.animation, required this.color});
   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,
-      {Key? key,
+      {super.key,
       this.child,
       this.width,
       this.height,
@@ -10,8 +10,7 @@ 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;
@@ -45,41 +44,12 @@ class GradientContainer extends StatelessWidget {
 }
 
 class HzGradient extends GradientContainer {
-  const HzGradient(List<Color> colors, List<double> stops,
+  const HzGradient(super.colors, super.stops,
-      {Key? key,
+      {super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius});
-      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(List<Color> colors, List<double> stops,
+  const VtGradient(super.colors, super.stops,
-      {Key? key,
+      {super.key, super.child, super.width, super.height, super.alignment, super.blendMode, super.borderRadius})
-      Widget? child,
+      : super(begin: Alignment.topCenter, end: Alignment.bottomCenter);
-      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

@@ -6,9 +6,8 @@ import 'package:wonders/ui/common/collectible_item.dart';
 /// If `wonders` is empty, then the collectible is always shown.
 class HiddenCollectible extends StatelessWidget with GetItMixin {
   HiddenCollectible(this.currentWonder,
-      {Key? key, required this.index, this.matches = const [], this.size = 64, this.focus})
+      {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;

lib/ui/common/keyboard_arrows_listener.dart

@@ -9,7 +9,7 @@ class ArrowDir {
 }
 
 class KeyboardArrowsListener extends StatefulWidget {
-  const KeyboardArrowsListener({Key? key, required this.child, required this.onArrow}) : super(key: key);
+  const KeyboardArrowsListener({super.key, required this.child, required this.onArrow});
   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({
-    Key? key,
+    super.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;
@@ -39,9 +39,7 @@ class LazyIndexedStackState extends State<LazyIndexedStack> {
     // Mark current index as active
     _activated[widget.index] = true;
     final children = List.generate(_activated.length, (i) {
-      Widget child = _activated[i] ? widget.children[i] : const SizedBox.shrink();
+      return _activated[i] ? widget.children[i] : const SizedBox.shrink();
-      bool isSelected = widget.index == i;
-      return ExcludeFocus(excluding: !isSelected, child: child);
     });
     return IndexedStack(
       alignment: widget.alignment,

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({Key? key, this.size = 100, this.color, this.bottomUp = false}) : super(key: key);
+  const ListOverscollGradient({super.key, this.size = 100, this.color, this.bottomUp = false});
   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({Key? key, required this.onChange, required Widget child}) : super(key: key, child: child);
+  const MeasurableWidget({super.key, required this.onChange, required Widget super.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({Key? key, this.title, this.msg, this.child}) : super(key: key);
+  const LoadingModal({super.key, this.title, this.msg, this.child});
   final String? title;
   final String? msg;
   final Widget? child;
@@ -28,7 +28,7 @@ class LoadingModal extends StatelessWidget {
 }
 
 class OkModal extends StatelessWidget {
-  const OkModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
+  const OkModal({super.key, this.title, this.msg, this.child});
   final String? title;
   final String? msg;
   final Widget? child;
@@ -51,7 +51,7 @@ class OkModal extends StatelessWidget {
 }
 
 class OkCancelModal extends StatelessWidget {
-  const OkCancelModal({Key? key, this.title, this.msg, this.child}) : super(key: key);
+  const OkCancelModal({super.key, this.title, this.msg, this.child});
   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({Key? key, this.title, this.msg, required this.buttons, this.child}) : super(key: key);
+  const _BaseContentModal({this.title, this.msg, required this.buttons, this.child});
 
   @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({Key? key, required this.type}) : super(key: key);
+  FullscreenMapsViewer({super.key, required this.type});
   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({Key? key, required this.urls, this.index = 0}) : super(key: key);
+  const FullscreenUrlImgViewer({super.key, required this.urls, this.index = 0});
   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, {Key? key}) : super(key: key);
+  const _Viewer(this.url, this.isZoomed);
 
   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({Key? key, required this.id}) : super(key: key);
+  const FullscreenVideoViewer({super.key, required this.id});
   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, {Key? key}) : super(key: key);
+  FullscreenWebView(this.url, {super.key});
   final String url;
 
   late final controller = WebViewController()

lib/ui/common/opening_card.dart

@@ -3,13 +3,12 @@ import 'package:wonders/ui/common/measurable_widget.dart';
 
 class OpeningCard extends StatefulWidget {
   const OpeningCard(
-      {Key? key,
+      {super.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({Key? key}) : super(key: key);
+  const PopNavigatorUnderlay({super.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({Key? key, required this.child, required this.controller}) : super(key: key);
+  const PopRouterOnOverScroll({super.key, required this.child, required this.controller});
   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({Key? key, required this.scrollPos, required this.builder}) : super(key: key);
+  const AnimatedListItem({super.key, required this.scrollPos, required this.builder});
   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({Key? key, required this.scrollPos, required this.child}) : super(key: key);
+  const ScalingListItem({super.key, required this.scrollPos, required this.child});
   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({
-    Key? key,
+    super.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({Key? key, required this.child, this.scale = 1}) : super(key: key);
+  const StaticTextScale({super.key, required this.child, this.scale = 1});
   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({Key? key, required this.color, required this.child}) : super(key: key);
+  const DefaultTextColor({super.key, required this.color, required this.child});
   final Color color;
   final Widget child;
 
@@ -15,7 +15,7 @@ class DefaultTextColor extends StatelessWidget {
 }
 
 class LightText extends StatelessWidget {
-  const LightText({Key? key, required this.child}) : super(key: key);
+  const LightText({super.key, required this.child});
   final Widget child;
 
   @override
@@ -26,7 +26,7 @@ class LightText extends StatelessWidget {
 }
 
 class DarkText extends StatelessWidget {
-  const DarkText({Key? key, required this.child}) : super(key: key);
+  const DarkText({super.key, required this.child});
   final Widget child;
 
   @override

lib/ui/common/timeline_event_card.dart

@@ -3,15 +3,14 @@ import 'package:wonders/logic/common/string_utils.dart';
 import 'package:wonders/ui/common/themed_text.dart';
 
 class TimelineEventCard extends StatelessWidget {
-  const TimelineEventCard({Key? key, required this.year, required this.text, this.darkMode = false}) : super(key: key);
+  const TimelineEventCard({super.key, required this.year, required this.text, this.darkMode = false});
   final int year;
   final String text;
   final bool darkMode;
 
   @override
   Widget build(BuildContext context) {
-    return Focus(
+    return MergeSemantics(
-      child: MergeSemantics(
       child: Padding(
         padding: EdgeInsets.only(bottom: $styles.insets.sm),
         child: DefaultTextColor(
@@ -28,8 +27,7 @@ class TimelineEventCard extends StatelessWidget {
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                          Text('${year.abs()}',
+                        Text('${year.abs()}', style: $styles.text.h3.copyWith(fontWeight: FontWeight.w400, height: 1)),
-                              style: $styles.text.h3.copyWith(fontWeight: FontWeight.w400, height: 1)),
                         Text(StringUtils.getYrSuffix(year), style: $styles.text.bodySmall),
                       ],
                     ),
@@ -42,7 +40,7 @@ class TimelineEventCard extends StatelessWidget {
 
                   /// Text content
                   Expanded(
-                      child: Text(text, style: $styles.text.body),
+                    child: Focus(child: Text(text, style: $styles.text.body)),
                   ),
                 ],
               ),
@@ -50,7 +48,6 @@ class TimelineEventCard extends StatelessWidget {
           ),
         ),
       ),
-      ),
     );
   }
 }

lib/ui/common/unsplash_photo.dart

@@ -2,8 +2,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/data/unsplash_photo_data.dart';
 
 class UnsplashPhoto extends StatelessWidget {
-  const UnsplashPhoto(this.id, {Key? key, this.fit = BoxFit.cover, required this.size, this.showCredits = false})
+  const UnsplashPhoto(this.id, {super.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/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({
-    Key? key,
+    super.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({Key? key, required this.isSelected}) : super(key: key);
+  const _DefaultTrackEntry({required this.isSelected});
   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({Key? key, required this.type, this.contentPadding = EdgeInsets.zero}) : super(key: key);
+  const ArtifactCarouselScreen({super.key, required this.type, this.contentPadding = EdgeInsets.zero});
   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({Key? key, this.url}) : super(key: key);
+  const _BlurredImageBg({super.key, this.url});
   final String? url;
 
   @override

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

@@ -2,8 +2,7 @@ part of '../artifact_carousel_screen.dart';
 
 class _BottomTextContent extends StatelessWidget {
   const _BottomTextContent(
-      {Key? key, required this.artifact, required this.height, required this.state, required this.shortMode})
+      {super.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,13 +4,12 @@ part of '../artifact_carousel_screen.dart';
 /// This lets the child simply render it's contents
 class _CollapsingCarouselItem extends StatelessWidget {
   const _CollapsingCarouselItem(
-      {Key? key,
+      {super.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;
@@ -50,11 +49,11 @@ class _CollapsingCarouselItem extends StatelessWidget {
 
 class _AnimatedTranslate extends StatelessWidget {
   const _AnimatedTranslate({
-    Key? key,
+    super.key,
     required this.duration,
     required this.offset,
     required this.child,
-  }) : super(key: key);
+  });
   final Duration duration;
   final Offset offset;
   final Widget child;
@@ -71,7 +70,7 @@ class _AnimatedTranslate extends StatelessWidget {
 }
 
 class _DoubleBorderImage extends StatelessWidget {
-  const _DoubleBorderImage(this.data, {Key? key}) : super(key: key);
+  const _DoubleBorderImage(this.data, {super.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({Key? key, required this.artifactId}) : super(key: key);
+  const ArtifactDetailsScreen({super.key, required this.artifactId});
   final String artifactId;
 
   @override

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({Key? key, required this.data}) : super(key: key);
+  const _ArtifactImageBtn({super.key, required this.data});
   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({Key? key, required this.data}) : super(key: key);
+  const _InfoColumn({super.key, required this.data});
   final ArtifactData data;
 
   @override
@@ -67,7 +67,7 @@ class _InfoColumn extends StatelessWidget {
 }
 
 class _InfoRow extends StatelessWidget {
-  const _InfoRow(this.label, this.value, {Key? key}) : super(key: key);
+  const _InfoRow(this.label, this.value, {super.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({Key? key, required this.type}) : super(key: key);
+  ArtifactSearchScreen({super.key, required this.type});
   final WonderType type;
 
   @override
@@ -203,7 +203,7 @@ class _ArtifactSearchScreenState extends State<ArtifactSearchScreen> with GetItS
 }
 
 class PanelController extends ValueNotifier<bool> {
-  PanelController(bool value) : super(value);
+  PanelController(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({
-    Key? key,
+    super.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,10 +95,9 @@ 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
@@ -120,14 +119,13 @@ 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({
-    Key? key,
+    super.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({Key? key, required this.onPressed, required this.data}) : super(key: key);
+  const _ResultTile({super.key, required this.onPressed, required this.data});
 
   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({Key? key, required this.searchResults, required this.onPressed}) : super(key: key);
+  const _ResultsGrid({super.key, required this.searchResults, required this.onPressed});
   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({Key? key, required this.onSubmit, required this.wonder}) : super(key: key);
+  const _SearchInput({super.key, required this.onSubmit, required this.wonder});
   final void Function(String) onSubmit;
   final WonderData wonder;
 
@@ -23,7 +23,9 @@ class _SearchInput extends StatelessWidget {
   }
 
   Iterable<String> _getSuggestions(TextEditingValue textEditingValue) {
-    if (textEditingValue.text == '') return wonder.searchSuggestions.getRange(0, 10);
+    if (textEditingValue.text == '') {
+      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, Key? key}) : super(key: key);
+  const CollectibleFoundScreen({required this.collectible, required this.imageProvider, super.key});
 
   final CollectibleData collectible;
   final ImageProvider imageProvider;
@@ -44,7 +44,10 @@ 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(),
       )
     ]);
   }
@@ -140,14 +143,14 @@ class CollectibleFoundScreen extends StatelessWidget {
             child: child,
           ),
         )
-        .scale(begin: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, 0.7));
+        .scale(begin: Offset(0.3, 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: 0.3, duration: t * 2, curve: Curves.easeOutExpo, alignment: Alignment(0, -1));
+        .scale(begin: Offset(0.3, 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, {Key? key}) : super(key: key);
+  const _AnimatedRibbon(this.text, {super.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({Key? key, this.fadeMs = 1000}) : super(key: key);
+  const _CelebrationParticles({super.key, this.fadeMs = 1000});
 
   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, Key? key}) : super(key: key);
+  CollectionScreen({required this.fromId, super.key});
 
   final String fromId;
 

lib/ui/screens/collection/widgets/_collectible_image.dart

@@ -2,12 +2,12 @@ part of '../collection_screen.dart';
 
 class _CollectibleImage extends StatelessWidget {
   const _CollectibleImage({
-    Key? key,
+    super.key,
     required this.collectible,
     required this.state,
     required this.onPressed,
     this.heroTag,
-  }) : super(key: key);
+  });
 
   final CollectibleData collectible;
   final ValueSetter<CollectibleData> onPressed;

lib/ui/screens/collection/widgets/_collection_footer.dart

@@ -2,7 +2,7 @@ part of '../collection_screen.dart';
 
 @immutable
 class _CollectionFooter extends StatelessWidget {
-  const _CollectionFooter({Key? key, required this.count, required this.total}) : super(key: key);
+  const _CollectionFooter({super.key, required this.count, required this.total});
 
   final int count;
   final int total;
@@ -42,9 +42,10 @@ class _CollectionFooter extends StatelessWidget {
   }
 
   Widget _buildProgressRow(BuildContext context) {
+    int percent = (count / total * 100).round();
     return Row(children: [
       Text(
-        $strings.collectionLabelDiscovered((count / total * 100).round()),
+        $strings.collectionLabelDiscovered(percent),
         style: $styles.text.body.copyWith(color: $styles.colors.accent1),
       ),
       Spacer(),

lib/ui/screens/collection/widgets/_collection_list.dart

@@ -3,11 +3,11 @@ part of '../collection_screen.dart';
 @immutable
 class _CollectionList extends StatefulWidget with GetItStatefulWidgetMixin {
   _CollectionList({
-    Key? key,
+    super.key,
     this.onReset,
     required this.fromId,
     this.scrollKey,
-  }) : super(key: key);
+  });
 
   static const double _vtCardExtent = 300;
   static const double _hzCardExtent = 600;
@@ -63,7 +63,7 @@ class _CollectionListState extends State<_CollectionList> with GetItStateMixin {
           fromId: widget.fromId,
           data: d,
         );
-      }).toList()
+      })
     ];
     // Scroll view adapts to scroll vertically or horizontally
     return SingleChildScrollView(

lib/ui/screens/collection/widgets/_collection_list_card.dart

@@ -1,7 +1,7 @@
 part of '../collection_screen.dart';
 
 class _CollectionListCard extends StatelessWidget with GetItMixin {
-  _CollectionListCard({Key? key, this.width, this.height, required this.data, required this.fromId}) : super(key: key);
+  _CollectionListCard({super.key, this.width, this.height, required this.data, required this.fromId});
 
   final double? width;
   final double? height;
@@ -48,7 +48,7 @@ class _CollectionListCard extends StatelessWidget with GetItMixin {
                           heroTag: e.id == fromId ? 'collectible_image_$fromId' : null,
                         ),
                       );
-                    }).toList()
+                    })
                   ]),
             )
           ],

lib/ui/screens/collection/widgets/_newly_discovered_items_btn.dart

@@ -2,7 +2,7 @@ part of '../collection_screen.dart';
 
 @immutable
 class _NewlyDiscoveredItemsBtn extends StatelessWidget {
-  const _NewlyDiscoveredItemsBtn({Key? key, this.count = 0, required this.onPressed}) : super(key: key);
+  const _NewlyDiscoveredItemsBtn({super.key, this.count = 0, required this.onPressed});
 
   final int count;
   final VoidCallback onPressed;

lib/ui/screens/editorial/editorial_screen.dart

@@ -38,7 +38,7 @@ part 'widgets/_title_text.dart';
 part 'widgets/_top_illustration.dart';
 
 class WonderEditorialScreen extends StatefulWidget {
-  const WonderEditorialScreen(this.data, {Key? key, required this.contentPadding}) : super(key: key);
+  const WonderEditorialScreen(this.data, {super.key, required this.contentPadding});
   final WonderData data;
   //final void Function(double scrollPos) onScroll;
   final EdgeInsets contentPadding;
@@ -170,8 +170,7 @@ class _WonderEditorialScreenState extends State<WonderEditorialScreen> {
               ),
 
               /// Home Btn
-              SafeArea(
+              AnimatedBuilder(
-                child: AnimatedBuilder(
                 animation: _scroller,
                 builder: (_, child) {
                   return AnimatedOpacity(
@@ -187,7 +186,6 @@ class _WonderEditorialScreenState extends State<WonderEditorialScreen> {
                     child: BackBtn(icon: AppIcons.north, onPressed: _handleBackPressed),
                   ),
                 ),
-                ),
               )
             ],
           ),

lib/ui/screens/editorial/widgets/_app_bar.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _AppBar extends StatelessWidget {
-  _AppBar(this.wonderType, {Key? key, required this.sectionIndex, required this.scrollPos}) : super(key: key);
+  _AppBar(this.wonderType, {super.key, required this.sectionIndex, required this.scrollPos});
   final WonderType wonderType;
   final ValueNotifier<int> sectionIndex;
   final ValueNotifier<double> scrollPos;
@@ -18,24 +18,16 @@ class _AppBar extends StatelessWidget {
   ];
 
   ArchType _getArchType() {
-    switch (wonderType) {
+    return switch (wonderType) {
-      case WonderType.chichenItza:
+      WonderType.chichenItza => ArchType.flatPyramid,
-        return ArchType.flatPyramid;
+      WonderType.christRedeemer => ArchType.wideArch,
-      case WonderType.christRedeemer:
+      WonderType.colosseum => ArchType.arch,
-        return ArchType.wideArch;
+      WonderType.greatWall => ArchType.arch,
-      case WonderType.colosseum:
+      WonderType.machuPicchu => ArchType.pyramid,
-        return ArchType.arch;
+      WonderType.petra => ArchType.wideArch,
-      case WonderType.greatWall:
+      WonderType.pyramidsGiza => ArchType.pyramid,
-        return ArchType.arch;
+      WonderType.tajMahal => ArchType.spade
-      case WonderType.machuPicchu:
+    };
-        return ArchType.pyramid;
-      case WonderType.petra:
-        return ArchType.wideArch;
-      case WonderType.pyramidsGiza:
-        return ArchType.pyramid;
-      case WonderType.tajMahal:
-        return ArchType.spade;
-    }
   }
 
   @override

lib/ui/screens/editorial/widgets/_callout.dart

@@ -3,7 +3,7 @@ part of '../editorial_screen.dart';
 class _Callout extends StatelessWidget {
   final String text;
 
-  const _Callout({Key? key, required this.text}) : super(key: key);
+  const _Callout({super.key, required this.text});
   @override
   Widget build(BuildContext context) {
     return IntrinsicHeight(

lib/ui/screens/editorial/widgets/_circular_title_bar.dart

@@ -1,9 +1,8 @@
 part of '../editorial_screen.dart';
 
 class _CircularTitleBar extends StatelessWidget {
-  const _CircularTitleBar({Key? key, required this.titles, required this.icons, required this.index})
+  const _CircularTitleBar({super.key, required this.titles, required this.icons, required this.index})
-      : assert(titles.length == icons.length, 'The number of titles and icons do not match.'),
+      : assert(titles.length == icons.length, 'The number of titles and icons do not match.');
-        super(key: key);
   final List<String> titles;
   final List<String> icons;
   final int index;
@@ -35,10 +34,8 @@ class _CircularTitleBar extends StatelessWidget {
             BottomCenter(
               child: Padding(
                 padding: EdgeInsets.only(bottom: 20),
-                child: Image.asset('${ImagePaths.common}/${icons[index]}')
+                child: Image.asset('${ImagePaths.common}/${icons[index]}').animate(key: ValueKey(index)).fade().scale(
-                    .animate(key: ValueKey(index))
+                    begin: Offset(.5, .5), end: Offset(1, 1), curve: Curves.easeOutBack, duration: $styles.times.med),
-                    .fade()
-                    .scale(begin: .5, end: 1, curve: Curves.easeOutBack, duration: $styles.times.med),
               ),
             ),
           ],
@@ -50,10 +47,10 @@ class _CircularTitleBar extends StatelessWidget {
 
 class _AnimatedCircleWithText extends StatefulWidget {
   const _AnimatedCircleWithText({
-    Key? key,
+    super.key,
     required this.titles,
     required this.index,
-  }) : super(key: key);
+  });
 
   final List<String> titles;
   final int index;

lib/ui/screens/editorial/widgets/_collapsing_pull_quote_image.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _CollapsingPullQuoteImage extends StatelessWidget {
-  const _CollapsingPullQuoteImage({Key? key, required this.scrollPos, required this.data}) : super(key: key);
+  const _CollapsingPullQuoteImage({super.key, required this.scrollPos, required this.data});
   final ValueNotifier<double> scrollPos;
   final WonderData data;
 
@@ -25,7 +25,7 @@ class _CollapsingPullQuoteImage extends StatelessWidget {
       if (top) offsetY *= -1; // flip?
       return Transform.translate(
         offset: Offset(0, offsetY),
-        child:Text(value, style: quoteStyle, textAlign: TextAlign.center),
+        child: Text(value, style: quoteStyle, textAlign: TextAlign.center),
       );
     }
 

lib/ui/screens/editorial/widgets/_large_simple_quote.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _LargeSimpleQuote extends StatelessWidget {
-  const _LargeSimpleQuote({Key? key, required this.text, required this.author}) : super(key: key);
+  const _LargeSimpleQuote({super.key, required this.text, required this.author});
   final String text;
   final String author;
 

lib/ui/screens/editorial/widgets/_scrolling_content.dart

@@ -1,8 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _ScrollingContent extends StatelessWidget {
-  const _ScrollingContent(this.data, {Key? key, required this.scrollPos, required this.sectionNotifier})
+  const _ScrollingContent(this.data, {super.key, required this.scrollPos, required this.sectionNotifier});
-      : super(key: key);
   final WonderData data;
   final ValueNotifier<double> scrollPos;
   final ValueNotifier<int> sectionNotifier;
@@ -64,16 +63,12 @@ class _ScrollingContent extends StatelessWidget {
 
     Widget buildHiddenCollectible({required int slot}) {
       List<WonderType> getTypesForSlot(slot) {
-        switch (slot) {
+        return switch (slot) {
-          case 0:
+          0 => [WonderType.chichenItza, WonderType.colosseum],
-            return [WonderType.chichenItza, WonderType.colosseum];
+          1 => [WonderType.pyramidsGiza, WonderType.petra],
-          case 1:
+          2 => [WonderType.machuPicchu, WonderType.christRedeemer],
-            return [WonderType.pyramidsGiza, WonderType.petra];
+          _ => [WonderType.tajMahal, WonderType.greatWall]
-          case 2:
+        };
-            return [WonderType.machuPicchu, WonderType.christRedeemer];
-          default:
-            return [WonderType.tajMahal, WonderType.greatWall];
-        }
       }
 
       return HiddenCollectible(
@@ -166,7 +161,7 @@ class _ScrollingContent extends StatelessWidget {
 }
 
 class _YouTubeThumbnail extends StatelessWidget {
-  const _YouTubeThumbnail({Key? key, required this.id, required this.caption}) : super(key: key);
+  const _YouTubeThumbnail({super.key, required this.id, required this.caption});
   final String id;
   final String caption;
 
@@ -217,7 +212,7 @@ class _YouTubeThumbnail extends StatelessWidget {
 }
 
 class _MapsThumbnail extends StatefulWidget {
-  const _MapsThumbnail(this.data, {Key? key}) : super(key: key);
+  const _MapsThumbnail(this.data, {super.key});
   final WonderData data;
 
   @override
@@ -279,10 +274,10 @@ class _MapsThumbnailState extends State<_MapsThumbnail> {
 
 class SliverBackgroundColor extends SingleChildRenderObjectWidget {
   const SliverBackgroundColor({
-    Key? key,
+    super.key,
     required this.color,
     Widget? sliver,
-  }) : super(key: key, child: sliver);
+  }) : super(child: sliver);
 
   final Color color;
 

lib/ui/screens/editorial/widgets/_section_divider.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _SectionDivider extends StatefulWidget {
-  const _SectionDivider(this.scrollNotifier, this.sectionNotifier, {Key? key, required this.index}) : super(key: key);
+  const _SectionDivider(this.scrollNotifier, this.sectionNotifier, {super.key, required this.index});
   final int index;
   final ValueNotifier<double> scrollNotifier;
   final ValueNotifier<int> sectionNotifier;

lib/ui/screens/editorial/widgets/_sliding_image_stack.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _SlidingImageStack extends StatelessWidget {
-  const _SlidingImageStack({Key? key, required this.scrollPos, required this.type}) : super(key: key);
+  const _SlidingImageStack({super.key, required this.scrollPos, required this.type});
 
   final ValueNotifier<double> scrollPos;
   final WonderType type;

lib/ui/screens/editorial/widgets/_title_text.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _TitleText extends StatelessWidget {
-  const _TitleText(this.data, {Key? key, required this.scroller}) : super(key: key);
+  const _TitleText(this.data, {super.key, required this.scroller});
   final WonderData data;
   final ScrollController scroller;
 

lib/ui/screens/editorial/widgets/_top_illustration.dart

@@ -1,7 +1,7 @@
 part of '../editorial_screen.dart';
 
 class _TopIllustration extends StatelessWidget {
-  const _TopIllustration(this.type, {Key? key, this.fgOffset = Offset.zero}) : super(key: key);
+  const _TopIllustration(this.type, {super.key, this.fgOffset = Offset.zero});
   final WonderType type;
   final Offset fgOffset;
 

lib/ui/screens/home/_vertical_swipe_controller.dart

@@ -1,7 +1,7 @@
 part of 'wonders_home_screen.dart';
 
 class _VerticalSwipeController {
-  _VerticalSwipeController(this.ticker, this.onSwipeComplete){
+  _VerticalSwipeController(this.ticker, this.onSwipeComplete) {
     swipeReleaseAnim = AnimationController(vsync: ticker)..addListener(handleSwipeReleaseAnimTick);
   }
   final TickerProvider ticker;
@@ -64,7 +64,7 @@ class _VerticalSwipeController {
       behavior: HitTestBehavior.translucent,
       child: child);
 
-  void dispose(){
+  void dispose() {
     swipeAmt.dispose();
     isPointerDown.dispose();
     swipeReleaseAnim.dispose();

lib/ui/screens/home/widgets/_animated_arrow_button.dart

@@ -2,7 +2,7 @@ part of '../wonders_home_screen.dart';
 
 /// An arrow that fades out, then fades back in and slides down, ending in it's original position with full opacity.
 class _AnimatedArrowButton extends StatelessWidget {
-  _AnimatedArrowButton({Key? key, required this.onTap, required this.semanticTitle}) : super(key: key);
+  _AnimatedArrowButton({required this.onTap, required this.semanticTitle});
 
   final String semanticTitle;
   final VoidCallback onTap;

lib/ui/screens/home/wonders_home_screen.dart

@@ -17,7 +17,7 @@ part '_vertical_swipe_controller.dart';
 part 'widgets/_animated_arrow_button.dart';
 
 class HomeScreen extends StatefulWidget with GetItStatefulWidgetMixin {
-  HomeScreen({Key? key}) : super(key: key);
+  HomeScreen({super.key});
 
   @override
   State<HomeScreen> createState() => _HomeScreenState();
@@ -64,7 +64,9 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
 
   void _handlePageChanged(value) {
     final newIndex = value % _numWonders;
-    if (newIndex == _wonderIndex) return; // Exit early if we're already on this page
+    if (newIndex == _wonderIndex) {
+      return; // Exit early if we're already on this page
+    }
     setState(() {
       _wonderIndex = newIndex;
       settingsLogic.prevWonderIndex.value = _wonderIndex;
@@ -195,7 +197,7 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
       ..._wonders.map((e) {
         final config = WonderIllustrationConfig.bg(isShowing: _isSelected(e.type));
         return WonderIllustration(e.type, config: config);
-      }).toList(),
+      }),
       // Clouds
       FractionallySizedBox(
         widthFactor: 1,
@@ -248,7 +250,7 @@ class _HomeScreenState extends State<HomeScreen> with SingleTickerProviderStateM
               onPlay: _handleFadeAnimInit,
               child: IgnorePointer(child: WonderIllustration(e.type, config: config)));
         });
-      }).toList(),
+      }),
 
       /// Foreground gradient-2, gets darker when swiping up
       BottomCenter(