Merge branch 'theme-cleanup' into 'main'

Veilid 0.4.2-pre/main update See merge request veilid/veilidchat!35
2025-03-03 04:09:13 -05:00 · 2025-02-19 02:49:56 +00:00 · 2025-02-19 02:49:56 +00:00 · 230978b297
commit 230978b297
parent 9c1d780d93 892fdffcf1
35 changed files with 780 additions and 618 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/

 # IntelliJ related
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
    }
 }

-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
    flutterVersionCode = '1'
@ -21,10 +22,6 @@ if (flutterVersionName == null) {
    flutterVersionName = '1.0'
 }

-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def buildConfig = 'debug'

 def keystoreProperties = new Properties()
@ -35,16 +32,16 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    ndkVersion "26.3.11579264"
+    ndkVersion "27.0.12077973"
    compileSdkVersion flutter.compileSdkVersion
-    
+
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
    }

    sourceSets {
@ -70,7 +67,7 @@ android {
           storePassword keystoreProperties['storePassword']
       }
   }
-   
+
   buildTypes {
       release {
            shrinkResources false
@ -82,7 +79,7 @@ android {
            }
       }
   }
-    
+
    namespace 'com.veilid.veilidchat'
 }

@ -90,6 +87,4 @@ flutter {
    source '../..'
 }

-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-}
+dependencies {}
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
    repositories {
        google()
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()

-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}

-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.8.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
+}
+
+include ":app"
--- a/dev-setup/flutter_config.sh
+++ b/dev-setup/flutter_config.sh
@ -14,13 +14,13 @@ sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = [^;]*/MACOSX_DEPLOYMENT_TARGET = 10.14.6
 sed -i '' "s/platform :osx, '[^']*'/platform :osx, '10.14.6'/g" $APPDIR/macos/Podfile

 # Android: Set NDK version
-if [[ "$TMPDIR" != "" ]]; then 
+if [[ "$TMPDIR" != "" ]]; then
    ANDTMP=$TMPDIR/andtmp_$(date +%s)
-else 
+else
    ANDTMP=/tmp/andtmp_$(date +%s)
 fi
 cat <<EOF > $ANDTMP
-    ndkVersion '26.3.11579264'
+    ndkVersion '27.0.12077973'
 EOF
 sed -i '' -e "/android {/r $ANDTMP" $APPDIR/android/app/build.gradle
 rm -- $ANDTMP
@ -29,7 +29,7 @@ rm -- $ANDTMP
 sed -i '' 's/minSdkVersion .*/minSdkVersion Math.max(flutter.minSdkVersion, 24)/g' $APPDIR/android/app/build.gradle

 # Android: Set gradle plugin version
-sed -i '' "s/classpath \'com.android.tools.build:gradle:[^\']*\'/classpath 'com.android.tools.build:gradle:7.2.0'/g" $APPDIR/android/build.gradle
+sed -i '' "s/classpath \'com.android.tools.build:gradle:[^\']*\'/classpath 'com.android.tools.build:gradle:8.8.0'/g" $APPDIR/android/build.gradle

 # Android: Set gradle version
-sed -i '' 's/distributionUrl=.*/distributionUrl=https:\/\/services.gradle.org\/distributions\/gradle-7.6.3-all.zip/g' $APPDIR/android/gradle/wrapper/gradle-wrapper.properties
+sed -i '' 's/distributionUrl=.*/distributionUrl=https:\/\/services.gradle.org\/distributions\/gradle-8.10.2-all.zip/g' $APPDIR/android/gradle/wrapper/gradle-wrapper.properties
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.4'
+platform :ios, '15.6'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -4,60 +4,56 @@ PODS:
  - file_saver (0.0.1):
    - Flutter
  - Flutter (1.0.0)
-  - flutter_native_splash (0.0.1):
+  - flutter_native_splash (2.4.3):
    - Flutter
-  - GoogleDataTransport (9.4.1):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleMLKit/BarcodeScanning (6.0.0):
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleMLKit/BarcodeScanning (7.0.0):
    - GoogleMLKit/MLKitCore
-    - MLKitBarcodeScanning (~> 5.0.0)
-  - GoogleMLKit/MLKitCore (6.0.0):
-    - MLKitCommon (~> 11.0.0)
+    - MLKitBarcodeScanning (~> 6.0.0)
+  - GoogleMLKit/MLKitCore (7.0.0):
+    - MLKitCommon (~> 12.0.0)
  - GoogleToolboxForMac/Defines (4.2.1)
  - GoogleToolboxForMac/Logger (4.2.1):
    - GoogleToolboxForMac/Defines (= 4.2.1)
  - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
    - GoogleToolboxForMac/Defines (= 4.2.1)
-  - GoogleUtilities/Environment (7.13.3):
+  - GoogleUtilities/Environment (8.0.2):
    - GoogleUtilities/Privacy
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.3):
+  - GoogleUtilities/Logger (8.0.2):
    - GoogleUtilities/Environment
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.3)
-  - GoogleUtilities/UserDefaults (7.13.3):
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/UserDefaults (8.0.2):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
-  - GoogleUtilitiesComponents (1.1.0):
-    - GoogleUtilities/Logger
-  - GTMSessionFetcher/Core (3.4.1)
-  - MLImage (1.0.0-beta5)
-  - MLKitBarcodeScanning (5.0.0):
-    - MLKitCommon (~> 11.0)
-    - MLKitVision (~> 7.0)
-  - MLKitCommon (11.0.0):
-    - GoogleDataTransport (< 10.0, >= 9.4.1)
+  - GTMSessionFetcher/Core (3.5.0)
+  - MLImage (1.0.0-beta6)
+  - MLKitBarcodeScanning (6.0.0):
+    - MLKitCommon (~> 12.0)
+    - MLKitVision (~> 8.0)
+  - MLKitCommon (12.0.0):
+    - GoogleDataTransport (~> 10.0)
    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
-    - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0)
-    - GoogleUtilitiesComponents (~> 1.0)
+    - GoogleUtilities/Logger (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
-  - MLKitVision (7.0.0):
+  - MLKitVision (8.0.0):
    - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
    - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
    - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
-    - MLImage (= 1.0.0-beta5)
-    - MLKitCommon (~> 11.0)
-  - mobile_scanner (5.2.3):
+    - MLImage (= 1.0.0-beta6)
+    - MLKitCommon (~> 12.0)
+  - mobile_scanner (6.0.2):
    - Flutter
-    - GoogleMLKit/BarcodeScanning (~> 6.0.0)
-  - nanopb (2.30910.0):
-    - nanopb/decode (= 2.30910.0)
-    - nanopb/encode (= 2.30910.0)
-  - nanopb/decode (2.30910.0)
-  - nanopb/encode (2.30910.0)
+    - GoogleMLKit/BarcodeScanning (~> 7.0.0)
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
  - native_device_orientation (0.0.1):
    - Flutter
  - package_info_plus (0.4.5):
@ -75,9 +71,7 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - smart_auth (0.0.1):
-    - Flutter
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
    - Flutter
    - FlutterMacOS
  - system_info_plus (0.0.1):
@ -100,8 +94,7 @@ DEPENDENCIES:
  - printing (from `.symlinks/plugins/printing/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - smart_auth (from `.symlinks/plugins/smart_auth/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
  - system_info_plus (from `.symlinks/plugins/system_info_plus/ios`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
  - veilid (from `.symlinks/plugins/veilid/ios`)
@ -112,7 +105,6 @@ SPEC REPOS:
    - GoogleMLKit
    - GoogleToolboxForMac
    - GoogleUtilities
-    - GoogleUtilitiesComponents
    - GTMSessionFetcher
    - MLImage
    - MLKitBarcodeScanning
@ -146,10 +138,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  smart_auth:
-    :path: ".symlinks/plugins/smart_auth/ios"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
  system_info_plus:
    :path: ".symlinks/plugins/system_info_plus/ios"
  url_launcher_ios:
@ -158,36 +148,34 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/veilid/ios"

 SPEC CHECKSUMS:
-  camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  camera_avfoundation: 04b44aeb14070126c6529e5ab82cc7c9fca107cf
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
+  flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleMLKit: eff9e23ec1d90ea4157a1ee2e32a4f610c5b3318
  GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
-  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
-  GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
-  GTMSessionFetcher: 8000756fc1c19d2e5697b90311f7832d2e33f6cd
-  MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
-  MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
-  MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
-  MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
-  mobile_scanner: 96e91f2e1fb396bb7df8da40429ba8dfad664740
-  nanopb: 438bc412db1928dac798aa6fd75726007be04262
-  native_device_orientation: 348b10c346a60ebbc62fb235a4fdb5d1b61a8f55
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  MLImage: 0ad1c5f50edd027672d8b26b0fee78a8b4a0fc56
+  MLKitBarcodeScanning: 0a3064da0a7f49ac24ceb3cb46a5bc67496facd2
+  MLKitCommon: 07c2c33ae5640e5380beaaa6e4b9c249a205542d
+  MLKitVision: 45e79d68845a2de77e2dd4d7f07947f0ed157b0e
+  mobile_scanner: af8f71879eaba2bbcb4d86c6a462c3c0e7f23036
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  native_device_orientation: e3580675687d5034770da198f6839ebf2122ef94
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  pasteboard: 49088aeb6119d51f976a421db60d8e1ab079b63c
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  printing: 54ff03f28fe9ba3aa93358afb80a8595a071dd07
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  veilid: 51243c25047dbc1ebbfd87d713560260d802b845
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  veilid: 3ce560a4f2b568a77a9fd5e23090f2fa97581019

-PODFILE CHECKSUM: 5d504085cd7c7a4d71ee600d7af087cb60ab75b2
+PODFILE CHECKSUM: c8bf5b16c34712d5790b0b8d2472cc66ac0a8487

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -380,6 +380,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = VeilidChat;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -510,6 +511,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = VeilidChat;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -534,6 +536,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = VeilidChat;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/lib/chat_list/views/chat_single_contact_item_widget.dart
+++ b/lib/chat_list/views/chat_single_contact_item_widget.dart
@ -29,8 +29,7 @@ class ChatSingleContactItemWidget extends StatelessWidget {
    BuildContext context,
  ) {
    final theme = Theme.of(context);
-    final scale = theme.extension<ScaleScheme>()!;
-    final scaleConfig = theme.extension<ScaleConfig>()!;
+    final scaleTheme = Theme.of(context).extension<ScaleTheme>()!;

    final activeChatCubit = context.watch<ActiveChatCubit>();
    final selected = activeChatCubit.state == _localConversationRecordKey;
@ -44,18 +43,22 @@ class ChatSingleContactItemWidget extends StatelessWidget {
        ? proto.Availability.AVAILABILITY_UNSPECIFIED
        : _contact.profile.availability;

+    final scaleTileTheme = scaleTheme.tileTheme(
+        disabled: _disabled,
+        selected: selected,
+        scaleKind: ScaleKind.secondary);
+
    final avatar = AvatarWidget(
      name: name,
      size: 34,
-      borderColor: _disabled
-          ? scale.grayScale.primaryText
-          : scale.secondaryScale.primaryText,
+      borderColor: scaleTileTheme.borderColor,
      foregroundColor: _disabled
-          ? scale.grayScale.primaryText
-          : scale.secondaryScale.primaryText,
-      backgroundColor:
-          _disabled ? scale.grayScale.primary : scale.secondaryScale.primary,
-      scaleConfig: scaleConfig,
+          ? scaleTheme.scheme.grayScale.primaryText
+          : scaleTheme.scheme.secondaryScale.primaryText,
+      backgroundColor: _disabled
+          ? scaleTheme.scheme.grayScale.primary
+          : scaleTheme.scheme.secondaryScale.primary,
+      scaleConfig: scaleTheme.config,
      textStyle: theme.textTheme.titleLarge!,
    );

@ -69,9 +72,7 @@ class ChatSingleContactItemWidget extends StatelessWidget {
      leading: avatar,
      trailing: AvailabilityWidget(
        availability: availability,
-        color: _disabled
-            ? scale.grayScale.primaryText
-            : scale.secondaryScale.primaryText,
+        color: scaleTileTheme.textColor,
      ),
      onTap: () {
        singleFuture(activeChatCubit, () async {
--- a/lib/theme/models/contrast_generator.dart
+++ b/lib/theme/models/contrast_generator.dart
@ -4,6 +4,7 @@ import 'radix_generator.dart';
 import 'scale_color.dart';
 import 'scale_input_decorator_theme.dart';
 import 'scale_scheme.dart';
+import 'scale_theme.dart';

 ScaleColor _contrastScaleColor(
    {required Brightness brightness,
@ -261,14 +262,16 @@ ThemeData contrastGenerator({
  final colorScheme = scaleScheme.toColorScheme(
    brightness,
  );
+  final scaleTheme = ScaleTheme(
+      textTheme: textTheme, scheme: scaleScheme, config: scaleConfig);

-  final themeData = ThemeData.from(
+  final baseThemeData = ThemeData.from(
      colorScheme: colorScheme, textTheme: textTheme, useMaterial3: true);
-  return themeData.copyWith(
-      appBarTheme: themeData.appBarTheme.copyWith(
+  final themeData = baseThemeData.copyWith(
+      appBarTheme: baseThemeData.appBarTheme.copyWith(
          backgroundColor: scaleScheme.primaryScale.border,
          foregroundColor: scaleScheme.primaryScale.borderText),
-      bottomSheetTheme: themeData.bottomSheetTheme.copyWith(
+      bottomSheetTheme: baseThemeData.bottomSheetTheme.copyWith(
          elevation: 0,
          modalElevation: 0,
          shape: RoundedRectangleBorder(
@ -277,7 +280,7 @@ ThemeData contrastGenerator({
                  topRight:
                      Radius.circular(16 * scaleConfig.borderRadiusScale)))),
      canvasColor: scaleScheme.primaryScale.subtleBackground,
-      chipTheme: themeData.chipTheme.copyWith(
+      chipTheme: baseThemeData.chipTheme.copyWith(
          backgroundColor: scaleScheme.primaryScale.elementBackground,
          selectedColor: scaleScheme.primaryScale.activeElementBackground,
          surfaceTintColor: scaleScheme.primaryScale.hoverElementBackground,
@ -303,5 +306,8 @@ ThemeData contrastGenerator({
      extensions: <ThemeExtension<dynamic>>[
        scaleScheme,
        scaleConfig,
+        scaleTheme
      ]);
+
+  return themeData;
 }
--- a/lib/theme/models/models.dart
+++ b/lib/theme/models/models.dart
@ -2,5 +2,6 @@ export 'chat_theme.dart';
 export 'radix_generator.dart';
 export 'scale_color.dart';
 export 'scale_scheme.dart';
+export 'scale_theme.dart';
 export 'slider_tile.dart';
 export 'theme_preference.dart';
--- a/lib/theme/models/radix_generator.dart
+++ b/lib/theme/models/radix_generator.dart
@ -7,6 +7,7 @@ import '../../tools/tools.dart';
 import 'scale_color.dart';
 import 'scale_input_decorator_theme.dart';
 import 'scale_scheme.dart';
+import 'scale_theme.dart';

 enum RadixThemeColor {
  scarlet, // red + violet + tomato
@ -610,10 +611,14 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
    borderRadiusScale: 1,
  );

-  final themeData = ThemeData.from(
+  final scaleTheme = ScaleTheme(
+      textTheme: textTheme, scheme: scaleScheme, config: scaleConfig);
+
+  final baseThemeData = ThemeData.from(
      colorScheme: colorScheme, textTheme: textTheme, useMaterial3: true);
-  return themeData.copyWith(
-      scrollbarTheme: themeData.scrollbarTheme.copyWith(
+
+  final themeData = baseThemeData.copyWith(
+      scrollbarTheme: baseThemeData.scrollbarTheme.copyWith(
          thumbColor: WidgetStateProperty.resolveWith((states) {
        if (states.contains(WidgetState.pressed)) {
          return scaleScheme.primaryScale.border;
@ -636,10 +641,10 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
        }
        return scaleScheme.primaryScale.subtleBorder;
      })),
-      appBarTheme: themeData.appBarTheme.copyWith(
+      appBarTheme: baseThemeData.appBarTheme.copyWith(
          backgroundColor: scaleScheme.primaryScale.border,
          foregroundColor: scaleScheme.primaryScale.borderText),
-      bottomSheetTheme: themeData.bottomSheetTheme.copyWith(
+      bottomSheetTheme: baseThemeData.bottomSheetTheme.copyWith(
          elevation: 0,
          modalElevation: 0,
          shape: const RoundedRectangleBorder(
@ -647,7 +652,7 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
                  topLeft: Radius.circular(16),
                  topRight: Radius.circular(16)))),
      canvasColor: scaleScheme.primaryScale.subtleBackground,
-      chipTheme: themeData.chipTheme.copyWith(
+      chipTheme: baseThemeData.chipTheme.copyWith(
          backgroundColor: scaleScheme.primaryScale.elementBackground,
          selectedColor: scaleScheme.primaryScale.activeElementBackground,
          surfaceTintColor: scaleScheme.primaryScale.hoverElementBackground,
@ -666,5 +671,11 @@ ThemeData radixGenerator(Brightness brightness, RadixThemeColor themeColor) {
      ),
      inputDecorationTheme:
          ScaleInputDecoratorTheme(scaleScheme, scaleConfig, textTheme),
-      extensions: <ThemeExtension<dynamic>>[scaleScheme, scaleConfig]);
+      extensions: <ThemeExtension<dynamic>>[
+        scaleScheme,
+        scaleConfig,
+        scaleTheme
+      ]);
+
+  return themeData;
 }
--- a/lib/theme/models/scale_scheme.dart
+++ b/lib/theme/models/scale_scheme.dart
@ -145,33 +145,3 @@ class ScaleConfig extends ThemeExtension<ScaleConfig> {
            lerpDouble(borderRadiusScale, other.borderRadiusScale, t) ?? 1);
  }
 }
-
-class ScaleTheme extends ThemeExtension<ScaleTheme> {
-  ScaleTheme({
-    required this.scheme,
-    required this.config,
-  });
-
-  final ScaleScheme scheme;
-  final ScaleConfig config;
-
-  @override
-  ScaleTheme copyWith({
-    ScaleScheme? scheme,
-    ScaleConfig? config,
-  }) =>
-      ScaleTheme(
-        scheme: scheme ?? this.scheme,
-        config: config ?? this.config,
-      );
-
-  @override
-  ScaleTheme lerp(ScaleTheme? other, double t) {
-    if (other is! ScaleTheme) {
-      return this;
-    }
-    return ScaleTheme(
-        scheme: scheme.lerp(other.scheme, t),
-        config: config.lerp(other.config, t));
-  }
-}
--- a/lib/theme/models/scale_theme.dart
+++ b/lib/theme/models/scale_theme.dart
@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+
+import 'scale_scheme.dart';
+
+class ScaleTileTheme {
+  ScaleTileTheme(
+      {required this.textColor,
+      required this.backgroundColor,
+      required this.borderColor,
+      required this.shapeBorder,
+      required this.largeTextStyle,
+      required this.smallTextStyle});
+
+  final Color textColor;
+  final Color backgroundColor;
+  final Color borderColor;
+  final ShapeBorder shapeBorder;
+  final TextStyle largeTextStyle;
+  final TextStyle smallTextStyle;
+}
+
+class ScaleTheme extends ThemeExtension<ScaleTheme> {
+  ScaleTheme({
+    required this.textTheme,
+    required this.scheme,
+    required this.config,
+  });
+
+  final TextTheme textTheme;
+  final ScaleScheme scheme;
+  final ScaleConfig config;
+
+  @override
+  ScaleTheme copyWith({
+    TextTheme? textTheme,
+    ScaleScheme? scheme,
+    ScaleConfig? config,
+  }) =>
+      ScaleTheme(
+        textTheme: textTheme ?? this.textTheme,
+        scheme: scheme ?? this.scheme,
+        config: config ?? this.config,
+      );
+
+  @override
+  ScaleTheme lerp(ScaleTheme? other, double t) {
+    if (other is! ScaleTheme) {
+      return this;
+    }
+    return ScaleTheme(
+        textTheme: TextTheme.lerp(textTheme, other.textTheme, t),
+        scheme: scheme.lerp(other.scheme, t),
+        config: config.lerp(other.config, t));
+  }
+
+  ScaleTileTheme tileTheme(
+      {bool disabled = false,
+      bool selected = false,
+      ScaleKind scaleKind = ScaleKind.primary}) {
+    final tileColor = scheme.scale(!disabled ? scaleKind : ScaleKind.gray);
+
+    final borderColor = selected ? tileColor.hoverBorder : tileColor.border;
+    final backgroundColor = config.useVisualIndicators && !selected
+        ? tileColor.borderText
+        : borderColor;
+    final textColor = config.useVisualIndicators && !selected
+        ? borderColor
+        : tileColor.borderText;
+
+    final largeTextStyle = textTheme.labelMedium!.copyWith(color: textColor);
+    final smallTextStyle = textTheme.labelSmall!.copyWith(color: textColor);
+
+    final shapeBorder = RoundedRectangleBorder(
+        side: config.useVisualIndicators
+            ? BorderSide(width: 2, color: borderColor, strokeAlign: 0)
+            : BorderSide.none,
+        borderRadius: BorderRadius.circular(8 * config.borderRadiusScale));
+
+    return ScaleTileTheme(
+      textColor: textColor,
+      backgroundColor: backgroundColor,
+      borderColor: borderColor,
+      shapeBorder: shapeBorder,
+      largeTextStyle: largeTextStyle,
+      smallTextStyle: smallTextStyle,
+    );
+  }
+}
--- a/lib/theme/models/slider_tile.dart
+++ b/lib/theme/models/slider_tile.dart
@ -69,29 +69,15 @@ class SliderTile extends StatelessWidget {
  // ignore: prefer_expression_function_bodies
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
-    final scale = theme.extension<ScaleScheme>()!;
-    final tileColor = scale.scale(!disabled ? tileScale : ScaleKind.gray);
-    final scaleConfig = theme.extension<ScaleConfig>()!;
-
-    final borderColor = selected ? tileColor.hoverBorder : tileColor.border;
-    final backgroundColor = scaleConfig.useVisualIndicators && !selected
-        ? tileColor.borderText
-        : borderColor;
-    final textColor = scaleConfig.useVisualIndicators && !selected
-        ? borderColor
-        : tileColor.borderText;
+    final scaleTheme = theme.extension<ScaleTheme>()!;
+    final scaleTileTheme = scaleTheme.tileTheme(
+        disabled: disabled, selected: selected, scaleKind: tileScale);

    return Container(
        clipBehavior: Clip.antiAlias,
        decoration: ShapeDecoration(
-            color: backgroundColor,
-            shape: RoundedRectangleBorder(
-              side: scaleConfig.useVisualIndicators
-                  ? BorderSide(width: 2, color: borderColor, strokeAlign: 0)
-                  : BorderSide.none,
-              borderRadius:
-                  BorderRadius.circular(8 * scaleConfig.borderRadiusScale),
-            )),
+            color: scaleTileTheme.backgroundColor,
+            shape: scaleTileTheme.shapeBorder),
        child: Slidable(
            // Specify a key if the Slidable is dismissible.
            key: key,
@ -99,50 +85,39 @@ class SliderTile extends StatelessWidget {
                ? null
                : ActionPane(
                    motion: const DrawerMotion(),
-                    children: endActions
-                        .map(
-                          (a) => SlidableAction(
-                              onPressed: disabled ? null : a.onPressed,
-                              backgroundColor: scaleConfig.useVisualIndicators
-                                  ? (selected
-                                      ? tileColor.borderText
-                                      : tileColor.border)
-                                  : scale.scale(a.actionScale).primary,
-                              foregroundColor: scaleConfig.useVisualIndicators
-                                  ? (selected
-                                      ? tileColor.border
-                                      : tileColor.borderText)
-                                  : scale.scale(a.actionScale).primaryText,
-                              icon: subtitle.isEmpty ? a.icon : null,
-                              label: a.label,
-                              padding: const EdgeInsets.all(2)),
-                        )
-                        .toList()),
+                    children: endActions.map((a) {
+                      final scaleActionTheme = scaleTheme.tileTheme(
+                          disabled: disabled,
+                          selected: true,
+                          scaleKind: a.actionScale);
+                      return SlidableAction(
+                          onPressed: disabled ? null : a.onPressed,
+                          backgroundColor: scaleActionTheme.backgroundColor,
+                          foregroundColor: scaleActionTheme.textColor,
+                          icon: subtitle.isEmpty ? a.icon : null,
+                          label: a.label,
+                          padding: const EdgeInsets.all(2));
+                    }).toList()),
            startActionPane: startActions.isEmpty
                ? null
                : ActionPane(
                    motion: const DrawerMotion(),
-                    children: startActions
-                        .map(
-                          (a) => SlidableAction(
-                              onPressed: disabled ? null : a.onPressed,
-                              backgroundColor: scaleConfig.useVisualIndicators
-                                  ? (selected
-                                      ? tileColor.borderText
-                                      : tileColor.border)
-                                  : scale.scale(a.actionScale).primary,
-                              foregroundColor: scaleConfig.useVisualIndicators
-                                  ? (selected
-                                      ? tileColor.border
-                                      : tileColor.borderText)
-                                  : scale.scale(a.actionScale).primaryText,
-                              icon: subtitle.isEmpty ? a.icon : null,
-                              label: a.label,
-                              padding: const EdgeInsets.all(2)),
-                        )
-                        .toList()),
+                    children: startActions.map((a) {
+                      final scaleActionTheme = scaleTheme.tileTheme(
+                          disabled: disabled,
+                          selected: true,
+                          scaleKind: a.actionScale);
+
+                      return SlidableAction(
+                          onPressed: disabled ? null : a.onPressed,
+                          backgroundColor: scaleActionTheme.backgroundColor,
+                          foregroundColor: scaleActionTheme.textColor,
+                          icon: subtitle.isEmpty ? a.icon : null,
+                          label: a.label,
+                          padding: const EdgeInsets.all(2));
+                    }).toList()),
            child: Padding(
-                padding: scaleConfig.useVisualIndicators
+                padding: scaleTheme.config.useVisualIndicators
                    ? EdgeInsets.zero
                    : const EdgeInsets.fromLTRB(0, 2, 0, 2),
                child: GestureDetector(
@ -157,8 +132,8 @@ class SliderTile extends StatelessWidget {
                          softWrap: false,
                        ),
                        subtitle: subtitle.isNotEmpty ? Text(subtitle) : null,
-                        iconColor: textColor,
-                        textColor: textColor,
+                        iconColor: scaleTileTheme.textColor,
+                        textColor: scaleTileTheme.textColor,
                        leading: FittedBox(child: leading),
                        trailing: FittedBox(child: trailing))))));
  }
--- a/lib/tools/loggy.dart
+++ b/lib/tools/loggy.dart
@ -110,7 +110,8 @@ class CallbackPrinter extends LoggyPrinter {

  @override
  void onLog(LogRecord record) {
-    final out = record.pretty();
+    final out = record.pretty().replaceAll('\uFFFD', '');
+
    if (Platform.isAndroid) {
      debugPrint(out);
    } else {
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@ -9,8 +9,7 @@
 #include <file_saver/file_saver_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <printing/printing_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
-#include <smart_auth/smart_auth_plugin.h>
+#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <veilid/veilid_plugin.h>
 #include <window_manager/window_manager_plugin.h>
@ -25,12 +24,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
  g_autoptr(FlPluginRegistrar) printing_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "PrintingPlugin");
  printing_plugin_register_with_registrar(printing_registrar);
-  g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
-  screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
-  g_autoptr(FlPluginRegistrar) smart_auth_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "SmartAuthPlugin");
-  smart_auth_plugin_register_with_registrar(smart_auth_registrar);
+  g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
+  screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@ -6,8 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
  file_saver
  pasteboard
  printing
-  screen_retriever
-  smart_auth
+  screen_retriever_linux
  url_launcher_linux
  veilid
  window_manager
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -11,10 +11,9 @@ import package_info_plus
 import pasteboard
 import path_provider_foundation
 import printing
-import screen_retriever
+import screen_retriever_macos
 import share_plus
 import shared_preferences_foundation
-import smart_auth
 import sqflite_darwin
 import url_launcher_macos
 import veilid
@ -27,10 +26,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
  PrintingPlugin.register(with: registry.registrar(forPlugin: "PrintingPlugin"))
-  ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
+  ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
-  SmartAuthPlugin.register(with: registry.registrar(forPlugin: "SmartAuthPlugin"))
  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
  VeilidPlugin.register(with: registry.registrar(forPlugin: "VeilidPlugin"))
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -2,7 +2,7 @@ PODS:
  - file_saver (0.0.1):
    - FlutterMacOS
  - FlutterMacOS (1.0.0)
-  - mobile_scanner (5.2.3):
+  - mobile_scanner (6.0.2):
    - FlutterMacOS
  - package_info_plus (0.0.1):
    - FlutterMacOS
@ -13,15 +13,13 @@ PODS:
    - FlutterMacOS
  - printing (1.0.0):
    - FlutterMacOS
-  - screen_retriever (0.0.1):
+  - screen_retriever_macos (0.0.1):
    - FlutterMacOS
  - share_plus (0.0.1):
    - FlutterMacOS
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - smart_auth (0.0.1):
-    - FlutterMacOS
  - sqflite_darwin (0.0.4):
    - Flutter
    - FlutterMacOS
@ -40,10 +38,9 @@ DEPENDENCIES:
  - pasteboard (from `Flutter/ephemeral/.symlinks/plugins/pasteboard/macos`)
  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
  - printing (from `Flutter/ephemeral/.symlinks/plugins/printing/macos`)
-  - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
+  - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`)
  - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - smart_auth (from `Flutter/ephemeral/.symlinks/plugins/smart_auth/macos`)
  - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
  - veilid (from `Flutter/ephemeral/.symlinks/plugins/veilid/macos`)
@ -64,14 +61,12 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
  printing:
    :path: Flutter/ephemeral/.symlinks/plugins/printing/macos
-  screen_retriever:
-    :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
+  screen_retriever_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos
  share_plus:
    :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
  shared_preferences_foundation:
    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
-  smart_auth:
-    :path: Flutter/ephemeral/.symlinks/plugins/smart_auth/macos
  sqflite_darwin:
    :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin
  url_launcher_macos:
@ -82,22 +77,21 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos

 SPEC CHECKSUMS:
-  file_saver: 44e6fbf666677faf097302460e214e977fdd977b
+  file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  mobile_scanner: 0a05256215b047af27b9495db3b77640055e8824
-  package_info_plus: f5790acc797bf17c3e959e9d6cf162cc68ff7523
-  pasteboard: 9b69dba6fedbb04866be632205d532fe2f6b1d99
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  printing: 1dd6a1fce2209ec240698e2439a4adbb9b427637
-  screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
-  share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  smart_auth: b38e3ab4bfe089eacb1e233aca1a2340f96c28e9
-  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
-  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
-  veilid: a54f57b7bcf0e4e072fe99272d76ca126b2026d0
-  window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
+  mobile_scanner: 0e365ed56cad24f28c0fd858ca04edefb40dfac3
+  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+  pasteboard: 278d8100149f940fb795d6b3a74f0720c890ecb7
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  printing: c4cf83c78fd684f9bc318e6aadc18972aa48f617
+  screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
+  share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
+  veilid: 319e2e78836d7b3d08203596d0b4a0e244b68d29
+  window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c

 PODFILE CHECKSUM: ff0a9a3ce75ee73f200ca7e2f47745698c917ef9

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/macos/Runner/AppDelegate.swift
+++ b/macos/Runner/AppDelegate.swift
@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
  override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
    return true
  }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
--- a/packages/veilid_support/example/android/app/build.gradle
+++ b/packages/veilid_support/example/android/app/build.gradle
@ -23,19 +23,19 @@ if (flutterVersionName == null) {
 }

 android {
-    ndkVersion '26.3.11579264'
-    ndkVersion '26.3.11579264'
+    ndkVersion '27.0.12077973'
+    ndkVersion '27.0.12077973'
    namespace "com.example.example"
    compileSdk flutter.compileSdkVersion
    ndkVersion flutter.ndkVersion

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }

    kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
    }

    sourceSets {
--- a/packages/veilid_support/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/veilid_support/example/android/gradle/wrapper/gradle-wrapper.properties
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-8.10.2-all.zip
--- a/packages/veilid_support/example/dev-setup/flutter_config.sh
+++ b/packages/veilid_support/example/dev-setup/flutter_config.sh
@ -14,13 +14,13 @@ sed -i '' 's/MACOSX_DEPLOYMENT_TARGET = [^;]*/MACOSX_DEPLOYMENT_TARGET = 10.14.6
 sed -i '' "s/platform :osx, '[^']*'/platform :osx, '10.14.6'/g" $APPDIR/macos/Podfile

 # Android: Set NDK version
-if [[ "$TMPDIR" != "" ]]; then 
+if [[ "$TMPDIR" != "" ]]; then
    ANDTMP=$TMPDIR/andtmp_$(date +%s)
-else 
+else
    ANDTMP=/tmp/andtmp_$(date +%s)
 fi
 cat <<EOF > $ANDTMP
-    ndkVersion '26.3.11579264'
+    ndkVersion '27.0.12077973'
 EOF
 sed -i '' -e "/android {/r $ANDTMP" $APPDIR/android/app/build.gradle
 rm -- $ANDTMP
@ -29,7 +29,7 @@ rm -- $ANDTMP
 sed -i '' 's/minSdkVersion .*/minSdkVersion Math.max(flutter.minSdkVersion, 24)/g' $APPDIR/android/app/build.gradle

 # Android: Set gradle plugin version
-sed -i '' "s/classpath \'com.android.tools.build:gradle:[^\']*\'/classpath 'com.android.tools.build:gradle:7.2.0'/g" $APPDIR/android/build.gradle
+sed -i '' "s/classpath \'com.android.tools.build:gradle:[^\']*\'/classpath 'com.android.tools.build:gradle:8.8.0'/g" $APPDIR/android/build.gradle

 # Android: Set gradle version
-sed -i '' 's/distributionUrl=.*/distributionUrl=https:\/\/services.gradle.org\/distributions\/gradle-7.3.3-all.zip/g' $APPDIR/android/gradle/wrapper/gradle-wrapper.properties
+sed -i '' 's/distributionUrl=.*/distributionUrl=https:\/\/services.gradle.org\/distributions\/gradle-8.10.2-all.zip/g' $APPDIR/android/gradle/wrapper/gradle-wrapper.properties
--- a/packages/veilid_support/example/pubspec.lock
+++ b/packages/veilid_support/example/pubspec.lock
@ -5,23 +5,23 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
      url: "https://pub.dev"
    source: hosted
-    version: "72.0.0"
+    version: "76.0.0"
  _macros:
    dependency: transitive
    description: dart
    source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
      url: "https://pub.dev"
    source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
  args:
    dependency: transitive
    description:
@ -74,10 +74,10 @@ packages:
    dependency: transitive
    description:
      name: change_case
-      sha256: "99cfdf2018c627c8a3af5a23ea4c414eb69c75c31322d23b9660ebc3cf30b514"
+      sha256: e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
  characters:
    dependency: transitive
    description:
@ -90,10 +90,10 @@ packages:
    dependency: transitive
    description:
      name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
  clock:
    dependency: transitive
    description:
@ -106,10 +106,10 @@ packages:
    dependency: transitive
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  convert:
    dependency: transitive
    description:
@ -122,10 +122,10 @@ packages:
    dependency: transitive
    description:
      name: coverage
-      sha256: "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268"
+      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.0"
+    version: "1.11.1"
  crypto:
    dependency: transitive
    description:
@ -146,10 +146,10 @@ packages:
    dependency: transitive
    description:
      name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
  fake_async:
    dependency: transitive
    description:
@ -235,10 +235,10 @@ packages:
    dependency: transitive
    description:
      name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  globbing:
    dependency: transitive
    description:
@ -251,18 +251,18 @@ packages:
    dependency: transitive
    description:
      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
  http_parser:
    dependency: transitive
    description:
      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
  integration_test:
    dependency: "direct dev"
    description: flutter
@ -272,10 +272,10 @@ packages:
    dependency: transitive
    description:
      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
  js:
    dependency: transitive
    description:
@ -296,18 +296,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
  leak_tracker_testing:
    dependency: transitive
    description:
@ -320,10 +320,10 @@ packages:
    dependency: "direct dev"
    description:
      name: lint_hard
-      sha256: "44d15ec309b1a8e1aff99069df9dcb1597f49d5f588f32811ca28fb7b38c32fe"
+      sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
  logging:
    dependency: transitive
    description:
@ -344,10 +344,10 @@ packages:
    dependency: transitive
    description:
      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
  matcher:
    dependency: transitive
    description:
@ -392,10 +392,10 @@ packages:
    dependency: transitive
    description:
      name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  path:
    dependency: transitive
    description:
@ -408,26 +408,26 @@ packages:
    dependency: transitive
    description:
      name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.12"
+    version: "2.2.15"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  path_provider_linux:
    dependency: transitive
    description:
@ -496,18 +496,18 @@ packages:
    dependency: transitive
    description:
      name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  shelf:
    dependency: transitive
    description:
      name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
  shelf_packages_handler:
    dependency: transitive
    description:
@ -528,15 +528,15 @@ packages:
    dependency: transitive
    description:
      name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
  sky_engine:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  source_map_stack_trace:
    dependency: transitive
    description:
@ -549,10 +549,10 @@ packages:
    dependency: transitive
    description:
      name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.12"
+    version: "0.10.13"
  source_span:
    dependency: transitive
    description:
@ -565,10 +565,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
@ -581,10 +581,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  sync_http:
    dependency: transitive
    description:
@ -605,10 +605,10 @@ packages:
    dependency: transitive
    description:
      name: system_info_plus
-      sha256: b915c811c6605b802f3988859bc2bb79c95f735762a75b5451741f7a2b949d1b
+      sha256: df94187e95527f9cb459e6a9f6e0b1ea20c157d8029bc233de34b3c1e17e1c48
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.5"
+    version: "0.0.6"
  term_glyph:
    dependency: transitive
    description:
@ -621,26 +621,26 @@ packages:
    dependency: "direct dev"
    description:
      name: test
-      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
      url: "https://pub.dev"
    source: hosted
-    version: "1.25.7"
+    version: "1.25.8"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
  typed_data:
    dependency: transitive
    description:
@ -663,7 +663,7 @@ packages:
      path: "../../../../veilid/veilid-flutter"
      relative: true
    source: path
-    version: "0.3.4"
+    version: "0.4.1"
  veilid_support:
    dependency: "direct main"
    description:
@ -682,18 +682,18 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
  watcher:
    dependency: transitive
    description:
      name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  web:
    dependency: transitive
    description:
@ -714,18 +714,18 @@ packages:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  webdriver:
    dependency: transitive
    description:
      name: webdriver
-      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
  webkit_inspection_protocol:
    dependency: transitive
    description:
@ -746,10 +746,10 @@ packages:
    dependency: transitive
    description:
      name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
 sdks:
  dart: ">=3.5.0 <4.0.0"
  flutter: ">=3.24.0"
--- a/packages/veilid_support/example/pubspec.yaml
+++ b/packages/veilid_support/example/pubspec.yaml
@ -17,7 +17,7 @@ dev_dependencies:
  async_tools: ^0.1.6
  integration_test:
    sdk: flutter
-  lint_hard: ^4.0.0
+  lint_hard: ^5.0.0
  test: ^1.25.2
  veilid_test:
    path: ../../../../veilid/veilid-flutter/packages/veilid_test
--- a/packages/veilid_support/lib/src/veilid_log.dart
+++ b/packages/veilid_support/lib/src/veilid_log.dart
@ -57,19 +57,14 @@ void processLog(VeilidLog log) {
  switch (log.logLevel) {
    case VeilidLogLevel.error:
      veilidLoggy.error(log.message, error, stackTrace);
-      break;
    case VeilidLogLevel.warn:
      veilidLoggy.warning(log.message, error, stackTrace);
-      break;
    case VeilidLogLevel.info:
      veilidLoggy.info(log.message, error, stackTrace);
-      break;
    case VeilidLogLevel.debug:
      veilidLoggy.debug(log.message, error, stackTrace);
-      break;
    case VeilidLogLevel.trace:
      veilidLoggy.trace(log.message, error, stackTrace);
-      break;
  }
 }

--- a/packages/veilid_support/pubspec.lock
+++ b/packages/veilid_support/pubspec.lock
@ -5,23 +5,18 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
      url: "https://pub.dev"
    source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
+    version: "80.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
      url: "https://pub.dev"
    source: hosted
-    version: "6.7.0"
+    version: "7.3.0"
  args:
    dependency: transitive
    description:
@ -34,10 +29,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
  async_tools:
    dependency: "direct main"
    description:
@ -66,58 +61,58 @@ packages:
    dependency: transitive
    description:
      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  build:
    dependency: transitive
    description:
      name: build
-      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.1"
+    version: "2.4.2"
  build_config:
    dependency: transitive
    description:
      name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
  build_daemon:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
  build_resolvers:
    dependency: transitive
    description:
      name: build_resolvers
-      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
+      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.4.4"
  build_runner:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
+      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.13"
+    version: "2.4.15"
  build_runner_core:
    dependency: transitive
    description:
      name: build_runner_core
-      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
+      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
      url: "https://pub.dev"
    source: hosted
-    version: "7.3.2"
+    version: "8.0.0"
  built_collection:
    dependency: transitive
    description:
@ -130,18 +125,18 @@ packages:
    dependency: transitive
    description:
      name: built_value
-      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
      url: "https://pub.dev"
    source: hosted
-    version: "8.9.2"
+    version: "8.9.3"
  change_case:
    dependency: transitive
    description:
      name: change_case
-      sha256: "99cfdf2018c627c8a3af5a23ea4c414eb69c75c31322d23b9660ebc3cf30b514"
+      sha256: e41ef3df58521194ef8d7649928954805aeb08061917cf658322305e61568003
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
  characters:
    dependency: transitive
    description:
@ -154,10 +149,10 @@ packages:
    dependency: "direct main"
    description:
      name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
  checked_yaml:
    dependency: transitive
    description:
@ -170,18 +165,18 @@ packages:
    dependency: transitive
    description:
      name: code_builder
-      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.10.0"
+    version: "4.10.1"
  collection:
    dependency: "direct main"
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  convert:
    dependency: transitive
    description:
@ -194,10 +189,10 @@ packages:
    dependency: transitive
    description:
      name: coverage
-      sha256: "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268"
+      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.0"
+    version: "1.11.1"
  crypto:
    dependency: transitive
    description:
@ -210,18 +205,18 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.7"
+    version: "3.0.1"
  equatable:
    dependency: "direct main"
    description:
      name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
  fast_immutable_collections:
    dependency: "direct main"
    description:
@ -268,10 +263,10 @@ packages:
    dependency: "direct dev"
    description:
      name: freezed
-      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
+      sha256: "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.7"
+    version: "2.5.8"
  freezed_annotation:
    dependency: "direct main"
    description:
@ -292,10 +287,10 @@ packages:
    dependency: transitive
    description:
      name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  globbing:
    dependency: transitive
    description:
@ -312,30 +307,38 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.3.2"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
  http_multi_server:
    dependency: transitive
    description:
      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
  http_parser:
    dependency: transitive
    description:
      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
  io:
    dependency: transitive
    description:
      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
  js:
    dependency: transitive
    description:
@ -356,18 +359,18 @@ packages:
    dependency: "direct dev"
    description:
      name: json_serializable
-      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
+      sha256: "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a"
      url: "https://pub.dev"
    source: hosted
-    version: "6.8.0"
+    version: "6.9.4"
  lint_hard:
    dependency: "direct dev"
    description:
      name: lint_hard
-      sha256: "44d15ec309b1a8e1aff99069df9dcb1597f49d5f588f32811ca28fb7b38c32fe"
+      sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
  logging:
    dependency: transitive
    description:
@ -384,22 +387,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.3"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
  material_color_utilities:
    dependency: transitive
    description:
@ -436,10 +431,10 @@ packages:
    dependency: transitive
    description:
      name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  path:
    dependency: "direct main"
    description:
@ -452,26 +447,26 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.12"
+    version: "2.2.15"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  path_provider_linux:
    dependency: transitive
    description:
@ -532,26 +527,26 @@ packages:
    dependency: transitive
    description:
      name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  pubspec_parse:
    dependency: transitive
    description:
      name: pubspec_parse
-      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.5.0"
  shelf:
    dependency: transitive
    description:
      name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
  shelf_packages_handler:
    dependency: transitive
    description:
@ -572,31 +567,31 @@ packages:
    dependency: transitive
    description:
      name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
  sky_engine:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  source_gen:
    dependency: transitive
    description:
      name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.0"
+    version: "2.0.0"
  source_helper:
    dependency: transitive
    description:
      name: source_helper
-      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
+      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.4"
+    version: "1.3.5"
  source_map_stack_trace:
    dependency: transitive
    description:
@ -609,50 +604,50 @@ packages:
    dependency: transitive
    description:
      name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.12"
+    version: "0.10.13"
  source_span:
    dependency: transitive
    description:
      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.0"
+    version: "1.12.1"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
  stream_transform:
    dependency: transitive
    description:
      name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
  system_info2:
    dependency: transitive
    description:
@ -665,50 +660,50 @@ packages:
    dependency: transitive
    description:
      name: system_info_plus
-      sha256: b915c811c6605b802f3988859bc2bb79c95f735762a75b5451741f7a2b949d1b
+      sha256: df94187e95527f9cb459e6a9f6e0b1ea20c157d8029bc233de34b3c1e17e1c48
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.5"
+    version: "0.0.6"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
  test:
    dependency: "direct dev"
    description:
      name: test
-      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
      url: "https://pub.dev"
    source: hosted
-    version: "1.25.8"
+    version: "1.25.15"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3"
+    version: "0.7.4"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.8"
  timing:
    dependency: transitive
    description:
      name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
  typed_data:
    dependency: transitive
    description:
@ -731,23 +726,23 @@ packages:
      path: "../../../veilid/veilid-flutter"
      relative: true
    source: path
-    version: "0.3.4"
+    version: "0.4.1"
  vm_service:
    dependency: transitive
    description:
      name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.0"
+    version: "15.0.0"
  watcher:
    dependency: transitive
    description:
      name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  web:
    dependency: transitive
    description:
@ -768,10 +763,10 @@ packages:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
  webkit_inspection_protocol:
    dependency: transitive
    description:
@ -792,10 +787,10 @@ packages:
    dependency: transitive
    description:
      name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
  flutter: ">=3.24.0"
--- a/packages/veilid_support/pubspec.yaml
+++ b/packages/veilid_support/pubspec.yaml
@ -36,5 +36,5 @@ dev_dependencies:
  build_runner: ^2.4.10
  freezed: ^2.5.2
  json_serializable: ^6.8.0
-  lint_hard: ^4.0.0
+  lint_hard: ^5.0.0
  test: ^1.25.2
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,15 +5,10 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "03f6da266a27a4538a69295ec142cb5717d7d4e5727b84658b63e1e1509bac9c"
+      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
      url: "https://pub.dev"
    source: hosted
-    version: "79.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "80.0.0"
  accordion:
    dependency: "direct main"
    description:
@ -26,18 +21,18 @@ packages:
    dependency: transitive
    description:
      name: analyzer
-      sha256: c9040fc56483c22a5e04a9f6a251313118b1a3c42423770623128fa484115643
+      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
      url: "https://pub.dev"
    source: hosted
-    version: "7.2.0"
+    version: "7.3.0"
  animated_bottom_navigation_bar:
    dependency: "direct main"
    description:
      name: animated_bottom_navigation_bar
-      sha256: "2b04a2ae4b0742669e60ddf309467d6a354cefd2d0cd20f4737b1efaf9834cda"
+      sha256: "94971fdfd53acd443acd0d17ce1cb5219ad833f20c75b50c55b205e54a5d6117"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.3"
+    version: "1.4.0"
  animated_switcher_transitions:
    dependency: "direct main"
    description:
@ -66,10 +61,10 @@ packages:
    dependency: "direct main"
    description:
      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.1"
+    version: "4.0.2"
  args:
    dependency: transitive
    description:
@ -82,10 +77,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
      url: "https://pub.dev"
    source: hosted
-    version: "2.12.0"
+    version: "2.13.0"
  async_tools:
    dependency: "direct main"
    description:
@ -98,10 +93,10 @@ packages:
    dependency: "direct main"
    description:
      name: awesome_extensions
-      sha256: "07e52221467e651cab9219a26286245760831c3852ea2c54883a48a54f120d7c"
+      sha256: "91dc128e8cf01fbd3d3567b8f1dd1e3183cbf9fd6b1850e8b0fafce9a7eee0da"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.16"
+    version: "2.0.20"
  badges:
    dependency: "direct main"
    description:
@ -186,26 +181,26 @@ packages:
    dependency: transitive
    description:
      name: build_daemon
-      sha256: "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.3"
+    version: "4.0.4"
  build_resolvers:
    dependency: transitive
    description:
      name: build_resolvers
-      sha256: "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e"
+      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.3"
+    version: "2.4.4"
  build_runner:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573"
+      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.14"
+    version: "2.4.15"
  build_runner_core:
    dependency: transitive
    description:
@ -234,10 +229,10 @@ packages:
    dependency: transitive
    description:
      name: cached_network_image
-      sha256: "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819"
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.0"
+    version: "3.4.1"
  cached_network_image_platform_interface:
    dependency: transitive
    description:
@ -250,34 +245,34 @@ packages:
    dependency: transitive
    description:
      name: cached_network_image_web
-      sha256: "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996"
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
  camera:
    dependency: transitive
    description:
      name: camera
-      sha256: dfa8fc5a1adaeb95e7a54d86a5bd56f4bb0e035515354c8ac6d262e35cec2ec8
+      sha256: "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.6"
-  camera_android:
+    version: "0.11.1"
+  camera_android_camerax:
    dependency: transitive
    description:
-      name: camera_android
-      sha256: "007c57cdcace4751014071e3d42f2eb8a64a519254abed35b714223d81d66234"
+      name: camera_android_camerax
+      sha256: "7cc6adf1868bdcf4e63a56b24b41692dfbad2bec1cdceea451c77798f6a605c3"
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.10"
+    version: "0.6.13"
  camera_avfoundation:
    dependency: transitive
    description:
      name: camera_avfoundation
-      sha256: "55eb9c216f25339a3faa55fc42826e2c4a45becefa1387fd50fce6ae9dd0c574"
+      sha256: "1eeb9ce7c9a397e312343fd7db337d95f35c3e65ad5a62ff637c8abce5102b98"
      url: "https://pub.dev"
    source: hosted
-    version: "0.9.18+1"
+    version: "0.9.18+8"
  camera_platform_interface:
    dependency: transitive
    description:
@ -466,10 +461,10 @@ packages:
    dependency: "direct main"
    description:
      name: expansion_tile_group
-      sha256: "47615665d4e610dee0b6362de9e81003b56b150b5765ea5444a091762b5dc7d5"
+      sha256: "3be10b81d6d99d1213fe76a285993be0ea6092565ac100152deb6cdf9f5521dc"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "2.2.0"
  fast_immutable_collections:
    dependency: "direct main"
    description:
@ -498,10 +493,10 @@ packages:
    dependency: "direct main"
    description:
      name: file_saver
-      sha256: d375b351e3331663abbaf99747abd72f159260c58fbbdbca9f926f02c01bdc48
+      sha256: "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.13"
+    version: "0.2.14"
  fixnum:
    dependency: "direct main"
    description:
@ -629,10 +624,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_slidable
-      sha256: a857de7ea701f276fd6a6c4c67ae885b60729a3449e42766bb0e655171042801
+      sha256: ab7dbb16f783307c9d7762ede2593ce32c220ba2ba0fd540a3db8e9a3acba71a
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.2"
+    version: "4.0.0"
  flutter_spinkit:
    dependency: "direct main"
    description:
@ -714,10 +709,10 @@ packages:
    dependency: transitive
    description:
      name: get
-      sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e
+      sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425
      url: "https://pub.dev"
    source: hosted
-    version: "4.6.6"
+    version: "4.7.2"
  glob:
    dependency: transitive
    description:
@ -738,10 +733,10 @@ packages:
    dependency: "direct main"
    description:
      name: go_router
-      sha256: "9b736a9fa879d8ad6df7932cbdcc58237c173ab004ef90d8377923d7ad731eaa"
+      sha256: "04539267a740931c6d4479a10d466717ca5901c6fdfd3fcda09391bbb8ebd651"
      url: "https://pub.dev"
    source: hosted
-    version: "14.7.2"
+    version: "14.8.0"
  graphs:
    dependency: transitive
    description:
@ -802,18 +797,18 @@ packages:
    dependency: "direct dev"
    description:
      name: icons_launcher
-      sha256: "9b514ffed6ed69b232fd2bf34c44878c8526be71fc74129a658f35c04c9d4a9d"
+      sha256: a7c83fbc837dc6f81944ef35c3756f533bb2aba32fcca5cbcdb2dbcd877d5ae9
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.7"
+    version: "3.0.0"
  image:
    dependency: "direct main"
    description:
      name: image
-      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6"
      url: "https://pub.dev"
    source: hosted
-    version: "4.3.0"
+    version: "4.5.2"
  intl:
    dependency: "direct main"
    description:
@ -834,10 +829,10 @@ packages:
    dependency: transitive
    description:
      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.7"
+    version: "0.7.1"
  json_annotation:
    dependency: "direct main"
    description:
@ -850,10 +845,10 @@ packages:
    dependency: "direct dev"
    description:
      name: json_serializable
-      sha256: b0a98230538fe5d0b60a22fb6bf1b6cb03471b53e3324ff6069c591679dd59c9
+      sha256: "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a"
      url: "https://pub.dev"
    source: hosted
-    version: "6.9.3"
+    version: "6.9.4"
  linkify:
    dependency: transitive
    description:
@ -866,10 +861,10 @@ packages:
    dependency: "direct dev"
    description:
      name: lint_hard
-      sha256: "44d15ec309b1a8e1aff99069df9dcb1597f49d5f588f32811ca28fb7b38c32fe"
+      sha256: "638d2cce6d3d5499826be71311d18cded797a51351eaa1aee7a35a2f0f9bc46e"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
  logging:
    dependency: transitive
    description:
@ -886,14 +881,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.3"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
  matcher:
    dependency: transitive
    description:
@ -922,18 +909,18 @@ packages:
    dependency: transitive
    description:
      name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
  mobile_scanner:
    dependency: "direct main"
    description:
      name: mobile_scanner
-      sha256: d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760
+      sha256: "91d28b825784e15572fdc39165c5733099ce0e69c6f6f0964ebdbf98a62130fd"
      url: "https://pub.dev"
    source: hosted
-    version: "5.2.3"
+    version: "6.0.6"
  motion_toast:
    dependency: "direct main"
    description:
@ -978,26 +965,26 @@ packages:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: b15fad91c4d3d1f2b48c053dd41cb82da007c27407dc9ab5f9aa59881d0e39d4
+      sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35"
      url: "https://pub.dev"
    source: hosted
-    version: "8.1.4"
+    version: "8.2.1"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
+      sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.1.0"
  pasteboard:
    dependency: "direct main"
    description:
      name: pasteboard
-      sha256: "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674"
+      sha256: "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
  path:
    dependency: "direct main"
    description:
@ -1066,10 +1053,10 @@ packages:
    dependency: "direct main"
    description:
      name: pdf
-      sha256: adbdec5bc84d20e6c8d67f9c64270aa64d1e9e1ed529f0fef7e7bc7e9400f894
+      sha256: "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416"
      url: "https://pub.dev"
    source: hosted
-    version: "3.11.2"
+    version: "3.11.3"
  pdf_widget_wrapper:
    dependency: transitive
    description:
@ -1098,10 +1085,10 @@ packages:
    dependency: "direct main"
    description:
      name: pinput
-      sha256: "6d571e38a484f7515a52e89024ef416f11fa6171ac6f32303701374ab9890efa"
+      sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.1"
  platform:
    dependency: transitive
    description:
@ -1134,6 +1121,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.5.1"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.1"
  preload_page_view:
    dependency: "direct main"
    description:
@ -1146,10 +1141,10 @@ packages:
    dependency: "direct main"
    description:
      name: printing
-      sha256: cc4b256a5a89d5345488e3318897b595867f5181b8c5ed6fc63bfa5f2044aec3
+      sha256: "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93"
      url: "https://pub.dev"
    source: hosted
-    version: "5.13.1"
+    version: "5.14.2"
  protobuf:
    dependency: "direct main"
    description:
@ -1194,10 +1189,10 @@ packages:
    dependency: "direct main"
    description:
      name: qr_code_dart_scan
-      sha256: d5511d137f1ca5cb217fe79fa992616e0361a505a74b1e34499e68040a68b0c3
+      sha256: a21340c4a2ca14e2e114915940fcad166f15c1a065fed8b4fede4a4aba5bc4ff
      url: "https://pub.dev"
    source: hosted
-    version: "0.8.3"
+    version: "0.9.11"
  qr_flutter:
    dependency: "direct main"
    description:
@ -1250,10 +1245,42 @@ packages:
    dependency: transitive
    description:
      name: screen_retriever
-      sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
+      sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.9"
+    version: "0.2.0"
+  screen_retriever_linux:
+    dependency: transitive
+    description:
+      name: screen_retriever_linux
+      sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_macos:
+    dependency: transitive
+    description:
+      name: screen_retriever_macos
+      sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_retriever_platform_interface
+      sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_windows:
+    dependency: transitive
+    description:
+      name: screen_retriever_windows
+      sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
  screenshot:
    dependency: "direct main"
    description:
@ -1283,34 +1310,34 @@ packages:
    dependency: "direct main"
    description:
      name: share_plus
-      sha256: ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544
+      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
      url: "https://pub.dev"
    source: hosted
-    version: "9.0.0"
+    version: "10.1.4"
  share_plus_platform_interface:
    dependency: transitive
    description:
      name: share_plus_platform_interface
-      sha256: "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4"
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.2"
  shared_preferences:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: "688ee90fbfb6989c980254a56cb26ebe9bb30a3a2dff439a78894211f73de67a"
+      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.1"
+    version: "2.5.2"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "650584dcc0a39856f369782874e562efd002a9c94aec032412c9eb81419cce1f"
+      sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.4.6"
  shared_preferences_foundation:
    dependency: transitive
    description:
@ -1339,10 +1366,10 @@ packages:
    dependency: transitive
    description:
      name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
  shared_preferences_windows:
    dependency: transitive
    description:
@ -1363,10 +1390,10 @@ packages:
    dependency: transitive
    description:
      name: shelf_web_socket
-      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.1"
+    version: "3.0.0"
  signal_strength_indicator:
    dependency: "direct main"
    description:
@ -1404,14 +1431,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.2.12"
-  smart_auth:
-    dependency: transitive
-    description:
-      name: smart_auth
-      sha256: "88aa8fe66e951c78a307f26d1c29672dce2e9eb3da2e12e853864d0e615a73ad"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
  sorted_list:
    dependency: "direct main"
    description:
@ -1561,10 +1580,10 @@ packages:
    dependency: transitive
    description:
      name: system_info_plus
-      sha256: b915c811c6605b802f3988859bc2bb79c95f735762a75b5451741f7a2b949d1b
+      sha256: df94187e95527f9cb459e6a9f6e0b1ea20c157d8029bc233de34b3c1e17e1c48
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.5"
+    version: "0.0.6"
  term_glyph:
    dependency: transitive
    description:
@ -1705,10 +1724,10 @@ packages:
    dependency: transitive
    description:
      name: vector_graphics
-      sha256: "7ed22c21d7fdcc88dd6ba7860384af438cd220b251ad65dfc142ab722fabef61"
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.16"
+    version: "1.1.18"
  vector_graphics_codec:
    dependency: transitive
    description:
@ -1767,10 +1786,10 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
  web_socket:
    dependency: transitive
    description:
@ -1799,10 +1818,10 @@ packages:
    dependency: "direct main"
    description:
      name: window_manager
-      sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf"
+      sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.9"
+    version: "0.4.3"
  xdg_directories:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -13,7 +13,7 @@ dependencies:
  animated_switcher_transitions: ^1.0.0
  animated_theme_switcher: ^2.0.10
  ansicolor: ^2.0.2
-  archive: ^3.6.1
+  archive: ^4.0.2
  async_tools: ^0.1.7
  awesome_extensions: ^2.0.16
  badges: ^3.1.2
@ -28,7 +28,7 @@ dependencies:
  cool_dropdown: ^2.1.0
  cupertino_icons: ^1.0.8
  equatable: ^2.0.5
-  expansion_tile_group: ^1.2.4
+  expansion_tile_group: ^2.2.0
  fast_immutable_collections: ^10.2.4
  file_saver: ^0.2.13
  fixnum: ^1.1.0
@ -46,7 +46,7 @@ dependencies:
  flutter_localizations:
    sdk: flutter
  flutter_native_splash: ^2.4.0
-  flutter_slidable: ^3.1.0
+  flutter_slidable: ^4.0.0
  flutter_spinkit: ^5.2.1
  flutter_sticky_header: ^0.7.0
  flutter_svg: ^2.0.10+1
@ -61,20 +61,20 @@ dependencies:
  json_annotation: ^4.9.0
  loggy: ^2.0.3
  meta: ^1.12.0
-  mobile_scanner: ^5.1.1
+  mobile_scanner: ^6.0.6
  motion_toast: ^2.10.0
  native_device_orientation: ^2.0.3
  package_info_plus: ^8.0.0
-  pasteboard: ^0.2.0
+  pasteboard: ^0.3.0
  path: ^1.9.0
  path_provider: ^2.1.3
  pdf: ^3.11.0
-  pinput: ^4.0.0
+  pinput: ^5.0.1
  preload_page_view: ^0.2.0
  printing: ^5.13.1
  protobuf: ^3.1.0
  provider: ^6.1.2
-  qr_code_dart_scan: ^0.8.0
+  qr_code_dart_scan: ^0.9.11
  qr_flutter: ^4.1.0
  radix_colors: ^1.0.4
  reorderable_grid: ^1.0.10
@ -85,7 +85,7 @@ dependencies:
    git:
      url: https://gitlab.com/veilid/Searchable-Listview.git
      ref: main
-  share_plus: ^9.0.0
+  share_plus: ^10.1.4
  shared_preferences: ^2.2.3
  signal_strength_indicator: ^0.4.1
  sliver_expandable: ^1.1.1
@ -107,7 +107,7 @@ dependencies:
    path: ../veilid/veilid-flutter
  veilid_support:
    path: packages/veilid_support
-  window_manager: ^0.3.9
+  window_manager: ^0.4.3
  xterm: ^4.0.0
  zxing2: ^0.2.3

@ -124,9 +124,9 @@ dependencies:
 dev_dependencies:
  build_runner: ^2.4.11
  freezed: ^2.5.2
-  icons_launcher: ^2.1.7
+  icons_launcher: ^3.0.0
  json_serializable: ^6.8.0
-  lint_hard: ^4.0.0
+  lint_hard: ^5.0.0

 flutter_native_splash:
  color: "#8588D0"
--- a/web/index.html
+++ b/web/index.html
@ -1,3 +1,98 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="VeilidChat">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png" />
+
+  <title>VeilidChat</title>
+  <link rel="manifest" href="manifest.json">
+
+</head>
+
+<body>
+  <script type="module">
+    {{flutter_js}}
+    {{flutter_build_config}}
+
+    import * as veilid_wasm_module from './wasm/veilid_wasm.js';
+
+    async function initVeilidWASM() {
+      // save the wasm exports
+      window.veilid_wasm = veilid_wasm_module;
+      // init the js module
+      await veilid_wasm_module.default();
+      // init the wasm library
+      await veilid_wasm_module.initialize_veilid_wasm();
+    }
+
+    window.dartPdfJsBaseUrl = "assets/js/pdf/3.2.146/";
+
+    _flutter.loader.load({
+      onEntrypointLoaded: async function (engineInitializer) {
+        const appRunner = await engineInitializer.initializeEngine();
+
+        await initVeilidWASM();
+
+        await appRunner.runApp();
+      }
+    });
+  </script>
+</body>
+
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <!DOCTYPE html>
 <html lang="en">

@ -43,10 +138,15 @@
 </head>

 <body>
-  <!-- Load WASM modules -->
+
+
  <script type="module">
+    { { flutter_js } }
+    { { flutter_build_config } }
+
    import * as veilid_wasm_module from './wasm/veilid_wasm.js';
-    async function run() {
+
+    async function initVeilidWASM() {
      // save the wasm exports
      window.veilid_wasm = veilid_wasm_module;
      // init the js module
@ -54,11 +154,21 @@
      // init the wasm library
      await veilid_wasm_module.initialize_veilid_wasm();
    }
-    run();
+
+    _flutter.loader.load({
+      onEntrypointLoaded: async function (engineInitializer) {
+        const appRunner = await engineInitializer.initializeEngine();
+
+        await initVeilidWASM();
+
+        await appRunner.runApp();
+      }
+    });
  </script>

+
  <script>
-    var dartPdfJsBaseUrl = "assets/js/pdf/3.2.146/";
+    window.dartPdfJsBaseUrl = "assets/js/pdf/3.2.146/";

    window.addEventListener('load', function (ev) {
      // Download main.dart.js
@ -75,4 +185,18 @@
  </script>
 </body>

+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </html>
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@ -9,9 +9,8 @@
 #include <file_saver/file_saver_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <printing/printing_plugin.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
-#include <smart_auth/smart_auth_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <veilid/veilid_plugin.h>
 #include <window_manager/window_manager_plugin.h>
@ -23,12 +22,10 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
      registry->GetRegistrarForPlugin("PasteboardPlugin"));
  PrintingPluginRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("PrintingPlugin"));
-  ScreenRetrieverPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
  SharePlusWindowsPluginCApiRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
-  SmartAuthPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("SmartAuthPlugin"));
  UrlLauncherWindowsRegisterWithRegistrar(
      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
  VeilidPluginRegisterWithRegistrar(
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@ -6,9 +6,8 @@ list(APPEND FLUTTER_PLUGIN_LIST
  file_saver
  pasteboard
  printing
-  screen_retriever
+  screen_retriever_windows
  share_plus
-  smart_auth
  url_launcher_windows
  veilid
  window_manager