feat: add http client bindings

app/lib/gen/assets.gen.dart

@@ -1,3 +1,5 @@
+// dart format width=150
+
 /// GENERATED CODE - DO NOT MODIFY BY HAND
 /// *****************************************************
 ///  FlutterGen
@@ -5,7 +7,7 @@
 
 // coverage:ignore-file
 // ignore_for_file: type=lint
-// ignore_for_file: directives_ordering,unnecessary_import,implicit_dynamic_list_literal,deprecated_member_use
+// ignore_for_file: deprecated_member_use,directives_ordering,implicit_dynamic_list_literal,unnecessary_import
 
 import 'package:flutter/widgets.dart';
 
@@ -27,6 +29,9 @@ class $AssetsImgGen {
   /// File path: assets/img/logo-32.png
   AssetGenImage get logo32 => const AssetGenImage('assets/img/logo-32.png');
 
+  /// File path: assets/img/logo-512-white.png
+  AssetGenImage get logo512White => const AssetGenImage('assets/img/logo-512-white.png');
+
   /// File path: assets/img/logo-512.png
   AssetGenImage get logo512 => const AssetGenImage('assets/img/logo-512.png');
 
@@ -34,7 +39,7 @@ class $AssetsImgGen {
   String get logo => 'assets/img/logo.ico';
 
   /// List of all assets
-  List<dynamic> get values => [logo128, logo256, logo32Black, logo32White, logo32, logo512, logo];
+  List<dynamic> get values => [logo128, logo256, logo32Black, logo32White, logo32, logo512White, logo512, logo];
 }
 
 class $AssetsWebGen {
@@ -54,7 +59,7 @@ class $AssetsWebGen {
 }
 
 class Assets {
-  Assets._();
+  const Assets._();
 
   static const String changelog = 'assets/CHANGELOG.md';
   static const $AssetsImgGen img = $AssetsImgGen();
@@ -65,12 +70,13 @@ class Assets {
 }
 
 class AssetGenImage {
-  const AssetGenImage(this._assetName, {this.size, this.flavors = const {}});
+  const AssetGenImage(this._assetName, {this.size, this.flavors = const {}, this.animation});
 
   final String _assetName;
 
   final Size? size;
   final Set<String> flavors;
+  final AssetGenImageAnimation? animation;
 
   Image image({
     Key? key,
@@ -93,7 +99,7 @@ class AssetGenImage {
     bool gaplessPlayback = true,
     bool isAntiAlias = false,
     String? package,
-    FilterQuality filterQuality = FilterQuality.low,
+    FilterQuality filterQuality = FilterQuality.medium,
     int? cacheWidth,
     int? cacheHeight,
   }) {
@@ -133,3 +139,11 @@ class AssetGenImage {
 
   String get keyName => _assetName;
 }
+
+class AssetGenImageAnimation {
+  const AssetGenImageAnimation({required this.isAnimation, required this.duration, required this.frames});
+
+  final bool isAnimation;
+  final Duration duration;
+  final int frames;
+}

app/lib/gen/strings_ar.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsAr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsAr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsAr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ar,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ar,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ar>.
   @override
@@ -29,6 +35,9 @@ class TranslationsAr extends Translations {
 
   late final TranslationsAr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsAr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsAr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'العربية';
@@ -990,7 +999,7 @@ class _TranslationsTroubleshootPageFirewallAr extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'هذه المشكلة عادة ما تكون مشكلة في جدار الحماية. يمكنك حل هذه المشكلة عن طريق السماح بالاتصالات الواردة (UDP و TCP) على المنفذ ${port}.';
   @override
-  String get openFirewallSettings => 'افتح جدار الحماية';
+  String get openFirewall => 'افتح جدار الحماية';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_az.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsAz extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsAz({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsAz({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.az,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.az,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <az>.
   @override
@@ -29,6 +35,9 @@ class TranslationsAz extends Translations {
 
   late final TranslationsAz _root = this; // ignore: unused_field
 
+  @override
+  TranslationsAz $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsAz(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Azərbaycanca';

app/lib/gen/strings_bg.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsBg extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsBg({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsBg({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.bg,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.bg,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <bg>.
   @override
@@ -29,6 +35,9 @@ class TranslationsBg extends Translations {
 
   late final TranslationsBg _root = this; // ignore: unused_field
 
+  @override
+  TranslationsBg $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsBg(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Български';
@@ -67,8 +76,6 @@ class TranslationsBg extends Translations {
   @override
   late final _TranslationsChangelogPageBg changelogPage = _TranslationsChangelogPageBg._(_root);
   @override
-  late final _TranslationsAliasGeneratorBg aliasGenerator = _TranslationsAliasGeneratorBg._(_root);
-  @override
   late final _TranslationsDialogsBg dialogs = _TranslationsDialogsBg._(_root);
   @override
   late final _TranslationsSanitizationBg sanitization = _TranslationsSanitizationBg._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPageBg extends TranslationsChangelogPageEn {
   String get title => 'Дневник на промените';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorBg extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorBg._(TranslationsBg root) : this._root = root, super.internal(root);
-
-  final TranslationsBg _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsBg extends TranslationsDialogsEn {
   _TranslationsDialogsBg._(TranslationsBg root) : this._root = root, super.internal(root);
@@ -918,7 +916,7 @@ class _TranslationsTroubleshootPageFirewallBg extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Това най-вероятно е проблем със защитната стена. Можете да разрешите това, като разрешите входящи връзки (UDP и TCP) на порт ${port}.';
   @override
-  String get openFirewallSettings => 'Отворете защитната стена';
+  String get openFirewall => 'Отворете защитната стена';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_bn.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsBn extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsBn({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsBn({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.bn,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.bn,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <bn>.
   @override
@@ -29,6 +35,9 @@ class TranslationsBn extends Translations {
 
   late final TranslationsBn _root = this; // ignore: unused_field
 
+  @override
+  TranslationsBn $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsBn(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'বাংলা';
@@ -994,7 +1003,7 @@ class _TranslationsTroubleshootPageFirewallBn extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'এটি সম্ভবত একটি ফায়ারওয়াল সমস্যা। আপনি পোর্টে ইনকামিং কানেকশন (UDP এবং TCP) পারমিশন দিয়ে এটি ঠিক করতে পারেন ${port}.';
   @override
-  String get openFirewallSettings => 'ফায়ারওয়াল খুলুন';
+  String get openFirewall => 'ফায়ারওয়াল খুলুন';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ca.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsCa extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsCa({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsCa({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ca,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ca,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ca>.
   @override
@@ -29,6 +35,9 @@ class TranslationsCa extends Translations {
 
   late final TranslationsCa _root = this; // ignore: unused_field
 
+  @override
+  TranslationsCa $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsCa(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Català';
@@ -947,7 +956,7 @@ class _TranslationsTroubleshootPageFirewallCa extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'El més provable és que sigui un problema del tallafocs. Pot solucionar-ho permetent les connexiions entrants (UDP I TCP) al port ${port}.';
   @override
-  String get openFirewallSettings => 'Obrir Tallafocs';
+  String get openFirewall => 'Obrir Tallafocs';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_cs.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsCs extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsCs({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsCs({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.cs,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.cs,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <cs>.
   @override
@@ -29,6 +35,9 @@ class TranslationsCs extends Translations {
 
   late final TranslationsCs _root = this; // ignore: unused_field
 
+  @override
+  TranslationsCs $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsCs(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Česky';
@@ -69,8 +78,6 @@ class TranslationsCs extends Translations {
   @override
   late final _TranslationsChangelogPageCs changelogPage = _TranslationsChangelogPageCs._(_root);
   @override
-  late final _TranslationsAliasGeneratorCs aliasGenerator = _TranslationsAliasGeneratorCs._(_root);
-  @override
   late final _TranslationsDialogsCs dialogs = _TranslationsDialogsCs._(_root);
   @override
   late final _TranslationsSanitizationCs sanitization = _TranslationsSanitizationCs._(_root);
@@ -497,15 +504,6 @@ class _TranslationsChangelogPageCs extends TranslationsChangelogPageEn {
   String get title => 'Seznam změn';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorCs extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorCs._(TranslationsCs root) : this._root = root, super.internal(root);
-
-  final TranslationsCs _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsCs extends TranslationsDialogsEn {
   _TranslationsDialogsCs._(TranslationsCs root) : this._root = root, super.internal(root);
@@ -919,7 +917,7 @@ class _TranslationsTroubleshootPageFirewallCs extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'S největší pravděpodobností se jedná o problém s firewallem. Můžete to vyřešit povolením příchozích připojení (UDP a TCP) na portu ${port}.';
   @override
-  String get openFirewallSettings => 'Otevřít bránu firewall';
+  String get openFirewall => 'Otevřít bránu firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_da.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsDa extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsDa({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsDa({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.da,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.da,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <da>.
   @override
@@ -29,6 +35,9 @@ class TranslationsDa extends Translations {
 
   late final TranslationsDa _root = this; // ignore: unused_field
 
+  @override
+  TranslationsDa $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsDa(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Dansk';
@@ -67,8 +76,6 @@ class TranslationsDa extends Translations {
   @override
   late final _TranslationsChangelogPageDa changelogPage = _TranslationsChangelogPageDa._(_root);
   @override
-  late final _TranslationsAliasGeneratorDa aliasGenerator = _TranslationsAliasGeneratorDa._(_root);
-  @override
   late final _TranslationsDialogsDa dialogs = _TranslationsDialogsDa._(_root);
   @override
   late final _TranslationsSanitizationDa sanitization = _TranslationsSanitizationDa._(_root);
@@ -470,15 +477,6 @@ class _TranslationsChangelogPageDa extends TranslationsChangelogPageEn {
   String get title => 'Ændringsbemærkninger';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorDa extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorDa._(TranslationsDa root) : this._root = root, super.internal(root);
-
-  final TranslationsDa _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsDa extends TranslationsDialogsEn {
   _TranslationsDialogsDa._(TranslationsDa root) : this._root = root, super.internal(root);
@@ -867,7 +865,7 @@ class _TranslationsTroubleshootPageFirewallDa extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Dette er højst sandsynligt et Firewall-problem. Du kan løse det ved at tillade indgående forbindelser (UDP und TCP) på Port ${port}.';
   @override
-  String get openFirewallSettings => 'Åben firewall';
+  String get openFirewall => 'Åben firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_de.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsDe extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsDe({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsDe({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.de,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.de,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <de>.
   @override
@@ -29,6 +35,9 @@ class TranslationsDe extends Translations {
 
   late final TranslationsDe _root = this; // ignore: unused_field
 
+  @override
+  TranslationsDe $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsDe(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Deutsch';
@@ -69,8 +78,6 @@ class TranslationsDe extends Translations {
   @override
   late final _TranslationsChangelogPageDe changelogPage = _TranslationsChangelogPageDe._(_root);
   @override
-  late final _TranslationsAliasGeneratorDe aliasGenerator = _TranslationsAliasGeneratorDe._(_root);
-  @override
   late final _TranslationsDialogsDe dialogs = _TranslationsDialogsDe._(_root);
   @override
   late final _TranslationsSanitizationDe sanitization = _TranslationsSanitizationDe._(_root);
@@ -498,15 +505,6 @@ class _TranslationsChangelogPageDe extends TranslationsChangelogPageEn {
   String get title => 'Änderungsprotokoll';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorDe extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorDe._(TranslationsDe root) : this._root = root, super.internal(root);
-
-  final TranslationsDe _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsDe extends TranslationsDialogsEn {
   _TranslationsDialogsDe._(TranslationsDe root) : this._root = root, super.internal(root);
@@ -920,7 +918,7 @@ class _TranslationsTroubleshootPageFirewallDe extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Dies ist höchstwahrscheinlich ein Firewall-Problem. Du kannst es lösen, indem du eingehende Verbindungen (UDP und TCP) auf Port ${port} zulässt.';
   @override
-  String get openFirewallSettings => 'Firewall öffnen';
+  String get openFirewall => 'Firewall öffnen';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_el.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsEl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsEl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsEl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.el,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.el,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <el>.
   @override
@@ -29,6 +35,9 @@ class TranslationsEl extends Translations {
 
   late final TranslationsEl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsEl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsEl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Ελληνικά';
@@ -996,7 +1005,7 @@ class _TranslationsTroubleshootPageFirewallEl extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Αυτό είναι πιθανότατα ένα ζήτημα του τείχους προστασίας. Μπορείτε να το λύσετε επιτρέποντας τις εισερχόμενες συνδέσεις (UDP και TCP) στη θύρα ${port}.';
   @override
-  String get openFirewallSettings => 'Άνοιγμα Τείχους Προστασίας';
+  String get openFirewall => 'Άνοιγμα Τείχους Προστασίας';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_en_IN.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsEnIn extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsEnIn({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsEnIn({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.enIn,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.enIn,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <en-IN>.
   @override
@@ -29,6 +35,9 @@ class TranslationsEnIn extends Translations {
 
   late final TranslationsEnIn _root = this; // ignore: unused_field
 
+  @override
+  TranslationsEnIn $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsEnIn(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'English(India)';
@@ -989,7 +998,7 @@ class _TranslationsTroubleshootPageFirewallEnIn extends TranslationsTroubleshoot
   String solution({required Object port}) =>
       'This is most likely a firewall issue. You can solve this by allowing incoming connections (UDP and TCP) on port ${port}.';
   @override
-  String get openFirewallSettings => 'Open Firewall Settings';
+  String get openFirewall => 'Open Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_es_ES.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsEsEs extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsEsEs({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsEsEs({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.esEs,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.esEs,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <es-ES>.
   @override
@@ -29,6 +35,9 @@ class TranslationsEsEs extends Translations {
 
   late final TranslationsEsEs _root = this; // ignore: unused_field
 
+  @override
+  TranslationsEsEs $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsEsEs(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Español';
@@ -67,8 +76,6 @@ class TranslationsEsEs extends Translations {
   @override
   late final _TranslationsChangelogPageEsEs changelogPage = _TranslationsChangelogPageEsEs._(_root);
   @override
-  late final _TranslationsAliasGeneratorEsEs aliasGenerator = _TranslationsAliasGeneratorEsEs._(_root);
-  @override
   late final _TranslationsDialogsEsEs dialogs = _TranslationsDialogsEsEs._(_root);
   @override
   late final _TranslationsSanitizationEsEs sanitization = _TranslationsSanitizationEsEs._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPageEsEs extends TranslationsChangelogPageEn {
   String get title => 'Registro de cambios';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorEsEs extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorEsEs._(TranslationsEsEs root) : this._root = root, super.internal(root);
-
-  final TranslationsEsEs _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsEsEs extends TranslationsDialogsEn {
   _TranslationsDialogsEsEs._(TranslationsEsEs root) : this._root = root, super.internal(root);
@@ -916,7 +914,7 @@ class _TranslationsTroubleshootPageFirewallEsEs extends TranslationsTroubleshoot
   String solution({required Object port}) =>
       'Lo más probable es que se trate de un problema con el firewall, puedes solucionarlo permitiendo las conexiones entrantes (UDP y TCP) en el puerto ${port}.';
   @override
-  String get openFirewallSettings => 'Abrir Firewall';
+  String get openFirewall => 'Abrir Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_et.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsEt extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsEt({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsEt({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.et,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.et,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <et>.
   @override
@@ -29,6 +35,9 @@ class TranslationsEt extends Translations {
 
   late final TranslationsEt _root = this; // ignore: unused_field
 
+  @override
+  TranslationsEt $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsEt(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Eesti keel';
@@ -67,8 +76,6 @@ class TranslationsEt extends Translations {
   @override
   late final _TranslationsChangelogPageEt changelogPage = _TranslationsChangelogPageEt._(_root);
   @override
-  late final _TranslationsAliasGeneratorEt aliasGenerator = _TranslationsAliasGeneratorEt._(_root);
-  @override
   late final _TranslationsDialogsEt dialogs = _TranslationsDialogsEt._(_root);
   @override
   late final _TranslationsSanitizationEt sanitization = _TranslationsSanitizationEt._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPageEt extends TranslationsChangelogPageEn {
   String get title => 'Muudatuste logi';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorEt extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorEt._(TranslationsEt root) : this._root = root, super.internal(root);
-
-  final TranslationsEt _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsEt extends TranslationsDialogsEn {
   _TranslationsDialogsEt._(TranslationsEt root) : this._root = root, super.internal(root);
@@ -917,7 +915,7 @@ class _TranslationsTroubleshootPageFirewallEt extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Tõenäoliselt on see seotud tulemüüriga. Olukorra võid lahendada lubades sisenevad (UDP ja TCP) ühendused pordis ${port}.';
   @override
-  String get openFirewallSettings => 'Ava tulemüüri seadistused';
+  String get openFirewall => 'Ava tulemüüri seadistused';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_eu.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsEu extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsEu({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsEu({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.eu,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.eu,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <eu>.
   @override
@@ -29,6 +35,9 @@ class TranslationsEu extends Translations {
 
   late final TranslationsEu _root = this; // ignore: unused_field
 
+  @override
+  TranslationsEu $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsEu(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Euskara';
@@ -65,8 +74,6 @@ class TranslationsEu extends Translations {
   @override
   late final _TranslationsChangelogPageEu changelogPage = _TranslationsChangelogPageEu._(_root);
   @override
-  late final _TranslationsAliasGeneratorEu aliasGenerator = _TranslationsAliasGeneratorEu._(_root);
-  @override
   late final _TranslationsDialogsEu dialogs = _TranslationsDialogsEu._(_root);
   @override
   late final _TranslationsTrayEu tray = _TranslationsTrayEu._(_root);
@@ -419,15 +426,6 @@ class _TranslationsChangelogPageEu extends TranslationsChangelogPageEn {
   String get title => 'Aldaketak';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorEu extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorEu._(TranslationsEu root) : this._root = root, super.internal(root);
-
-  final TranslationsEu _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsEu extends TranslationsDialogsEn {
   _TranslationsDialogsEu._(TranslationsEu root) : this._root = root, super.internal(root);
@@ -742,7 +740,7 @@ class _TranslationsTroubleshootPageFirewallEu extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Suhesiarekin erlazionatutako arazo bat izen liteke. ${port} portura sarrerako konexioak (UDP eta TCP) onartuz konpon dezakezu.';
   @override
-  String get openFirewallSettings => 'Ireki Suhesia';
+  String get openFirewall => 'Ireki Suhesia';
 }
 
 // Path: troubleshootPage.noConnection

app/lib/gen/strings_fa.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsFa extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsFa({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsFa({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.fa,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.fa,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <fa>.
   @override
@@ -29,6 +35,9 @@ class TranslationsFa extends Translations {
 
   late final TranslationsFa _root = this; // ignore: unused_field
 
+  @override
+  TranslationsFa $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsFa(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'فارسی';
@@ -992,7 +1001,7 @@ class _TranslationsTroubleshootPageFirewallFa extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'این مشکل به احتمال زیاد مربوط به تنظیمات فایروال است. شما می‌توانید با دادن مجوز به اتصالات ورودی این مشکل را حل کنید (UDP و TCP) در پورت ${port}';
   @override
-  String get openFirewallSettings => 'بازکردن فایروال';
+  String get openFirewall => 'بازکردن فایروال';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_fi.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsFi extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsFi({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsFi({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.fi,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.fi,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <fi>.
   @override
@@ -29,6 +35,9 @@ class TranslationsFi extends Translations {
 
   late final TranslationsFi _root = this; // ignore: unused_field
 
+  @override
+  TranslationsFi $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsFi(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Finnish';
@@ -966,7 +975,7 @@ class _TranslationsTroubleshootPageFirewallFi extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Tämä on todennäköisesti palomuuriongelma. Voit ratkaista tämän sallimalla saapuvat yhteydet (UDP ja TCP) porttiin ${port}.';
   @override
-  String get openFirewallSettings => 'Avaa palomuuri';
+  String get openFirewall => 'Avaa palomuuri';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_fil_PH.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsFilPh extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsFilPh({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsFilPh({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.filPh,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.filPh,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <fil-PH>.
   @override
@@ -29,6 +35,9 @@ class TranslationsFilPh extends Translations {
 
   late final TranslationsFilPh _root = this; // ignore: unused_field
 
+  @override
+  TranslationsFilPh $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsFilPh(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Filipino';
@@ -994,7 +1003,7 @@ class _TranslationsTroubleshootPageFirewallFilPh extends TranslationsTroubleshoo
   String solution({required Object port}) =>
       'Ito ay kadalasang isyu sa firewall. Maaari mong maayos ito sa pamamagitan nang pag-allow ng mga incoming connections (UDP at TCP) sa port ${port}.';
   @override
-  String get openFirewallSettings => 'Buksan ang Firewall';
+  String get openFirewall => 'Buksan ang Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_fr.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsFr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsFr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsFr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.fr,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.fr,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <fr>.
   @override
@@ -29,6 +35,9 @@ class TranslationsFr extends Translations {
 
   late final TranslationsFr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsFr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsFr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Français';
@@ -67,8 +76,6 @@ class TranslationsFr extends Translations {
   @override
   late final _TranslationsChangelogPageFr changelogPage = _TranslationsChangelogPageFr._(_root);
   @override
-  late final _TranslationsAliasGeneratorFr aliasGenerator = _TranslationsAliasGeneratorFr._(_root);
-  @override
   late final _TranslationsDialogsFr dialogs = _TranslationsDialogsFr._(_root);
   @override
   late final _TranslationsSanitizationFr sanitization = _TranslationsSanitizationFr._(_root);
@@ -479,15 +486,6 @@ class _TranslationsChangelogPageFr extends TranslationsChangelogPageEn {
   String get title => 'Historique des mises à jour';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorFr extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorFr._(TranslationsFr root) : this._root = root, super.internal(root);
-
-  final TranslationsFr _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsFr extends TranslationsDialogsEn {
   _TranslationsDialogsFr._(TranslationsFr root) : this._root = root, super.internal(root);
@@ -921,7 +919,7 @@ class _TranslationsTroubleshootPageFirewallFr extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Il se peut que votre pare-feu bloque la réception de fichiers. Pour corriger ce problème, il est nécessaire d\'autoriser les connections entrantes (UDP et TCP) sur le port ${port}.';
   @override
-  String get openFirewallSettings => 'Ouvrir le pare-feu';
+  String get openFirewall => 'Ouvrir le pare-feu';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_gl.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsGl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsGl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsGl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.gl,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.gl,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <gl>.
   @override
@@ -29,6 +35,9 @@ class TranslationsGl extends Translations {
 
   late final TranslationsGl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsGl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsGl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Inglés';

app/lib/gen/strings_gu.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsGu extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsGu({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsGu({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.gu,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.gu,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <gu>.
   @override
@@ -29,6 +35,9 @@ class TranslationsGu extends Translations {
 
   late final TranslationsGu _root = this; // ignore: unused_field
 
+  @override
+  TranslationsGu $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsGu(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Gujarati';
@@ -904,7 +913,7 @@ class _TranslationsTroubleshootPageFirewallGu extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'આ મોટાભાગે ફાયરવોલનો પ્રશ્ન છે. તમે ${port} પોર્ટ પર આવનારી કનેક્શન્સ (UDP અને TCP) ને મંજૂરી આપીને આ ઉકેલી શકો છો.';
   @override
-  String get openFirewallSettings => 'ફાયરવોલ ખોલો';
+  String get openFirewall => 'ફાયરવોલ ખોલો';
 }
 
 // Path: troubleshootPage.noConnection

app/lib/gen/strings_he.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsHe extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsHe({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsHe({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.he,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.he,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <he>.
   @override
@@ -29,6 +35,9 @@ class TranslationsHe extends Translations {
 
   late final TranslationsHe _root = this; // ignore: unused_field
 
+  @override
+  TranslationsHe $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsHe(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'עברית';
@@ -67,8 +76,6 @@ class TranslationsHe extends Translations {
   @override
   late final _TranslationsChangelogPageHe changelogPage = _TranslationsChangelogPageHe._(_root);
   @override
-  late final _TranslationsAliasGeneratorHe aliasGenerator = _TranslationsAliasGeneratorHe._(_root);
-  @override
   late final _TranslationsDialogsHe dialogs = _TranslationsDialogsHe._(_root);
   @override
   late final _TranslationsSanitizationHe sanitization = _TranslationsSanitizationHe._(_root);
@@ -471,15 +478,6 @@ class _TranslationsChangelogPageHe extends TranslationsChangelogPageEn {
   String get title => 'יומן שינויים';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorHe extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorHe._(TranslationsHe root) : this._root = root, super.internal(root);
-
-  final TranslationsHe _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsHe extends TranslationsDialogsEn {
   _TranslationsDialogsHe._(TranslationsHe root) : this._root = root, super.internal(root);
@@ -912,7 +910,7 @@ class _TranslationsTroubleshootPageFirewallHe extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'כנראה זו בעיה של חומת אש. באפשרותך לפתור את הבעיה על ידי אפשור חיבורים נכנסים (UDP ו-TCP) ביציאה ${port}.';
   @override
-  String get openFirewallSettings => 'פתח את חומת האש';
+  String get openFirewall => 'פתח את חומת האש';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_hi.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsHi extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsHi({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsHi({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.hi,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.hi,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <hi>.
   @override
@@ -29,6 +35,9 @@ class TranslationsHi extends Translations {
 
   late final TranslationsHi _root = this; // ignore: unused_field
 
+  @override
+  TranslationsHi $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsHi(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Hindi';
@@ -993,7 +1002,7 @@ class _TranslationsTroubleshootPageFirewallHi extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'यह संभवतः फ़ायरवॉल समस्या है। आप इसे पोर्ट ${port} पर आने वाले कनेक्शनों (UDP और TCP) को अनुमति देकर हल कर सकते हैं।';
   @override
-  String get openFirewallSettings => 'फायरवॉल खोलें';
+  String get openFirewall => 'फायरवॉल खोलें';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_hu.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsHu extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsHu({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsHu({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.hu,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.hu,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <hu>.
   @override
@@ -29,6 +35,9 @@ class TranslationsHu extends Translations {
 
   late final TranslationsHu _root = this; // ignore: unused_field
 
+  @override
+  TranslationsHu $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsHu(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Magyar';
@@ -67,8 +76,6 @@ class TranslationsHu extends Translations {
   @override
   late final _TranslationsChangelogPageHu changelogPage = _TranslationsChangelogPageHu._(_root);
   @override
-  late final _TranslationsAliasGeneratorHu aliasGenerator = _TranslationsAliasGeneratorHu._(_root);
-  @override
   late final _TranslationsDialogsHu dialogs = _TranslationsDialogsHu._(_root);
   @override
   late final _TranslationsSanitizationHu sanitization = _TranslationsSanitizationHu._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPageHu extends TranslationsChangelogPageEn {
   String get title => 'Változásnapló';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorHu extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorHu._(TranslationsHu root) : this._root = root, super.internal(root);
-
-  final TranslationsHu _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsHu extends TranslationsDialogsEn {
   _TranslationsDialogsHu._(TranslationsHu root) : this._root = root, super.internal(root);
@@ -917,7 +915,7 @@ class _TranslationsTroubleshootPageFirewallHu extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Ez valószínűleg tűzfal probléma. Ezt úgy oldhatja meg, hogy engedélyezi a bejövő kapcsolatokat (UDP és TCP) a ${port} porton.';
   @override
-  String get openFirewallSettings => 'Tűzfal megnyitás';
+  String get openFirewall => 'Tűzfal megnyitás';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_id.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsId extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsId({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsId({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.id,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.id,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <id>.
   @override
@@ -29,6 +35,9 @@ class TranslationsId extends Translations {
 
   late final TranslationsId _root = this; // ignore: unused_field
 
+  @override
+  TranslationsId $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsId(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Indonesian';
@@ -67,8 +76,6 @@ class TranslationsId extends Translations {
   @override
   late final _TranslationsChangelogPageId changelogPage = _TranslationsChangelogPageId._(_root);
   @override
-  late final _TranslationsAliasGeneratorId aliasGenerator = _TranslationsAliasGeneratorId._(_root);
-  @override
   late final _TranslationsDialogsId dialogs = _TranslationsDialogsId._(_root);
   @override
   late final _TranslationsSanitizationId sanitization = _TranslationsSanitizationId._(_root);
@@ -478,15 +485,6 @@ class _TranslationsChangelogPageId extends TranslationsChangelogPageEn {
   String get title => 'Catatan Perubahan';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorId extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorId._(TranslationsId root) : this._root = root, super.internal(root);
-
-  final TranslationsId _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsId extends TranslationsDialogsEn {
   _TranslationsDialogsId._(TranslationsId root) : this._root = root, super.internal(root);
@@ -920,7 +918,7 @@ class _TranslationsTroubleshootPageFirewallId extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Hal ini kemungkinan merupakan masalah tembok api (firewall). Anda dapat memperbaiki masalah ini dengan memperbolehkan koneksi masuk (UDP dan TCP) pada porta ${port}.';
   @override
-  String get openFirewallSettings => 'Buka Tembok Api';
+  String get openFirewall => 'Buka Tembok Api';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_it.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsIt extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsIt({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsIt({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.it,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.it,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <it>.
   @override
@@ -29,6 +35,9 @@ class TranslationsIt extends Translations {
 
   late final TranslationsIt _root = this; // ignore: unused_field
 
+  @override
+  TranslationsIt $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsIt(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Italiano';
@@ -67,8 +76,6 @@ class TranslationsIt extends Translations {
   @override
   late final _TranslationsChangelogPageIt changelogPage = _TranslationsChangelogPageIt._(_root);
   @override
-  late final _TranslationsAliasGeneratorIt aliasGenerator = _TranslationsAliasGeneratorIt._(_root);
-  @override
   late final _TranslationsDialogsIt dialogs = _TranslationsDialogsIt._(_root);
   @override
   late final _TranslationsSanitizationIt sanitization = _TranslationsSanitizationIt._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPageIt extends TranslationsChangelogPageEn {
   String get title => 'Changelog';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorIt extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorIt._(TranslationsIt root) : this._root = root, super.internal(root);
-
-  final TranslationsIt _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsIt extends TranslationsDialogsEn {
   _TranslationsDialogsIt._(TranslationsIt root) : this._root = root, super.internal(root);
@@ -917,7 +915,7 @@ class _TranslationsTroubleshootPageFirewallIt extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'È molto probabile che si tratti di un problema di firewall. Puoi risolverlo consentendo connessioni in entrata (UDP e TCP) sulla porta ${port}.';
   @override
-  String get openFirewallSettings => 'Apri Firewall';
+  String get openFirewall => 'Apri Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ja.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsJa extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsJa({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsJa({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ja,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ja,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ja>.
   @override
@@ -29,6 +35,9 @@ class TranslationsJa extends Translations {
 
   late final TranslationsJa _root = this; // ignore: unused_field
 
+  @override
+  TranslationsJa $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsJa(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => '日本語';
@@ -67,8 +76,6 @@ class TranslationsJa extends Translations {
   @override
   late final _TranslationsChangelogPageJa changelogPage = _TranslationsChangelogPageJa._(_root);
   @override
-  late final _TranslationsAliasGeneratorJa aliasGenerator = _TranslationsAliasGeneratorJa._(_root);
-  @override
   late final _TranslationsDialogsJa dialogs = _TranslationsDialogsJa._(_root);
   @override
   late final _TranslationsSanitizationJa sanitization = _TranslationsSanitizationJa._(_root);
@@ -469,15 +476,6 @@ class _TranslationsChangelogPageJa extends TranslationsChangelogPageEn {
   String get title => '更新履歴';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorJa extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorJa._(TranslationsJa root) : this._root = root, super.internal(root);
-
-  final TranslationsJa _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsJa extends TranslationsDialogsEn {
   _TranslationsDialogsJa._(TranslationsJa root) : this._root = root, super.internal(root);
@@ -883,7 +881,7 @@ class _TranslationsTroubleshootPageFirewallJa extends TranslationsTroubleshootPa
   @override
   String solution({required Object port}) => 'ファイアウォールに問題があると思われます。ポート ${port} の受け入れ (UDPとTCP) を許可することでこの問題を解決できます。';
   @override
-  String get openFirewallSettings => 'ファイアウォールを開く';
+  String get openFirewall => 'ファイアウォールを開く';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_km.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsKm extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsKm({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsKm({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.km,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.km,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <km>.
   @override
@@ -29,6 +35,9 @@ class TranslationsKm extends Translations {
 
   late final TranslationsKm _root = this; // ignore: unused_field
 
+  @override
+  TranslationsKm $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsKm(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'ភាសាខ្មែរ';
@@ -965,7 +974,7 @@ class _TranslationsTroubleshootPageFirewallKm extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'នេះទំនងជាបញ្ហារបស់ Firewall ។ អ្នកអាចដោះស្រាយវាបានដោយអនុញ្ញាតឱ្យមានការតភ្ជាប់ចូល (UDP និង TCP) តាមរយៈច្រក ${port}។';
   @override
-  String get openFirewallSettings => 'បើក Firewall';
+  String get openFirewall => 'បើក Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ko.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsKo extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsKo({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsKo({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ko,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ko,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ko>.
   @override
@@ -29,6 +35,9 @@ class TranslationsKo extends Translations {
 
   late final TranslationsKo _root = this; // ignore: unused_field
 
+  @override
+  TranslationsKo $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsKo(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => '한국어';
@@ -69,8 +78,6 @@ class TranslationsKo extends Translations {
   @override
   late final _TranslationsChangelogPageKo changelogPage = _TranslationsChangelogPageKo._(_root);
   @override
-  late final _TranslationsAliasGeneratorKo aliasGenerator = _TranslationsAliasGeneratorKo._(_root);
-  @override
   late final _TranslationsDialogsKo dialogs = _TranslationsDialogsKo._(_root);
   @override
   late final _TranslationsSanitizationKo sanitization = _TranslationsSanitizationKo._(_root);
@@ -490,15 +497,6 @@ class _TranslationsChangelogPageKo extends TranslationsChangelogPageEn {
   String get title => '변경사항';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorKo extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorKo._(TranslationsKo root) : this._root = root, super.internal(root);
-
-  final TranslationsKo _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsKo extends TranslationsDialogsEn {
   _TranslationsDialogsKo._(TranslationsKo root) : this._root = root, super.internal(root);
@@ -908,7 +906,7 @@ class _TranslationsTroubleshootPageFirewallKo extends TranslationsTroubleshootPa
   @override
   String solution({required Object port}) => '방화벽 설정으로 인한 문제일 가능성이 높습니다. ${port} 포트로 들어오는 연결(UDP 및 TCP)을 허용하여 이 문제를 해결할 수 있습니다.';
   @override
-  String get openFirewallSettings => '방화벽 열기';
+  String get openFirewall => '방화벽 열기';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ml.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsMl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsMl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsMl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ml,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ml,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ml>.
   @override
@@ -29,6 +35,9 @@ class TranslationsMl extends Translations {
 
   late final TranslationsMl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsMl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsMl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   late final _TranslationsGeneralMl general = _TranslationsGeneralMl._(_root);

app/lib/gen/strings_mn.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsMn extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsMn({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsMn({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.mn,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.mn,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <mn>.
   @override
@@ -29,6 +35,9 @@ class TranslationsMn extends Translations {
 
   late final TranslationsMn _root = this; // ignore: unused_field
 
+  @override
+  TranslationsMn $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsMn(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Mongolian';
@@ -66,8 +75,6 @@ class TranslationsMn extends Translations {
   late final _TranslationsDonationPageMn donationPage = _TranslationsDonationPageMn._(_root);
   @override
   late final _TranslationsChangelogPageMn changelogPage = _TranslationsChangelogPageMn._(_root);
-  @override
-  late final _TranslationsAliasGeneratorMn aliasGenerator = _TranslationsAliasGeneratorMn._(_root);
 }
 
 // Path: general
@@ -454,15 +461,6 @@ class _TranslationsChangelogPageMn extends TranslationsChangelogPageEn {
   String get title => 'Шинэчлэлт';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorMn extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorMn._(TranslationsMn root) : this._root = root, super.internal(root);
-
-  final TranslationsMn _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: receiveTab.infoBox
 class _TranslationsReceiveTabInfoBoxMn extends TranslationsReceiveTabInfoBoxEn {
   _TranslationsReceiveTabInfoBoxMn._(TranslationsMn root) : this._root = root, super.internal(root);
@@ -688,7 +686,7 @@ class _TranslationsTroubleshootPageFirewallMn extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Энэ нь ихэвчлэн firewall-н асуудл байдаг. Та ${port} дээр ирж буй холболтыг (UDP ба TCP) зөвшөөрч шийдвэрлэх боломжтой.';
   @override
-  String get openFirewallSettings => 'Firewall-г нээх';
+  String get openFirewall => 'Firewall-г нээх';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ms.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsMs extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsMs({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsMs({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ms,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ms,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ms>.
   @override
@@ -29,6 +35,9 @@ class TranslationsMs extends Translations {
 
   late final TranslationsMs _root = this; // ignore: unused_field
 
+  @override
+  TranslationsMs $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsMs(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Bahasa Melayu';
@@ -932,7 +941,7 @@ class _TranslationsTroubleshootPageFirewallMs extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Ini kemungkinan besar adalah masalah firewall. Anda boleh menyelesaikannya dengan membenarkan sambungan masuk (UDP dan TCP) pada port ${port}.';
   @override
-  String get openFirewallSettings => 'Buka Firewall';
+  String get openFirewall => 'Buka Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ne.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsNe extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsNe({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsNe({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ne,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ne,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ne>.
   @override
@@ -29,6 +35,9 @@ class TranslationsNe extends Translations {
 
   late final TranslationsNe _root = this; // ignore: unused_field
 
+  @override
+  TranslationsNe $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsNe(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'नेपाली';
@@ -990,7 +999,7 @@ class _TranslationsTroubleshootPageFirewallNe extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'यो सम्भवतः फायरवाल समस्या हो। तपाईंले पोर्ट ${port} मा आगमन जडानहरू (UDP र TCP) लाई अनुमति दिएर यो समाधान गर्न सक्नुहुन्छ।';
   @override
-  String get openFirewallSettings => 'फायरवाल खोल्नुहोस्';
+  String get openFirewall => 'फायरवाल खोल्नुहोस्';
 }
 
 // Path: troubleshootPage.noConnection

app/lib/gen/strings_nl.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsNl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsNl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsNl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.nl,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.nl,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <nl>.
   @override
@@ -29,6 +35,9 @@ class TranslationsNl extends Translations {
 
   late final TranslationsNl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsNl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsNl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Nederlands';
@@ -67,8 +76,6 @@ class TranslationsNl extends Translations {
   @override
   late final _TranslationsChangelogPageNl changelogPage = _TranslationsChangelogPageNl._(_root);
   @override
-  late final _TranslationsAliasGeneratorNl aliasGenerator = _TranslationsAliasGeneratorNl._(_root);
-  @override
   late final _TranslationsDialogsNl dialogs = _TranslationsDialogsNl._(_root);
   @override
   late final _TranslationsSanitizationNl sanitization = _TranslationsSanitizationNl._(_root);
@@ -478,15 +485,6 @@ class _TranslationsChangelogPageNl extends TranslationsChangelogPageEn {
   String get title => 'Wijzigingenoverzicht';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorNl extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorNl._(TranslationsNl root) : this._root = root, super.internal(root);
-
-  final TranslationsNl _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsNl extends TranslationsDialogsEn {
   _TranslationsDialogsNl._(TranslationsNl root) : this._root = root, super.internal(root);
@@ -921,7 +919,7 @@ class _TranslationsTroubleshootPageFirewallNl extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Dit is hoogstwaarschijnlijk een firewallprobleem. Je kunt dit oplossen door inkomende verbindingen (UDP en TCP) op poort ${port} toe te staan.';
   @override
-  String get openFirewallSettings => 'Firewall openen';
+  String get openFirewall => 'Firewall openen';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_pl.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsPl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsPl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsPl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.pl,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.pl,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <pl>.
   @override
@@ -29,6 +35,9 @@ class TranslationsPl extends Translations {
 
   late final TranslationsPl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsPl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsPl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Polski';
@@ -67,8 +76,6 @@ class TranslationsPl extends Translations {
   @override
   late final _TranslationsChangelogPagePl changelogPage = _TranslationsChangelogPagePl._(_root);
   @override
-  late final _TranslationsAliasGeneratorPl aliasGenerator = _TranslationsAliasGeneratorPl._(_root);
-  @override
   late final _TranslationsDialogsPl dialogs = _TranslationsDialogsPl._(_root);
   @override
   late final _TranslationsSanitizationPl sanitization = _TranslationsSanitizationPl._(_root);
@@ -475,15 +482,6 @@ class _TranslationsChangelogPagePl extends TranslationsChangelogPageEn {
   String get title => 'Dziennik zmian';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorPl extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorPl._(TranslationsPl root) : this._root = root, super.internal(root);
-
-  final TranslationsPl _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsPl extends TranslationsDialogsEn {
   _TranslationsDialogsPl._(TranslationsPl root) : this._root = root, super.internal(root);
@@ -917,7 +915,7 @@ class _TranslationsTroubleshootPageFirewallPl extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Prawdopodobnie jest to problem z zaporą. Możesz go rozwiązać, zezwalając na przychodzące połączenia (UDP i TCP) na porcie ${port}.';
   @override
-  String get openFirewallSettings => 'Otwórz zaporę';
+  String get openFirewall => 'Otwórz zaporę';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_pt_BR.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsPtBr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsPtBr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsPtBr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ptBr,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ptBr,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <pt-BR>.
   @override
@@ -29,6 +35,9 @@ class TranslationsPtBr extends Translations {
 
   late final TranslationsPtBr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsPtBr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsPtBr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Português (Brasil)';
@@ -982,7 +991,7 @@ class _TranslationsTroubleshootPageFirewallPtBr extends TranslationsTroubleshoot
   String solution({required Object port}) =>
       'Provavelmente isto se trata de um problema de firewall. Você pode resolver esse problema permitindo conexões recebidas (UDP e TCP) na porta ${port}.';
   @override
-  String get openFirewallSettings => 'Abrir o Firewall';
+  String get openFirewall => 'Abrir o Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_pt_PT.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsPtPt extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsPtPt({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsPtPt({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ptPt,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ptPt,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <pt-PT>.
   @override
@@ -29,6 +35,9 @@ class TranslationsPtPt extends Translations {
 
   late final TranslationsPtPt _root = this; // ignore: unused_field
 
+  @override
+  TranslationsPtPt $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsPtPt(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Português (Portugal)';
@@ -910,7 +919,7 @@ class _TranslationsTroubleshootPageFirewallPtPt extends TranslationsTroubleshoot
   String solution({required Object port}) =>
       'Provavelmente isto trata-se de um problema da firewall. Pode resolver este problema ao permitir ligações recebidas (UDP e TCP) na porta ${port}.';
   @override
-  String get openFirewallSettings => 'Abrir a Firewall';
+  String get openFirewall => 'Abrir a Firewall';
 }
 
 // Path: troubleshootPage.noConnection

app/lib/gen/strings_ro.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsRo extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsRo({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsRo({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ro,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ro,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ro>.
   @override
@@ -29,6 +35,9 @@ class TranslationsRo extends Translations {
 
   late final TranslationsRo _root = this; // ignore: unused_field
 
+  @override
+  TranslationsRo $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsRo(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Română';
@@ -992,7 +1001,7 @@ class _TranslationsTroubleshootPageFirewallRo extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Cel mai probabil problema este de la firewall. Poți rezolva această problemă permițând conexiunile de intrare (UDP și TCP) pe portul ${port}.';
   @override
-  String get openFirewallSettings => 'Deschide Firewall';
+  String get openFirewall => 'Deschide Firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ru.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsRu extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsRu({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsRu({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ru,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ru,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ru>.
   @override
@@ -29,6 +35,9 @@ class TranslationsRu extends Translations {
 
   late final TranslationsRu _root = this; // ignore: unused_field
 
+  @override
+  TranslationsRu $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsRu(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Русский';
@@ -67,8 +76,6 @@ class TranslationsRu extends Translations {
   @override
   late final _TranslationsChangelogPageRu changelogPage = _TranslationsChangelogPageRu._(_root);
   @override
-  late final _TranslationsAliasGeneratorRu aliasGenerator = _TranslationsAliasGeneratorRu._(_root);
-  @override
   late final _TranslationsDialogsRu dialogs = _TranslationsDialogsRu._(_root);
   @override
   late final _TranslationsSanitizationRu sanitization = _TranslationsSanitizationRu._(_root);
@@ -478,15 +485,6 @@ class _TranslationsChangelogPageRu extends TranslationsChangelogPageEn {
   String get title => 'История изменений';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorRu extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorRu._(TranslationsRu root) : this._root = root, super.internal(root);
-
-  final TranslationsRu _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsRu extends TranslationsDialogsEn {
   _TranslationsDialogsRu._(TranslationsRu root) : this._root = root, super.internal(root);
@@ -921,7 +919,7 @@ class _TranslationsTroubleshootPageFirewallRu extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Скорее всего, это проблема брандмауэра. Вы можете решить эту проблему, разрешив входящие соединения (UDP и TCP) для порта ${port}.';
   @override
-  String get openFirewallSettings => 'Открыть брандмауэр';
+  String get openFirewall => 'Открыть брандмауэр';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_si.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSi extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSi({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSi({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.si,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.si,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <si>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSi extends Translations {
 
   late final TranslationsSi _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSi $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSi(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'සිංහල';
@@ -67,8 +76,6 @@ class TranslationsSi extends Translations {
   @override
   late final _TranslationsChangelogPageSi changelogPage = _TranslationsChangelogPageSi._(_root);
   @override
-  late final _TranslationsAliasGeneratorSi aliasGenerator = _TranslationsAliasGeneratorSi._(_root);
-  @override
   late final _TranslationsDialogsSi dialogs = _TranslationsDialogsSi._(_root);
   @override
   late final _TranslationsSanitizationSi sanitization = _TranslationsSanitizationSi._(_root);
@@ -474,15 +481,6 @@ class _TranslationsChangelogPageSi extends TranslationsChangelogPageEn {
   String get title => 'වෙනස්කම් ලේඛනය';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorSi extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorSi._(TranslationsSi root) : this._root = root, super.internal(root);
-
-  final TranslationsSi _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsSi extends TranslationsDialogsEn {
   _TranslationsDialogsSi._(TranslationsSi root) : this._root = root, super.internal(root);
@@ -892,7 +890,7 @@ class _TranslationsTroubleshootPageFirewallSi extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'මෙය බොහෝවිට firewall සම්බන්ධ ගැටලුවක් විය හැක. විසඳීමට port ${port} එක සඳහා \'Allow Incoming Connections" (TCP සහ UDP) ලබා දෙන්න.';
   @override
-  String get openFirewallSettings => 'Firewall විවෘත කරන්න';
+  String get openFirewall => 'Firewall විවෘත කරන්න';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_sk.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSk extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSk({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSk({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.sk,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.sk,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <sk>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSk extends Translations {
 
   late final TranslationsSk _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSk $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSk(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Slovenčina';
@@ -990,7 +999,7 @@ class _TranslationsTroubleshootPageFirewallSk extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'S najväčšou pravdepodobnosťou ide o problém brány firewall. Môžete to vyriešiť povolením prichádzajúcich spojení (UDP a TCP) na porte ${port}.';
   @override
-  String get openFirewallSettings => 'Otvoriť firewall';
+  String get openFirewall => 'Otvoriť firewall';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_sl.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.sl,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.sl,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <sl>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSl extends Translations {
 
   late final TranslationsSl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Slovenščina';
@@ -944,7 +953,7 @@ class _TranslationsTroubleshootPageFirewallSl extends TranslationsTroubleshootPa
   @override
   String solution({required Object port}) => 'Verjetno gre za težavo z požarnim zidom. Dovoli dohodne povezave (UDP in TCP) na vrata ${port}.';
   @override
-  String get openFirewallSettings => 'Odpri požarni zid';
+  String get openFirewall => 'Odpri požarni zid';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_sr.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.sr,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.sr,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <sr>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSr extends Translations {
 
   late final TranslationsSr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Srpski (latinica)';
@@ -990,7 +999,7 @@ class _TranslationsTroubleshootPageFirewallSr extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Ovo je najverovatnije problem sa zaštitnim zidom. Ovo možete rešiti tako što ćete dozvoliti dolazne veze (UDP i TCP) na portu ${port}.';
   @override
-  String get openFirewallSettings => 'Otvori zaštitni zid';
+  String get openFirewall => 'Otvori zaštitni zid';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_sr_Cyrl.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSrCyrl extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSrCyrl({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSrCyrl({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.srCyrl,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.srCyrl,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <sr-Cyrl>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSrCyrl extends Translations {
 
   late final TranslationsSrCyrl _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSrCyrl $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSrCyrl(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Српски (ћирилица)';
@@ -995,7 +1004,7 @@ class _TranslationsTroubleshootPageFirewallSrCyrl extends TranslationsTroublesho
   String solution({required Object port}) =>
       'Ово је највероватније проблем са заштитним зидом. Ово можете решити тако што ћете дозволити долазне везе (UDP и TCP) на порту ${port}.';
   @override
-  String get openFirewallSettings => 'Отвори заштитни зид';
+  String get openFirewall => 'Отвори заштитни зид';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_sv.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsSv extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsSv({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsSv({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.sv,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.sv,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <sv>.
   @override
@@ -29,6 +35,9 @@ class TranslationsSv extends Translations {
 
   late final TranslationsSv _root = this; // ignore: unused_field
 
+  @override
+  TranslationsSv $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsSv(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Svenska';
@@ -994,7 +1003,7 @@ class _TranslationsTroubleshootPageFirewallSv extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Detta är troligtvis ett brandväggsproblem. Du kan lösa det genom att tillåta inkommande anslutningar (UDP och TCP) på port ${port}.';
   @override
-  String get openFirewallSettings => 'Öppna brandväggen';
+  String get openFirewall => 'Öppna brandväggen';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ta.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsTa extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsTa({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsTa({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ta,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ta,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ta>.
   @override
@@ -29,6 +35,9 @@ class TranslationsTa extends Translations {
 
   late final TranslationsTa _root = this; // ignore: unused_field
 
+  @override
+  TranslationsTa $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsTa(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'தமிழ்';
@@ -994,7 +1003,7 @@ class _TranslationsTroubleshootPageFirewallTa extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'இது பொதுவாக ஒரு ஃபயர்வால் பிரச்சனை ஆகும். ${port} போர்ட் மீது உள்வரும் இணைப்புகளை (UDP மற்றும் TCP) அனுமதிப்பதன் மூலம் இதை சரி செய்யலாம்.';
   @override
-  String get openFirewallSettings => 'ஃபயர்வால் திறக்கவும்';
+  String get openFirewall => 'ஃபயர்வால் திறக்கவும்';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_th.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsTh extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsTh({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsTh({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.th,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.th,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <th>.
   @override
@@ -29,6 +35,9 @@ class TranslationsTh extends Translations {
 
   late final TranslationsTh _root = this; // ignore: unused_field
 
+  @override
+  TranslationsTh $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsTh(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'ไทย';
@@ -929,7 +938,7 @@ class _TranslationsTroubleshootPageFirewallTh extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'ปัญหานี้อาจมีสาเหตุมาจากการตั้งค่าไฟร์วอลล์ คุณสามารถแก้ไขปัญหานี้ได้ด้วยการอนุญาตการเชื่อมต่อขาเข้า (UDP และ TCP) ผ่านพอร์ตหมายเลข ${port}';
   @override
-  String get openFirewallSettings => 'เปิดไฟร์วอลล์';
+  String get openFirewall => 'เปิดไฟร์วอลล์';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_tr.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsTr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsTr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsTr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.tr,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.tr,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <tr>.
   @override
@@ -29,6 +35,9 @@ class TranslationsTr extends Translations {
 
   late final TranslationsTr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsTr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsTr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Türkçe';
@@ -67,8 +76,6 @@ class TranslationsTr extends Translations {
   @override
   late final _TranslationsChangelogPageTr changelogPage = _TranslationsChangelogPageTr._(_root);
   @override
-  late final _TranslationsAliasGeneratorTr aliasGenerator = _TranslationsAliasGeneratorTr._(_root);
-  @override
   late final _TranslationsDialogsTr dialogs = _TranslationsDialogsTr._(_root);
   @override
   late final _TranslationsSanitizationTr sanitization = _TranslationsSanitizationTr._(_root);
@@ -478,15 +485,6 @@ class _TranslationsChangelogPageTr extends TranslationsChangelogPageEn {
   String get title => 'Değişiklik günlüğü';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorTr extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorTr._(TranslationsTr root) : this._root = root, super.internal(root);
-
-  final TranslationsTr _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsTr extends TranslationsDialogsEn {
   _TranslationsDialogsTr._(TranslationsTr root) : this._root = root, super.internal(root);
@@ -911,7 +909,7 @@ class _TranslationsTroubleshootPageFirewallTr extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Bu büyük olasılıkla bir güvenlik duvarı sorunudur. Port ${port} \'da gelen bağlantılara (UDP ve TCP) izin vererek bunu çözebilirsiniz.';
   @override
-  String get openFirewallSettings => 'Güvenlik Duvarını Aç';
+  String get openFirewall => 'Güvenlik Duvarını Aç';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_uk.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsUk extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsUk({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsUk({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.uk,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.uk,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <uk>.
   @override
@@ -29,6 +35,9 @@ class TranslationsUk extends Translations {
 
   late final TranslationsUk _root = this; // ignore: unused_field
 
+  @override
+  TranslationsUk $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsUk(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Українська';
@@ -67,8 +76,6 @@ class TranslationsUk extends Translations {
   @override
   late final _TranslationsChangelogPageUk changelogPage = _TranslationsChangelogPageUk._(_root);
   @override
-  late final _TranslationsAliasGeneratorUk aliasGenerator = _TranslationsAliasGeneratorUk._(_root);
-  @override
   late final _TranslationsDialogsUk dialogs = _TranslationsDialogsUk._(_root);
   @override
   late final _TranslationsSanitizationUk sanitization = _TranslationsSanitizationUk._(_root);
@@ -478,15 +485,6 @@ class _TranslationsChangelogPageUk extends TranslationsChangelogPageEn {
   String get title => 'Історія змін';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorUk extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorUk._(TranslationsUk root) : this._root = root, super.internal(root);
-
-  final TranslationsUk _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsUk extends TranslationsDialogsEn {
   _TranslationsDialogsUk._(TranslationsUk root) : this._root = root, super.internal(root);
@@ -920,7 +918,7 @@ class _TranslationsTroubleshootPageFirewallUk extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Швидше за все, це проблема брандмауера. Ви можете вирішити дану проблему, дозволивши вхідні з\'єднання (UDP та TCP) для порта: ${port}.';
   @override
-  String get openFirewallSettings => 'Відкрити брандмауер';
+  String get openFirewall => 'Відкрити брандмауер';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_ur.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsUr extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsUr({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsUr({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.ur,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.ur,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <ur>.
   @override
@@ -29,6 +35,9 @@ class TranslationsUr extends Translations {
 
   late final TranslationsUr _root = this; // ignore: unused_field
 
+  @override
+  TranslationsUr $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsUr(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'اردو';
@@ -67,8 +76,6 @@ class TranslationsUr extends Translations {
   @override
   late final _TranslationsChangelogPageUr changelogPage = _TranslationsChangelogPageUr._(_root);
   @override
-  late final _TranslationsAliasGeneratorUr aliasGenerator = _TranslationsAliasGeneratorUr._(_root);
-  @override
   late final _TranslationsDialogsUr dialogs = _TranslationsDialogsUr._(_root);
   @override
   late final _TranslationsSanitizationUr sanitization = _TranslationsSanitizationUr._(_root);
@@ -472,15 +479,6 @@ class _TranslationsChangelogPageUr extends TranslationsChangelogPageEn {
   String get title => 'چینج لاگ';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorUr extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorUr._(TranslationsUr root) : this._root = root, super.internal(root);
-
-  final TranslationsUr _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsUr extends TranslationsDialogsEn {
   _TranslationsDialogsUr._(TranslationsUr root) : this._root = root, super.internal(root);
@@ -863,7 +861,7 @@ class _TranslationsTroubleshootPageFirewallUr extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'یہ ممکنہ طور پر فائر وال کا مسئلہ ہے۔ آپ اسے پورٹ ${port} پر آنے والے کنکشنز (UDP اور TCP) کی اجازت دے کر حل کر سکتے ہیں۔';
   @override
-  String get openFirewallSettings => 'فائر وال کھولیں';
+  String get openFirewall => 'فائر وال کھولیں';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_vi.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsVi extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsVi({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsVi({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.vi,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.vi,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <vi>.
   @override
@@ -29,6 +35,9 @@ class TranslationsVi extends Translations {
 
   late final TranslationsVi _root = this; // ignore: unused_field
 
+  @override
+  TranslationsVi $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsVi(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => 'Tiếng Việt';
@@ -67,8 +76,6 @@ class TranslationsVi extends Translations {
   @override
   late final _TranslationsChangelogPageVi changelogPage = _TranslationsChangelogPageVi._(_root);
   @override
-  late final _TranslationsAliasGeneratorVi aliasGenerator = _TranslationsAliasGeneratorVi._(_root);
-  @override
   late final _TranslationsDialogsVi dialogs = _TranslationsDialogsVi._(_root);
   @override
   late final _TranslationsSanitizationVi sanitization = _TranslationsSanitizationVi._(_root);
@@ -476,15 +483,6 @@ class _TranslationsChangelogPageVi extends TranslationsChangelogPageEn {
   String get title => 'Changelog';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorVi extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorVi._(TranslationsVi root) : this._root = root, super.internal(root);
-
-  final TranslationsVi _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsVi extends TranslationsDialogsEn {
   _TranslationsDialogsVi._(TranslationsVi root) : this._root = root, super.internal(root);
@@ -894,7 +892,7 @@ class _TranslationsTroubleshootPageFirewallVi extends TranslationsTroubleshootPa
   String solution({required Object port}) =>
       'Có vẻ như đây là một vấn đề với tường lửa (firewall). Bạn có thể khắc phục bằng cách chấp thuận các kết nối đến (UDP và TCP) trên port ${port}.';
   @override
-  String get openFirewallSettings => 'Mở tường lửa(Firewall)';
+  String get openFirewall => 'Mở tường lửa(Firewall)';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_zh_CN.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsZhCn extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsZhCn({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsZhCn({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.zhCn,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.zhCn,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <zh-CN>.
   @override
@@ -29,6 +35,9 @@ class TranslationsZhCn extends Translations {
 
   late final TranslationsZhCn _root = this; // ignore: unused_field
 
+  @override
+  TranslationsZhCn $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsZhCn(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => '简体中文';
@@ -979,7 +988,7 @@ class _TranslationsTroubleshootPageFirewallZhCn extends TranslationsTroubleshoot
   @override
   String solution({required Object port}) => '这最可能是由防火墙规则设定引起的。你可以通过在端口 ${port} 上允许（UDP 和 TCP 的）传入请求来解决这个问题。';
   @override
-  String get openFirewallSettings => '打开防火墙';
+  String get openFirewall => '打开防火墙';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_zh_HK.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsZhHk extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsZhHk({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsZhHk({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.zhHk,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.zhHk,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <zh-HK>.
   @override
@@ -29,6 +35,9 @@ class TranslationsZhHk extends Translations {
 
   late final TranslationsZhHk _root = this; // ignore: unused_field
 
+  @override
+  TranslationsZhHk $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsZhHk(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => '繁體中文 (香港)';
@@ -67,8 +76,6 @@ class TranslationsZhHk extends Translations {
   @override
   late final _TranslationsChangelogPageZhHk changelogPage = _TranslationsChangelogPageZhHk._(_root);
   @override
-  late final _TranslationsAliasGeneratorZhHk aliasGenerator = _TranslationsAliasGeneratorZhHk._(_root);
-  @override
   late final _TranslationsDialogsZhHk dialogs = _TranslationsDialogsZhHk._(_root);
   @override
   late final _TranslationsSanitizationZhHk sanitization = _TranslationsSanitizationZhHk._(_root);
@@ -469,15 +476,6 @@ class _TranslationsChangelogPageZhHk extends TranslationsChangelogPageEn {
   String get title => '更新記錄';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorZhHk extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorZhHk._(TranslationsZhHk root) : this._root = root, super.internal(root);
-
-  final TranslationsZhHk _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsZhHk extends TranslationsDialogsEn {
   _TranslationsDialogsZhHk._(TranslationsZhHk root) : this._root = root, super.internal(root);
@@ -882,7 +880,7 @@ class _TranslationsTroubleshootPageFirewallZhHk extends TranslationsTroubleshoot
   @override
   String solution({required Object port}) => '應該係防火牆嘅問題，可以透過允許接受 port ${port} 嘅連線（UDP 同 TCP）嚟解決。';
   @override
-  String get openFirewallSettings => '開啟防火牆設定';
+  String get openFirewall => '開啟防火牆設定';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/gen/strings_zh_TW.g.dart

@@ -13,15 +13,21 @@ import 'strings.g.dart';
 class TranslationsZhTw extends Translations {
   /// You can call this constructor and build your own translation instance of this locale.
   /// Constructing via the enum [AppLocale.build] is preferred.
-  TranslationsZhTw({Map<String, Node>? overrides, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver})
+  TranslationsZhTw({
-    : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
+    Map<String, Node>? overrides,
-      $meta = TranslationMetadata(
+    PluralResolver? cardinalResolver,
-        locale: AppLocale.zhTw,
+    PluralResolver? ordinalResolver,
-        overrides: overrides ?? {},
+    TranslationMetadata<AppLocale, Translations>? meta,
-        cardinalResolver: cardinalResolver,
+  }) : assert(overrides == null, 'Set "translation_overrides: true" in order to enable this feature.'),
-        ordinalResolver: ordinalResolver,
+       $meta =
-      ),
+           meta ??
-      super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
+           TranslationMetadata(
+             locale: AppLocale.zhTw,
+             overrides: overrides ?? {},
+             cardinalResolver: cardinalResolver,
+             ordinalResolver: ordinalResolver,
+           ),
+       super(cardinalResolver: cardinalResolver, ordinalResolver: ordinalResolver);
 
   /// Metadata for the translations of <zh-TW>.
   @override
@@ -29,6 +35,9 @@ class TranslationsZhTw extends Translations {
 
   late final TranslationsZhTw _root = this; // ignore: unused_field
 
+  @override
+  TranslationsZhTw $copyWith({TranslationMetadata<AppLocale, Translations>? meta}) => TranslationsZhTw(meta: meta ?? this.$meta);
+
   // Translations
   @override
   String get locale => '繁體中文 (台灣)';
@@ -67,8 +76,6 @@ class TranslationsZhTw extends Translations {
   @override
   late final _TranslationsChangelogPageZhTw changelogPage = _TranslationsChangelogPageZhTw._(_root);
   @override
-  late final _TranslationsAliasGeneratorZhTw aliasGenerator = _TranslationsAliasGeneratorZhTw._(_root);
-  @override
   late final _TranslationsDialogsZhTw dialogs = _TranslationsDialogsZhTw._(_root);
   @override
   late final _TranslationsSanitizationZhTw sanitization = _TranslationsSanitizationZhTw._(_root);
@@ -470,15 +477,6 @@ class _TranslationsChangelogPageZhTw extends TranslationsChangelogPageEn {
   String get title => '變更記錄';
 }
 
-// Path: aliasGenerator
-class _TranslationsAliasGeneratorZhTw extends TranslationsAliasGeneratorEn {
-  _TranslationsAliasGeneratorZhTw._(TranslationsZhTw root) : this._root = root, super.internal(root);
-
-  final TranslationsZhTw _root; // ignore: unused_field
-
-  // Translations
-}
-
 // Path: dialogs
 class _TranslationsDialogsZhTw extends TranslationsDialogsEn {
   _TranslationsDialogsZhTw._(TranslationsZhTw root) : this._root = root, super.internal(root);
@@ -906,7 +904,7 @@ class _TranslationsTroubleshootPageFirewallZhTw extends TranslationsTroubleshoot
   @override
   String solution({required Object port}) => '這很可能是防火牆問題。您可以透過允許通訊埠 ${port} 上的連入連線 (UDP 和 TCP) 以解決此問題。';
   @override
-  String get openFirewallSettings => '開啟防火牆';
+  String get openFirewall => '開啟防火牆';
 }
 
 // Path: troubleshootPage.noDiscovery

app/lib/model/cross_file.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -24,11 +25,17 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
   static String _$name(CrossFile v) => v.name;
   static const Field<CrossFile, String> _f$name = Field('name', _$name);
   static FileType _$fileType(CrossFile v) => v.fileType;
-  static const Field<CrossFile, FileType> _f$fileType = Field('fileType', _$fileType);
+  static const Field<CrossFile, FileType> _f$fileType = Field(
+    'fileType',
+    _$fileType,
+  );
   static int _$size(CrossFile v) => v.size;
   static const Field<CrossFile, int> _f$size = Field('size', _$size);
   static Uint8List? _$thumbnail(CrossFile v) => v.thumbnail;
-  static const Field<CrossFile, Uint8List> _f$thumbnail = Field('thumbnail', _$thumbnail);
+  static const Field<CrossFile, Uint8List> _f$thumbnail = Field(
+    'thumbnail',
+    _$thumbnail,
+  );
   static AssetEntity? _$asset(CrossFile v) => v.asset;
   static const Field<CrossFile, AssetEntity> _f$asset = Field('asset', _$asset);
   static String? _$path(CrossFile v) => v.path;
@@ -36,9 +43,15 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
   static List<int>? _$bytes(CrossFile v) => v.bytes;
   static const Field<CrossFile, List<int>> _f$bytes = Field('bytes', _$bytes);
   static DateTime? _$lastModified(CrossFile v) => v.lastModified;
-  static const Field<CrossFile, DateTime> _f$lastModified = Field('lastModified', _$lastModified);
+  static const Field<CrossFile, DateTime> _f$lastModified = Field(
+    'lastModified',
+    _$lastModified,
+  );
   static DateTime? _$lastAccessed(CrossFile v) => v.lastAccessed;
-  static const Field<CrossFile, DateTime> _f$lastAccessed = Field('lastAccessed', _$lastAccessed);
+  static const Field<CrossFile, DateTime> _f$lastAccessed = Field(
+    'lastAccessed',
+    _$lastAccessed,
+  );
 
   @override
   final MappableFields<CrossFile> fields = const {
@@ -81,22 +94,36 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
 
 mixin CrossFileMappable {
   String serialize() {
-    return CrossFileMapper.ensureInitialized().encodeJson<CrossFile>(this as CrossFile);
+    return CrossFileMapper.ensureInitialized().encodeJson<CrossFile>(
+      this as CrossFile,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return CrossFileMapper.ensureInitialized().encodeMap<CrossFile>(this as CrossFile);
+    return CrossFileMapper.ensureInitialized().encodeMap<CrossFile>(
+      this as CrossFile,
+    );
   }
 
-  CrossFileCopyWith<CrossFile, CrossFile, CrossFile> get copyWith => _CrossFileCopyWithImpl(this as CrossFile, $identity, $identity);
+  CrossFileCopyWith<CrossFile, CrossFile, CrossFile> get copyWith =>
+      _CrossFileCopyWithImpl<CrossFile, CrossFile>(
+        this as CrossFile,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return CrossFileMapper.ensureInitialized().stringifyValue(this as CrossFile);
+    return CrossFileMapper.ensureInitialized().stringifyValue(
+      this as CrossFile,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return CrossFileMapper.ensureInitialized().equalsValue(this as CrossFile, other);
+    return CrossFileMapper.ensureInitialized().equalsValue(
+      this as CrossFile,
+      other,
+    );
   }
 
   @override
@@ -106,10 +133,12 @@ mixin CrossFileMappable {
 }
 
 extension CrossFileValueCopy<$R, $Out> on ObjectCopyWith<$R, CrossFile, $Out> {
-  CrossFileCopyWith<$R, CrossFile, $Out> get $asCrossFile => $base.as((v, t, t2) => _CrossFileCopyWithImpl(v, t, t2));
+  CrossFileCopyWith<$R, CrossFile, $Out> get $asCrossFile =>
+      $base.as((v, t, t2) => _CrossFileCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class CrossFileCopyWith<$R, $In extends CrossFile, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class CrossFileCopyWith<$R, $In extends CrossFile, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes;
   $R call({
     String? name,
@@ -125,14 +154,23 @@ abstract class CrossFileCopyWith<$R, $In extends CrossFile, $Out> implements Cla
   CrossFileCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _CrossFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, CrossFile, $Out> implements CrossFileCopyWith<$R, CrossFile, $Out> {
+class _CrossFileCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, CrossFile, $Out>
+    implements CrossFileCopyWith<$R, CrossFile, $Out> {
   _CrossFileCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<CrossFile> $mapper = CrossFileMapper.ensureInitialized();
+  late final ClassMapperBase<CrossFile> $mapper =
+      CrossFileMapper.ensureInitialized();
   @override
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes =>
-      $value.bytes != null ? ListCopyWith($value.bytes!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(bytes: v)) : null;
+      $value.bytes != null
+      ? ListCopyWith(
+          $value.bytes!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(bytes: v),
+        )
+      : null;
   @override
   $R call({
     String? name,
@@ -171,5 +209,8 @@ class _CrossFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, CrossFile,
   );
 
   @override
-  CrossFileCopyWith<$R2, CrossFile, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _CrossFileCopyWithImpl($value, $cast, t);
+  CrossFileCopyWith<$R2, CrossFile, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _CrossFileCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/log_entry.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,7 +22,10 @@ class LogEntryMapper extends ClassMapperBase<LogEntry> {
   final String id = 'LogEntry';
 
   static DateTime _$timestamp(LogEntry v) => v.timestamp;
-  static const Field<LogEntry, DateTime> _f$timestamp = Field('timestamp', _$timestamp);
+  static const Field<LogEntry, DateTime> _f$timestamp = Field(
+    'timestamp',
+    _$timestamp,
+  );
   static String _$log(LogEntry v) => v.log;
   static const Field<LogEntry, String> _f$log = Field('log', _$log);
 
@@ -49,14 +53,23 @@ class LogEntryMapper extends ClassMapperBase<LogEntry> {
 
 mixin LogEntryMappable {
   String serialize() {
-    return LogEntryMapper.ensureInitialized().encodeJson<LogEntry>(this as LogEntry);
+    return LogEntryMapper.ensureInitialized().encodeJson<LogEntry>(
+      this as LogEntry,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return LogEntryMapper.ensureInitialized().encodeMap<LogEntry>(this as LogEntry);
+    return LogEntryMapper.ensureInitialized().encodeMap<LogEntry>(
+      this as LogEntry,
+    );
   }
 
-  LogEntryCopyWith<LogEntry, LogEntry, LogEntry> get copyWith => _LogEntryCopyWithImpl(this as LogEntry, $identity, $identity);
+  LogEntryCopyWith<LogEntry, LogEntry, LogEntry> get copyWith =>
+      _LogEntryCopyWithImpl<LogEntry, LogEntry>(
+        this as LogEntry,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
     return LogEntryMapper.ensureInitialized().stringifyValue(this as LogEntry);
@@ -64,7 +77,10 @@ mixin LogEntryMappable {
 
   @override
   bool operator ==(Object other) {
-    return LogEntryMapper.ensureInitialized().equalsValue(this as LogEntry, other);
+    return LogEntryMapper.ensureInitialized().equalsValue(
+      this as LogEntry,
+      other,
+    );
   }
 
   @override
@@ -74,22 +90,31 @@ mixin LogEntryMappable {
 }
 
 extension LogEntryValueCopy<$R, $Out> on ObjectCopyWith<$R, LogEntry, $Out> {
-  LogEntryCopyWith<$R, LogEntry, $Out> get $asLogEntry => $base.as((v, t, t2) => _LogEntryCopyWithImpl(v, t, t2));
+  LogEntryCopyWith<$R, LogEntry, $Out> get $asLogEntry =>
+      $base.as((v, t, t2) => _LogEntryCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class LogEntryCopyWith<$R, $In extends LogEntry, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class LogEntryCopyWith<$R, $In extends LogEntry, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   $R call({DateTime? timestamp, String? log});
   LogEntryCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _LogEntryCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, LogEntry, $Out> implements LogEntryCopyWith<$R, LogEntry, $Out> {
+class _LogEntryCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, LogEntry, $Out>
+    implements LogEntryCopyWith<$R, LogEntry, $Out> {
   _LogEntryCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<LogEntry> $mapper = LogEntryMapper.ensureInitialized();
+  late final ClassMapperBase<LogEntry> $mapper =
+      LogEntryMapper.ensureInitialized();
   @override
-  $R call({DateTime? timestamp, String? log}) =>
+  $R call({DateTime? timestamp, String? log}) => $apply(
-      $apply(FieldCopyWithData({if (timestamp != null) #timestamp: timestamp, if (log != null) #log: log}));
+    FieldCopyWithData({
+      if (timestamp != null) #timestamp: timestamp,
+      if (log != null) #log: log,
+    }),
+  );
   @override
   LogEntry $make(CopyWithData data) => LogEntry(
     timestamp: data.get(#timestamp, or: $value.timestamp),
@@ -97,5 +122,8 @@ class _LogEntryCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, LogEntry, $O
   );
 
   @override
-  LogEntryCopyWith<$R2, LogEntry, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _LogEntryCopyWithImpl($value, $cast, t);
+  LogEntryCopyWith<$R2, LogEntry, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _LogEntryCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/persistence/favorite_device.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,7 +24,10 @@ class FavoriteDeviceMapper extends ClassMapperBase<FavoriteDevice> {
   static String _$id(FavoriteDevice v) => v.id;
   static const Field<FavoriteDevice, String> _f$id = Field('id', _$id);
   static String _$fingerprint(FavoriteDevice v) => v.fingerprint;
-  static const Field<FavoriteDevice, String> _f$fingerprint = Field('fingerprint', _$fingerprint);
+  static const Field<FavoriteDevice, String> _f$fingerprint = Field(
+    'fingerprint',
+    _$fingerprint,
+  );
   static String _$ip(FavoriteDevice v) => v.ip;
   static const Field<FavoriteDevice, String> _f$ip = Field('ip', _$ip);
   static int _$port(FavoriteDevice v) => v.port;
@@ -31,7 +35,12 @@ class FavoriteDeviceMapper extends ClassMapperBase<FavoriteDevice> {
   static String _$alias(FavoriteDevice v) => v.alias;
   static const Field<FavoriteDevice, String> _f$alias = Field('alias', _$alias);
   static bool _$customAlias(FavoriteDevice v) => v.customAlias;
-  static const Field<FavoriteDevice, bool> _f$customAlias = Field('customAlias', _$customAlias, opt: true, def: false);
+  static const Field<FavoriteDevice, bool> _f$customAlias = Field(
+    'customAlias',
+    _$customAlias,
+    opt: true,
+    def: false,
+  );
 
   @override
   final MappableFields<FavoriteDevice> fields = const {
@@ -68,48 +77,84 @@ class FavoriteDeviceMapper extends ClassMapperBase<FavoriteDevice> {
 
 mixin FavoriteDeviceMappable {
   String serialize() {
-    return FavoriteDeviceMapper.ensureInitialized().encodeJson<FavoriteDevice>(this as FavoriteDevice);
+    return FavoriteDeviceMapper.ensureInitialized().encodeJson<FavoriteDevice>(
+      this as FavoriteDevice,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return FavoriteDeviceMapper.ensureInitialized().encodeMap<FavoriteDevice>(this as FavoriteDevice);
+    return FavoriteDeviceMapper.ensureInitialized().encodeMap<FavoriteDevice>(
+      this as FavoriteDevice,
+    );
   }
 
-  FavoriteDeviceCopyWith<FavoriteDevice, FavoriteDevice, FavoriteDevice> get copyWith =>
+  FavoriteDeviceCopyWith<FavoriteDevice, FavoriteDevice, FavoriteDevice>
-      _FavoriteDeviceCopyWithImpl(this as FavoriteDevice, $identity, $identity);
+  get copyWith => _FavoriteDeviceCopyWithImpl<FavoriteDevice, FavoriteDevice>(
+    this as FavoriteDevice,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return FavoriteDeviceMapper.ensureInitialized().stringifyValue(this as FavoriteDevice);
+    return FavoriteDeviceMapper.ensureInitialized().stringifyValue(
+      this as FavoriteDevice,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return FavoriteDeviceMapper.ensureInitialized().equalsValue(this as FavoriteDevice, other);
+    return FavoriteDeviceMapper.ensureInitialized().equalsValue(
+      this as FavoriteDevice,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return FavoriteDeviceMapper.ensureInitialized().hashValue(this as FavoriteDevice);
+    return FavoriteDeviceMapper.ensureInitialized().hashValue(
+      this as FavoriteDevice,
+    );
   }
 }
 
-extension FavoriteDeviceValueCopy<$R, $Out> on ObjectCopyWith<$R, FavoriteDevice, $Out> {
+extension FavoriteDeviceValueCopy<$R, $Out>
-  FavoriteDeviceCopyWith<$R, FavoriteDevice, $Out> get $asFavoriteDevice => $base.as((v, t, t2) => _FavoriteDeviceCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, FavoriteDevice, $Out> {
+  FavoriteDeviceCopyWith<$R, FavoriteDevice, $Out> get $asFavoriteDevice =>
+      $base.as((v, t, t2) => _FavoriteDeviceCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class FavoriteDeviceCopyWith<$R, $In extends FavoriteDevice, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class FavoriteDeviceCopyWith<$R, $In extends FavoriteDevice, $Out>
-  $R call({String? id, String? fingerprint, String? ip, int? port, String? alias, bool? customAlias});
+    implements ClassCopyWith<$R, $In, $Out> {
-  FavoriteDeviceCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  $R call({
+    String? id,
+    String? fingerprint,
+    String? ip,
+    int? port,
+    String? alias,
+    bool? customAlias,
+  });
+  FavoriteDeviceCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _FavoriteDeviceCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, FavoriteDevice, $Out>
+class _FavoriteDeviceCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, FavoriteDevice, $Out>
     implements FavoriteDeviceCopyWith<$R, FavoriteDevice, $Out> {
   _FavoriteDeviceCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<FavoriteDevice> $mapper = FavoriteDeviceMapper.ensureInitialized();
+  late final ClassMapperBase<FavoriteDevice> $mapper =
+      FavoriteDeviceMapper.ensureInitialized();
   @override
-  $R call({String? id, String? fingerprint, String? ip, int? port, String? alias, bool? customAlias}) => $apply(
+  $R call({
+    String? id,
+    String? fingerprint,
+    String? ip,
+    int? port,
+    String? alias,
+    bool? customAlias,
+  }) => $apply(
     FieldCopyWithData({
       if (id != null) #id: id,
       if (fingerprint != null) #fingerprint: fingerprint,
@@ -130,5 +175,8 @@ class _FavoriteDeviceCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Favori
   );
 
   @override
-  FavoriteDeviceCopyWith<$R2, FavoriteDevice, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _FavoriteDeviceCopyWithImpl($value, $cast, t);
+  FavoriteDeviceCopyWith<$R2, FavoriteDevice, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _FavoriteDeviceCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/persistence/receive_history_entry.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -24,21 +25,52 @@ class ReceiveHistoryEntryMapper extends ClassMapperBase<ReceiveHistoryEntry> {
   static String _$id(ReceiveHistoryEntry v) => v.id;
   static const Field<ReceiveHistoryEntry, String> _f$id = Field('id', _$id);
   static String _$fileName(ReceiveHistoryEntry v) => v.fileName;
-  static const Field<ReceiveHistoryEntry, String> _f$fileName = Field('fileName', _$fileName);
+  static const Field<ReceiveHistoryEntry, String> _f$fileName = Field(
+    'fileName',
+    _$fileName,
+  );
   static FileType _$fileType(ReceiveHistoryEntry v) => v.fileType;
-  static const Field<ReceiveHistoryEntry, FileType> _f$fileType = Field('fileType', _$fileType);
+  static const Field<ReceiveHistoryEntry, FileType> _f$fileType = Field(
+    'fileType',
+    _$fileType,
+  );
   static String? _$path(ReceiveHistoryEntry v) => v.path;
-  static const Field<ReceiveHistoryEntry, String> _f$path = Field('path', _$path);
+  static const Field<ReceiveHistoryEntry, String> _f$path = Field(
+    'path',
+    _$path,
+  );
   static bool _$savedToGallery(ReceiveHistoryEntry v) => v.savedToGallery;
-  static const Field<ReceiveHistoryEntry, bool> _f$savedToGallery = Field('savedToGallery', _$savedToGallery);
+  static const Field<ReceiveHistoryEntry, bool> _f$savedToGallery = Field(
+    'savedToGallery',
+    _$savedToGallery,
+  );
   static bool _$isMessage(ReceiveHistoryEntry v) => v.isMessage;
-  static const Field<ReceiveHistoryEntry, bool> _f$isMessage = Field('isMessage', _$isMessage, hook: IsMessageHook());
+  static const Field<ReceiveHistoryEntry, bool> _f$isMessage = Field(
+    'isMessage',
+    _$isMessage,
+    hook: IsMessageHook(),
+  );
   static int _$fileSize(ReceiveHistoryEntry v) => v.fileSize;
-  static const Field<ReceiveHistoryEntry, int> _f$fileSize = Field('fileSize', _$fileSize);
+  static const Field<ReceiveHistoryEntry, int> _f$fileSize = Field(
+    'fileSize',
+    _$fileSize,
+  );
   static String _$senderAlias(ReceiveHistoryEntry v) => v.senderAlias;
-  static const Field<ReceiveHistoryEntry, String> _f$senderAlias = Field('senderAlias', _$senderAlias);
+  static const Field<ReceiveHistoryEntry, String> _f$senderAlias = Field(
+    'senderAlias',
+    _$senderAlias,
+  );
   static DateTime _$timestamp(ReceiveHistoryEntry v) => v.timestamp;
-  static const Field<ReceiveHistoryEntry, DateTime> _f$timestamp = Field('timestamp', _$timestamp);
+  static const Field<ReceiveHistoryEntry, DateTime> _f$timestamp = Field(
+    'timestamp',
+    _$timestamp,
+  );
+  static String _$timestampString(ReceiveHistoryEntry v) => v.timestampString;
+  static const Field<ReceiveHistoryEntry, String> _f$timestampString = Field(
+    'timestampString',
+    _$timestampString,
+    mode: FieldMode.member,
+  );
 
   @override
   final MappableFields<ReceiveHistoryEntry> fields = const {
@@ -51,6 +83,7 @@ class ReceiveHistoryEntryMapper extends ClassMapperBase<ReceiveHistoryEntry> {
     #fileSize: _f$fileSize,
     #senderAlias: _f$senderAlias,
     #timestamp: _f$timestamp,
+    #timestampString: _f$timestampString,
   };
 
   static ReceiveHistoryEntry _instantiate(DecodingData data) {
@@ -81,37 +114,62 @@ class ReceiveHistoryEntryMapper extends ClassMapperBase<ReceiveHistoryEntry> {
 
 mixin ReceiveHistoryEntryMappable {
   String serialize() {
-    return ReceiveHistoryEntryMapper.ensureInitialized().encodeJson<ReceiveHistoryEntry>(this as ReceiveHistoryEntry);
+    return ReceiveHistoryEntryMapper.ensureInitialized()
+        .encodeJson<ReceiveHistoryEntry>(this as ReceiveHistoryEntry);
   }
 
   Map<String, dynamic> toJson() {
-    return ReceiveHistoryEntryMapper.ensureInitialized().encodeMap<ReceiveHistoryEntry>(this as ReceiveHistoryEntry);
+    return ReceiveHistoryEntryMapper.ensureInitialized()
+        .encodeMap<ReceiveHistoryEntry>(this as ReceiveHistoryEntry);
   }
 
-  ReceiveHistoryEntryCopyWith<ReceiveHistoryEntry, ReceiveHistoryEntry, ReceiveHistoryEntry> get copyWith =>
+  ReceiveHistoryEntryCopyWith<
-      _ReceiveHistoryEntryCopyWithImpl(this as ReceiveHistoryEntry, $identity, $identity);
+    ReceiveHistoryEntry,
+    ReceiveHistoryEntry,
+    ReceiveHistoryEntry
+  >
+  get copyWith =>
+      _ReceiveHistoryEntryCopyWithImpl<
+        ReceiveHistoryEntry,
+        ReceiveHistoryEntry
+      >(this as ReceiveHistoryEntry, $identity, $identity);
   @override
   String toString() {
-    return ReceiveHistoryEntryMapper.ensureInitialized().stringifyValue(this as ReceiveHistoryEntry);
+    return ReceiveHistoryEntryMapper.ensureInitialized().stringifyValue(
+      this as ReceiveHistoryEntry,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return ReceiveHistoryEntryMapper.ensureInitialized().equalsValue(this as ReceiveHistoryEntry, other);
+    return ReceiveHistoryEntryMapper.ensureInitialized().equalsValue(
+      this as ReceiveHistoryEntry,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return ReceiveHistoryEntryMapper.ensureInitialized().hashValue(this as ReceiveHistoryEntry);
+    return ReceiveHistoryEntryMapper.ensureInitialized().hashValue(
+      this as ReceiveHistoryEntry,
+    );
   }
 }
 
-extension ReceiveHistoryEntryValueCopy<$R, $Out> on ObjectCopyWith<$R, ReceiveHistoryEntry, $Out> {
+extension ReceiveHistoryEntryValueCopy<$R, $Out>
-  ReceiveHistoryEntryCopyWith<$R, ReceiveHistoryEntry, $Out> get $asReceiveHistoryEntry =>
+    on ObjectCopyWith<$R, ReceiveHistoryEntry, $Out> {
-      $base.as((v, t, t2) => _ReceiveHistoryEntryCopyWithImpl(v, t, t2));
+  ReceiveHistoryEntryCopyWith<$R, ReceiveHistoryEntry, $Out>
+  get $asReceiveHistoryEntry => $base.as(
+    (v, t, t2) => _ReceiveHistoryEntryCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class ReceiveHistoryEntryCopyWith<$R, $In extends ReceiveHistoryEntry, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class ReceiveHistoryEntryCopyWith<
+  $R,
+  $In extends ReceiveHistoryEntry,
+  $Out
+>
+    implements ClassCopyWith<$R, $In, $Out> {
   $R call({
     String? id,
     String? fileName,
@@ -123,15 +181,19 @@ abstract class ReceiveHistoryEntryCopyWith<$R, $In extends ReceiveHistoryEntry,
     String? senderAlias,
     DateTime? timestamp,
   });
-  ReceiveHistoryEntryCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  ReceiveHistoryEntryCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _ReceiveHistoryEntryCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ReceiveHistoryEntry, $Out>
+class _ReceiveHistoryEntryCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ReceiveHistoryEntry, $Out>
     implements ReceiveHistoryEntryCopyWith<$R, ReceiveHistoryEntry, $Out> {
   _ReceiveHistoryEntryCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<ReceiveHistoryEntry> $mapper = ReceiveHistoryEntryMapper.ensureInitialized();
+  late final ClassMapperBase<ReceiveHistoryEntry> $mapper =
+      ReceiveHistoryEntryMapper.ensureInitialized();
   @override
   $R call({
     String? id,
@@ -170,6 +232,8 @@ class _ReceiveHistoryEntryCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, R
   );
 
   @override
-  ReceiveHistoryEntryCopyWith<$R2, ReceiveHistoryEntry, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  ReceiveHistoryEntryCopyWith<$R2, ReceiveHistoryEntry, $Out2>
-      _ReceiveHistoryEntryCopyWithImpl($value, $cast, t);
+  $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+      _ReceiveHistoryEntryCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/nearby_devices_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,14 +22,27 @@ class NearbyDevicesStateMapper extends ClassMapperBase<NearbyDevicesState> {
   @override
   final String id = 'NearbyDevicesState';
 
-  static bool _$runningFavoriteScan(NearbyDevicesState v) => v.runningFavoriteScan;
+  static bool _$runningFavoriteScan(NearbyDevicesState v) =>
-  static const Field<NearbyDevicesState, bool> _f$runningFavoriteScan = Field('runningFavoriteScan', _$runningFavoriteScan);
+      v.runningFavoriteScan;
+  static const Field<NearbyDevicesState, bool> _f$runningFavoriteScan = Field(
+    'runningFavoriteScan',
+    _$runningFavoriteScan,
+  );
   static Set<String> _$runningIps(NearbyDevicesState v) => v.runningIps;
-  static const Field<NearbyDevicesState, Set<String>> _f$runningIps = Field('runningIps', _$runningIps);
+  static const Field<NearbyDevicesState, Set<String>> _f$runningIps = Field(
+    'runningIps',
+    _$runningIps,
+  );
   static Map<String, Device> _$devices(NearbyDevicesState v) => v.devices;
-  static const Field<NearbyDevicesState, Map<String, Device>> _f$devices = Field('devices', _$devices);
+  static const Field<NearbyDevicesState, Map<String, Device>> _f$devices =
-  static Map<String, Set<Device>> _$signalingDevices(NearbyDevicesState v) => v.signalingDevices;
+      Field('devices', _$devices);
-  static const Field<NearbyDevicesState, Map<String, Set<Device>>> _f$signalingDevices = Field('signalingDevices', _$signalingDevices);
+  static Map<String, Set<Device>> _$signalingDevices(NearbyDevicesState v) =>
+      v.signalingDevices;
+  static const Field<NearbyDevicesState, Map<String, Set<Device>>>
+  _f$signalingDevices = Field('signalingDevices', _$signalingDevices);
+  static Map<String, Device> _$allDevices(NearbyDevicesState v) => v.allDevices;
+  static const Field<NearbyDevicesState, Map<String, Device>> _f$allDevices =
+      Field('allDevices', _$allDevices, mode: FieldMode.member);
 
   @override
   final MappableFields<NearbyDevicesState> fields = const {
@@ -36,6 +50,7 @@ class NearbyDevicesStateMapper extends ClassMapperBase<NearbyDevicesState> {
     #runningIps: _f$runningIps,
     #devices: _f$devices,
     #signalingDevices: _f$signalingDevices,
+    #allDevices: _f$allDevices,
   };
 
   static NearbyDevicesState _instantiate(DecodingData data) {
@@ -61,59 +76,120 @@ class NearbyDevicesStateMapper extends ClassMapperBase<NearbyDevicesState> {
 
 mixin NearbyDevicesStateMappable {
   String serialize() {
-    return NearbyDevicesStateMapper.ensureInitialized().encodeJson<NearbyDevicesState>(this as NearbyDevicesState);
+    return NearbyDevicesStateMapper.ensureInitialized()
+        .encodeJson<NearbyDevicesState>(this as NearbyDevicesState);
   }
 
   Map<String, dynamic> toJson() {
-    return NearbyDevicesStateMapper.ensureInitialized().encodeMap<NearbyDevicesState>(this as NearbyDevicesState);
+    return NearbyDevicesStateMapper.ensureInitialized()
+        .encodeMap<NearbyDevicesState>(this as NearbyDevicesState);
   }
 
-  NearbyDevicesStateCopyWith<NearbyDevicesState, NearbyDevicesState, NearbyDevicesState> get copyWith =>
+  NearbyDevicesStateCopyWith<
-      _NearbyDevicesStateCopyWithImpl(this as NearbyDevicesState, $identity, $identity);
+    NearbyDevicesState,
+    NearbyDevicesState,
+    NearbyDevicesState
+  >
+  get copyWith =>
+      _NearbyDevicesStateCopyWithImpl<NearbyDevicesState, NearbyDevicesState>(
+        this as NearbyDevicesState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return NearbyDevicesStateMapper.ensureInitialized().stringifyValue(this as NearbyDevicesState);
+    return NearbyDevicesStateMapper.ensureInitialized().stringifyValue(
+      this as NearbyDevicesState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return NearbyDevicesStateMapper.ensureInitialized().equalsValue(this as NearbyDevicesState, other);
+    return NearbyDevicesStateMapper.ensureInitialized().equalsValue(
+      this as NearbyDevicesState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return NearbyDevicesStateMapper.ensureInitialized().hashValue(this as NearbyDevicesState);
+    return NearbyDevicesStateMapper.ensureInitialized().hashValue(
+      this as NearbyDevicesState,
+    );
   }
 }
 
-extension NearbyDevicesStateValueCopy<$R, $Out> on ObjectCopyWith<$R, NearbyDevicesState, $Out> {
+extension NearbyDevicesStateValueCopy<$R, $Out>
-  NearbyDevicesStateCopyWith<$R, NearbyDevicesState, $Out> get $asNearbyDevicesState =>
+    on ObjectCopyWith<$R, NearbyDevicesState, $Out> {
-      $base.as((v, t, t2) => _NearbyDevicesStateCopyWithImpl(v, t, t2));
+  NearbyDevicesStateCopyWith<$R, NearbyDevicesState, $Out>
+  get $asNearbyDevicesState => $base.as(
+    (v, t, t2) => _NearbyDevicesStateCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class NearbyDevicesStateCopyWith<$R, $In extends NearbyDevicesState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class NearbyDevicesStateCopyWith<
-  MapCopyWith<$R, String, Device, DeviceCopyWith<$R, Device, Device>> get devices;
+  $R,
-  MapCopyWith<$R, String, Set<Device>, ObjectCopyWith<$R, Set<Device>, Set<Device>>> get signalingDevices;
+  $In extends NearbyDevicesState,
-  $R call({bool? runningFavoriteScan, Set<String>? runningIps, Map<String, Device>? devices, Map<String, Set<Device>>? signalingDevices});
+  $Out
-  NearbyDevicesStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+>
+    implements ClassCopyWith<$R, $In, $Out> {
+  MapCopyWith<$R, String, Device, DeviceCopyWith<$R, Device, Device>>
+  get devices;
+  MapCopyWith<
+    $R,
+    String,
+    Set<Device>,
+    ObjectCopyWith<$R, Set<Device>, Set<Device>>
+  >
+  get signalingDevices;
+  $R call({
+    bool? runningFavoriteScan,
+    Set<String>? runningIps,
+    Map<String, Device>? devices,
+    Map<String, Set<Device>>? signalingDevices,
+  });
+  NearbyDevicesStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _NearbyDevicesStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, NearbyDevicesState, $Out>
+class _NearbyDevicesStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, NearbyDevicesState, $Out>
     implements NearbyDevicesStateCopyWith<$R, NearbyDevicesState, $Out> {
   _NearbyDevicesStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<NearbyDevicesState> $mapper = NearbyDevicesStateMapper.ensureInitialized();
+  late final ClassMapperBase<NearbyDevicesState> $mapper =
+      NearbyDevicesStateMapper.ensureInitialized();
   @override
-  MapCopyWith<$R, String, Device, DeviceCopyWith<$R, Device, Device>> get devices =>
+  MapCopyWith<$R, String, Device, DeviceCopyWith<$R, Device, Device>>
-      MapCopyWith($value.devices, (v, t) => v.copyWith.$chain(t), (v) => call(devices: v));
+  get devices => MapCopyWith(
+    $value.devices,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(devices: v),
+  );
   @override
-  MapCopyWith<$R, String, Set<Device>, ObjectCopyWith<$R, Set<Device>, Set<Device>>> get signalingDevices =>
+  MapCopyWith<
-      MapCopyWith($value.signalingDevices, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(signalingDevices: v));
+    $R,
+    String,
+    Set<Device>,
+    ObjectCopyWith<$R, Set<Device>, Set<Device>>
+  >
+  get signalingDevices => MapCopyWith(
+    $value.signalingDevices,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(signalingDevices: v),
+  );
   @override
-  $R call({bool? runningFavoriteScan, Set<String>? runningIps, Map<String, Device>? devices, Map<String, Set<Device>>? signalingDevices}) => $apply(
+  $R call({
+    bool? runningFavoriteScan,
+    Set<String>? runningIps,
+    Map<String, Device>? devices,
+    Map<String, Set<Device>>? signalingDevices,
+  }) => $apply(
     FieldCopyWithData({
-      if (runningFavoriteScan != null) #runningFavoriteScan: runningFavoriteScan,
+      if (runningFavoriteScan != null)
+        #runningFavoriteScan: runningFavoriteScan,
       if (runningIps != null) #runningIps: runningIps,
       if (devices != null) #devices: devices,
       if (signalingDevices != null) #signalingDevices: signalingDevices,
@@ -121,13 +197,18 @@ class _NearbyDevicesStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Ne
   );
   @override
   NearbyDevicesState $make(CopyWithData data) => NearbyDevicesState(
-    runningFavoriteScan: data.get(#runningFavoriteScan, or: $value.runningFavoriteScan),
+    runningFavoriteScan: data.get(
+      #runningFavoriteScan,
+      or: $value.runningFavoriteScan,
+    ),
     runningIps: data.get(#runningIps, or: $value.runningIps),
     devices: data.get(#devices, or: $value.devices),
     signalingDevices: data.get(#signalingDevices, or: $value.signalingDevices),
   );
 
   @override
-  NearbyDevicesStateCopyWith<$R2, NearbyDevicesState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  NearbyDevicesStateCopyWith<$R2, NearbyDevicesState, $Out2> $chain<$R2, $Out2>(
-      _NearbyDevicesStateCopyWithImpl($value, $cast, t);
+    Then<$Out2, $R2> t,
+  ) => _NearbyDevicesStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/network_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,9 +22,15 @@ class NetworkStateMapper extends ClassMapperBase<NetworkState> {
   final String id = 'NetworkState';
 
   static List<String> _$localIps(NetworkState v) => v.localIps;
-  static const Field<NetworkState, List<String>> _f$localIps = Field('localIps', _$localIps);
+  static const Field<NetworkState, List<String>> _f$localIps = Field(
+    'localIps',
+    _$localIps,
+  );
   static bool _$initialized(NetworkState v) => v.initialized;
-  static const Field<NetworkState, bool> _f$initialized = Field('initialized', _$initialized);
+  static const Field<NetworkState, bool> _f$initialized = Field(
+    'initialized',
+    _$initialized,
+  );
 
   @override
   final MappableFields<NetworkState> fields = const {
@@ -32,7 +39,10 @@ class NetworkStateMapper extends ClassMapperBase<NetworkState> {
   };
 
   static NetworkState _instantiate(DecodingData data) {
-    return NetworkState(localIps: data.dec(_f$localIps), initialized: data.dec(_f$initialized));
+    return NetworkState(
+      localIps: data.dec(_f$localIps),
+      initialized: data.dec(_f$initialized),
+    );
   }
 
   @override
@@ -49,52 +59,81 @@ class NetworkStateMapper extends ClassMapperBase<NetworkState> {
 
 mixin NetworkStateMappable {
   String serialize() {
-    return NetworkStateMapper.ensureInitialized().encodeJson<NetworkState>(this as NetworkState);
+    return NetworkStateMapper.ensureInitialized().encodeJson<NetworkState>(
+      this as NetworkState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return NetworkStateMapper.ensureInitialized().encodeMap<NetworkState>(this as NetworkState);
+    return NetworkStateMapper.ensureInitialized().encodeMap<NetworkState>(
+      this as NetworkState,
+    );
   }
 
   NetworkStateCopyWith<NetworkState, NetworkState, NetworkState> get copyWith =>
-      _NetworkStateCopyWithImpl(this as NetworkState, $identity, $identity);
+      _NetworkStateCopyWithImpl<NetworkState, NetworkState>(
+        this as NetworkState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return NetworkStateMapper.ensureInitialized().stringifyValue(this as NetworkState);
+    return NetworkStateMapper.ensureInitialized().stringifyValue(
+      this as NetworkState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return NetworkStateMapper.ensureInitialized().equalsValue(this as NetworkState, other);
+    return NetworkStateMapper.ensureInitialized().equalsValue(
+      this as NetworkState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return NetworkStateMapper.ensureInitialized().hashValue(this as NetworkState);
+    return NetworkStateMapper.ensureInitialized().hashValue(
+      this as NetworkState,
+    );
   }
 }
 
-extension NetworkStateValueCopy<$R, $Out> on ObjectCopyWith<$R, NetworkState, $Out> {
+extension NetworkStateValueCopy<$R, $Out>
-  NetworkStateCopyWith<$R, NetworkState, $Out> get $asNetworkState => $base.as((v, t, t2) => _NetworkStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, NetworkState, $Out> {
+  NetworkStateCopyWith<$R, NetworkState, $Out> get $asNetworkState =>
+      $base.as((v, t, t2) => _NetworkStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class NetworkStateCopyWith<$R, $In extends NetworkState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class NetworkStateCopyWith<$R, $In extends NetworkState, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get localIps;
   $R call({List<String>? localIps, bool? initialized});
   NetworkStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _NetworkStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, NetworkState, $Out> implements NetworkStateCopyWith<$R, NetworkState, $Out> {
+class _NetworkStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, NetworkState, $Out>
+    implements NetworkStateCopyWith<$R, NetworkState, $Out> {
   _NetworkStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<NetworkState> $mapper = NetworkStateMapper.ensureInitialized();
+  late final ClassMapperBase<NetworkState> $mapper =
+      NetworkStateMapper.ensureInitialized();
   @override
   ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get localIps =>
-      ListCopyWith($value.localIps, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(localIps: v));
+      ListCopyWith(
+        $value.localIps,
+        (v, t) => ObjectCopyWith(v, $identity, t),
+        (v) => call(localIps: v),
+      );
   @override
-  $R call({List<String>? localIps, bool? initialized}) =>
+  $R call({List<String>? localIps, bool? initialized}) => $apply(
-      $apply(FieldCopyWithData({if (localIps != null) #localIps: localIps, if (initialized != null) #initialized: initialized}));
+    FieldCopyWithData({
+      if (localIps != null) #localIps: localIps,
+      if (initialized != null) #initialized: initialized,
+    }),
+  );
   @override
   NetworkState $make(CopyWithData data) => NetworkState(
     localIps: data.get(#localIps, or: $value.localIps),
@@ -102,5 +141,8 @@ class _NetworkStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, NetworkS
   );
 
   @override
-  NetworkStateCopyWith<$R2, NetworkState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _NetworkStateCopyWithImpl($value, $cast, t);
+  NetworkStateCopyWith<$R2, NetworkState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _NetworkStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/purchase_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,11 +22,18 @@ class PurchaseStateMapper extends ClassMapperBase<PurchaseState> {
   final String id = 'PurchaseState';
 
   static Map<PurchaseItem, String> _$prices(PurchaseState v) => v.prices;
-  static const Field<PurchaseState, Map<PurchaseItem, String>> _f$prices = Field('prices', _$prices);
+  static const Field<PurchaseState, Map<PurchaseItem, String>> _f$prices =
+      Field('prices', _$prices);
   static Set<PurchaseItem> _$purchases(PurchaseState v) => v.purchases;
-  static const Field<PurchaseState, Set<PurchaseItem>> _f$purchases = Field('purchases', _$purchases);
+  static const Field<PurchaseState, Set<PurchaseItem>> _f$purchases = Field(
+    'purchases',
+    _$purchases,
+  );
   static bool _$pending(PurchaseState v) => v.pending;
-  static const Field<PurchaseState, bool> _f$pending = Field('pending', _$pending);
+  static const Field<PurchaseState, bool> _f$pending = Field(
+    'pending',
+    _$pending,
+  );
 
   @override
   final MappableFields<PurchaseState> fields = const {
@@ -35,7 +43,11 @@ class PurchaseStateMapper extends ClassMapperBase<PurchaseState> {
   };
 
   static PurchaseState _instantiate(DecodingData data) {
-    return PurchaseState(prices: data.dec(_f$prices), purchases: data.dec(_f$purchases), pending: data.dec(_f$pending));
+    return PurchaseState(
+      prices: data.dec(_f$prices),
+      purchases: data.dec(_f$purchases),
+      pending: data.dec(_f$pending),
+    );
   }
 
   @override
@@ -52,53 +64,90 @@ class PurchaseStateMapper extends ClassMapperBase<PurchaseState> {
 
 mixin PurchaseStateMappable {
   String serialize() {
-    return PurchaseStateMapper.ensureInitialized().encodeJson<PurchaseState>(this as PurchaseState);
+    return PurchaseStateMapper.ensureInitialized().encodeJson<PurchaseState>(
+      this as PurchaseState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return PurchaseStateMapper.ensureInitialized().encodeMap<PurchaseState>(this as PurchaseState);
+    return PurchaseStateMapper.ensureInitialized().encodeMap<PurchaseState>(
+      this as PurchaseState,
+    );
   }
 
-  PurchaseStateCopyWith<PurchaseState, PurchaseState, PurchaseState> get copyWith =>
+  PurchaseStateCopyWith<PurchaseState, PurchaseState, PurchaseState>
-      _PurchaseStateCopyWithImpl(this as PurchaseState, $identity, $identity);
+  get copyWith => _PurchaseStateCopyWithImpl<PurchaseState, PurchaseState>(
+    this as PurchaseState,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return PurchaseStateMapper.ensureInitialized().stringifyValue(this as PurchaseState);
+    return PurchaseStateMapper.ensureInitialized().stringifyValue(
+      this as PurchaseState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return PurchaseStateMapper.ensureInitialized().equalsValue(this as PurchaseState, other);
+    return PurchaseStateMapper.ensureInitialized().equalsValue(
+      this as PurchaseState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return PurchaseStateMapper.ensureInitialized().hashValue(this as PurchaseState);
+    return PurchaseStateMapper.ensureInitialized().hashValue(
+      this as PurchaseState,
+    );
   }
 }
 
-extension PurchaseStateValueCopy<$R, $Out> on ObjectCopyWith<$R, PurchaseState, $Out> {
+extension PurchaseStateValueCopy<$R, $Out>
-  PurchaseStateCopyWith<$R, PurchaseState, $Out> get $asPurchaseState => $base.as((v, t, t2) => _PurchaseStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, PurchaseState, $Out> {
+  PurchaseStateCopyWith<$R, PurchaseState, $Out> get $asPurchaseState =>
+      $base.as((v, t, t2) => _PurchaseStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class PurchaseStateCopyWith<$R, $In extends PurchaseState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class PurchaseStateCopyWith<$R, $In extends PurchaseState, $Out>
-  MapCopyWith<$R, PurchaseItem, String, ObjectCopyWith<$R, String, String>> get prices;
+    implements ClassCopyWith<$R, $In, $Out> {
-  $R call({Map<PurchaseItem, String>? prices, Set<PurchaseItem>? purchases, bool? pending});
+  MapCopyWith<$R, PurchaseItem, String, ObjectCopyWith<$R, String, String>>
+  get prices;
+  $R call({
+    Map<PurchaseItem, String>? prices,
+    Set<PurchaseItem>? purchases,
+    bool? pending,
+  });
   PurchaseStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _PurchaseStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, PurchaseState, $Out>
+class _PurchaseStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, PurchaseState, $Out>
     implements PurchaseStateCopyWith<$R, PurchaseState, $Out> {
   _PurchaseStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<PurchaseState> $mapper = PurchaseStateMapper.ensureInitialized();
+  late final ClassMapperBase<PurchaseState> $mapper =
+      PurchaseStateMapper.ensureInitialized();
   @override
-  MapCopyWith<$R, PurchaseItem, String, ObjectCopyWith<$R, String, String>> get prices =>
+  MapCopyWith<$R, PurchaseItem, String, ObjectCopyWith<$R, String, String>>
-      MapCopyWith($value.prices, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(prices: v));
+  get prices => MapCopyWith(
+    $value.prices,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(prices: v),
+  );
   @override
-  $R call({Map<PurchaseItem, String>? prices, Set<PurchaseItem>? purchases, bool? pending}) => $apply(
+  $R call({
-    FieldCopyWithData({if (prices != null) #prices: prices, if (purchases != null) #purchases: purchases, if (pending != null) #pending: pending}),
+    Map<PurchaseItem, String>? prices,
+    Set<PurchaseItem>? purchases,
+    bool? pending,
+  }) => $apply(
+    FieldCopyWithData({
+      if (prices != null) #prices: prices,
+      if (purchases != null) #purchases: purchases,
+      if (pending != null) #pending: pending,
+    }),
   );
   @override
   PurchaseState $make(CopyWithData data) => PurchaseState(
@@ -108,5 +157,8 @@ class _PurchaseStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Purchas
   );
 
   @override
-  PurchaseStateCopyWith<$R2, PurchaseState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _PurchaseStateCopyWithImpl($value, $cast, t);
+  PurchaseStateCopyWith<$R2, PurchaseState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _PurchaseStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/send/send_session_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,25 +24,52 @@ class SendSessionStateMapper extends ClassMapperBase<SendSessionState> {
   final String id = 'SendSessionState';
 
   static String _$sessionId(SendSessionState v) => v.sessionId;
-  static const Field<SendSessionState, String> _f$sessionId = Field('sessionId', _$sessionId);
+  static const Field<SendSessionState, String> _f$sessionId = Field(
+    'sessionId',
+    _$sessionId,
+  );
   static String? _$remoteSessionId(SendSessionState v) => v.remoteSessionId;
-  static const Field<SendSessionState, String> _f$remoteSessionId = Field('remoteSessionId', _$remoteSessionId);
+  static const Field<SendSessionState, String> _f$remoteSessionId = Field(
+    'remoteSessionId',
+    _$remoteSessionId,
+  );
   static bool _$background(SendSessionState v) => v.background;
-  static const Field<SendSessionState, bool> _f$background = Field('background', _$background);
+  static const Field<SendSessionState, bool> _f$background = Field(
+    'background',
+    _$background,
+  );
   static SessionStatus _$status(SendSessionState v) => v.status;
-  static const Field<SendSessionState, SessionStatus> _f$status = Field('status', _$status);
+  static const Field<SendSessionState, SessionStatus> _f$status = Field(
+    'status',
+    _$status,
+  );
   static Device _$target(SendSessionState v) => v.target;
-  static const Field<SendSessionState, Device> _f$target = Field('target', _$target);
+  static const Field<SendSessionState, Device> _f$target = Field(
+    'target',
+    _$target,
+  );
   static Map<String, SendingFile> _$files(SendSessionState v) => v.files;
-  static const Field<SendSessionState, Map<String, SendingFile>> _f$files = Field('files', _$files);
+  static const Field<SendSessionState, Map<String, SendingFile>> _f$files =
+      Field('files', _$files);
   static int? _$startTime(SendSessionState v) => v.startTime;
-  static const Field<SendSessionState, int> _f$startTime = Field('startTime', _$startTime);
+  static const Field<SendSessionState, int> _f$startTime = Field(
+    'startTime',
+    _$startTime,
+  );
   static int? _$endTime(SendSessionState v) => v.endTime;
-  static const Field<SendSessionState, int> _f$endTime = Field('endTime', _$endTime);
+  static const Field<SendSessionState, int> _f$endTime = Field(
-  static List<SendingTask>? _$sendingTasks(SendSessionState v) => v.sendingTasks;
+    'endTime',
-  static const Field<SendSessionState, List<SendingTask>> _f$sendingTasks = Field('sendingTasks', _$sendingTasks);
+    _$endTime,
+  );
+  static List<SendingTask>? _$sendingTasks(SendSessionState v) =>
+      v.sendingTasks;
+  static const Field<SendSessionState, List<SendingTask>> _f$sendingTasks =
+      Field('sendingTasks', _$sendingTasks);
   static String? _$errorMessage(SendSessionState v) => v.errorMessage;
-  static const Field<SendSessionState, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
+  static const Field<SendSessionState, String> _f$errorMessage = Field(
+    'errorMessage',
+    _$errorMessage,
+  );
 
   @override
   final MappableFields<SendSessionState> fields = const {
@@ -86,39 +114,64 @@ class SendSessionStateMapper extends ClassMapperBase<SendSessionState> {
 
 mixin SendSessionStateMappable {
   String serialize() {
-    return SendSessionStateMapper.ensureInitialized().encodeJson<SendSessionState>(this as SendSessionState);
+    return SendSessionStateMapper.ensureInitialized()
+        .encodeJson<SendSessionState>(this as SendSessionState);
   }
 
   Map<String, dynamic> toJson() {
-    return SendSessionStateMapper.ensureInitialized().encodeMap<SendSessionState>(this as SendSessionState);
+    return SendSessionStateMapper.ensureInitialized()
+        .encodeMap<SendSessionState>(this as SendSessionState);
   }
 
-  SendSessionStateCopyWith<SendSessionState, SendSessionState, SendSessionState> get copyWith =>
+  SendSessionStateCopyWith<SendSessionState, SendSessionState, SendSessionState>
-      _SendSessionStateCopyWithImpl(this as SendSessionState, $identity, $identity);
+  get copyWith =>
+      _SendSessionStateCopyWithImpl<SendSessionState, SendSessionState>(
+        this as SendSessionState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return SendSessionStateMapper.ensureInitialized().stringifyValue(this as SendSessionState);
+    return SendSessionStateMapper.ensureInitialized().stringifyValue(
+      this as SendSessionState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return SendSessionStateMapper.ensureInitialized().equalsValue(this as SendSessionState, other);
+    return SendSessionStateMapper.ensureInitialized().equalsValue(
+      this as SendSessionState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return SendSessionStateMapper.ensureInitialized().hashValue(this as SendSessionState);
+    return SendSessionStateMapper.ensureInitialized().hashValue(
+      this as SendSessionState,
+    );
   }
 }
 
-extension SendSessionStateValueCopy<$R, $Out> on ObjectCopyWith<$R, SendSessionState, $Out> {
+extension SendSessionStateValueCopy<$R, $Out>
-  SendSessionStateCopyWith<$R, SendSessionState, $Out> get $asSendSessionState => $base.as((v, t, t2) => _SendSessionStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, SendSessionState, $Out> {
+  SendSessionStateCopyWith<$R, SendSessionState, $Out>
+  get $asSendSessionState =>
+      $base.as((v, t, t2) => _SendSessionStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class SendSessionStateCopyWith<$R, $In extends SendSessionState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class SendSessionStateCopyWith<$R, $In extends SendSessionState, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   DeviceCopyWith<$R, Device, Device> get target;
-  MapCopyWith<$R, String, SendingFile, SendingFileCopyWith<$R, SendingFile, SendingFile>> get files;
+  MapCopyWith<
-  ListCopyWith<$R, SendingTask, ObjectCopyWith<$R, SendingTask, SendingTask>>? get sendingTasks;
+    $R,
+    String,
+    SendingFile,
+    SendingFileCopyWith<$R, SendingFile, SendingFile>
+  >
+  get files;
+  ListCopyWith<$R, SendingTask, ObjectCopyWith<$R, SendingTask, SendingTask>>?
+  get sendingTasks;
   $R call({
     String? sessionId,
     String? remoteSessionId,
@@ -131,23 +184,42 @@ abstract class SendSessionStateCopyWith<$R, $In extends SendSessionState, $Out>
     List<SendingTask>? sendingTasks,
     String? errorMessage,
   });
-  SendSessionStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  SendSessionStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _SendSessionStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SendSessionState, $Out>
+class _SendSessionStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, SendSessionState, $Out>
     implements SendSessionStateCopyWith<$R, SendSessionState, $Out> {
   _SendSessionStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<SendSessionState> $mapper = SendSessionStateMapper.ensureInitialized();
+  late final ClassMapperBase<SendSessionState> $mapper =
+      SendSessionStateMapper.ensureInitialized();
   @override
-  DeviceCopyWith<$R, Device, Device> get target => $value.target.copyWith.$chain((v) => call(target: v));
+  DeviceCopyWith<$R, Device, Device> get target =>
+      $value.target.copyWith.$chain((v) => call(target: v));
   @override
-  MapCopyWith<$R, String, SendingFile, SendingFileCopyWith<$R, SendingFile, SendingFile>> get files =>
+  MapCopyWith<
-      MapCopyWith($value.files, (v, t) => v.copyWith.$chain(t), (v) => call(files: v));
+    $R,
+    String,
+    SendingFile,
+    SendingFileCopyWith<$R, SendingFile, SendingFile>
+  >
+  get files => MapCopyWith(
+    $value.files,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(files: v),
+  );
   @override
-  ListCopyWith<$R, SendingTask, ObjectCopyWith<$R, SendingTask, SendingTask>>? get sendingTasks => $value.sendingTasks != null
+  ListCopyWith<$R, SendingTask, ObjectCopyWith<$R, SendingTask, SendingTask>>?
-      ? ListCopyWith($value.sendingTasks!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(sendingTasks: v))
+  get sendingTasks => $value.sendingTasks != null
+      ? ListCopyWith(
+          $value.sendingTasks!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(sendingTasks: v),
+        )
       : null;
   @override
   $R call({
@@ -190,5 +262,8 @@ class _SendSessionStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Send
   );
 
   @override
-  SendSessionStateCopyWith<$R2, SendSessionState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _SendSessionStateCopyWithImpl($value, $cast, t);
+  SendSessionStateCopyWith<$R2, SendSessionState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _SendSessionStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/send/sending_file.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,19 +24,31 @@ class SendingFileMapper extends ClassMapperBase<SendingFile> {
   static FileDto _$file(SendingFile v) => v.file;
   static const Field<SendingFile, FileDto> _f$file = Field('file', _$file);
   static FileStatus _$status(SendingFile v) => v.status;
-  static const Field<SendingFile, FileStatus> _f$status = Field('status', _$status);
+  static const Field<SendingFile, FileStatus> _f$status = Field(
+    'status',
+    _$status,
+  );
   static String? _$token(SendingFile v) => v.token;
   static const Field<SendingFile, String> _f$token = Field('token', _$token);
   static Uint8List? _$thumbnail(SendingFile v) => v.thumbnail;
-  static const Field<SendingFile, Uint8List> _f$thumbnail = Field('thumbnail', _$thumbnail);
+  static const Field<SendingFile, Uint8List> _f$thumbnail = Field(
+    'thumbnail',
+    _$thumbnail,
+  );
   static AssetEntity? _$asset(SendingFile v) => v.asset;
-  static const Field<SendingFile, AssetEntity> _f$asset = Field('asset', _$asset);
+  static const Field<SendingFile, AssetEntity> _f$asset = Field(
+    'asset',
+    _$asset,
+  );
   static String? _$path(SendingFile v) => v.path;
   static const Field<SendingFile, String> _f$path = Field('path', _$path);
   static List<int>? _$bytes(SendingFile v) => v.bytes;
   static const Field<SendingFile, List<int>> _f$bytes = Field('bytes', _$bytes);
   static String? _$errorMessage(SendingFile v) => v.errorMessage;
-  static const Field<SendingFile, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
+  static const Field<SendingFile, String> _f$errorMessage = Field(
+    'errorMessage',
+    _$errorMessage,
+  );
 
   @override
   final MappableFields<SendingFile> fields = const {
@@ -76,22 +89,36 @@ class SendingFileMapper extends ClassMapperBase<SendingFile> {
 
 mixin SendingFileMappable {
   String serialize() {
-    return SendingFileMapper.ensureInitialized().encodeJson<SendingFile>(this as SendingFile);
+    return SendingFileMapper.ensureInitialized().encodeJson<SendingFile>(
+      this as SendingFile,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return SendingFileMapper.ensureInitialized().encodeMap<SendingFile>(this as SendingFile);
+    return SendingFileMapper.ensureInitialized().encodeMap<SendingFile>(
+      this as SendingFile,
+    );
   }
 
-  SendingFileCopyWith<SendingFile, SendingFile, SendingFile> get copyWith => _SendingFileCopyWithImpl(this as SendingFile, $identity, $identity);
+  SendingFileCopyWith<SendingFile, SendingFile, SendingFile> get copyWith =>
+      _SendingFileCopyWithImpl<SendingFile, SendingFile>(
+        this as SendingFile,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return SendingFileMapper.ensureInitialized().stringifyValue(this as SendingFile);
+    return SendingFileMapper.ensureInitialized().stringifyValue(
+      this as SendingFile,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return SendingFileMapper.ensureInitialized().equalsValue(this as SendingFile, other);
+    return SendingFileMapper.ensureInitialized().equalsValue(
+      this as SendingFile,
+      other,
+    );
   }
 
   @override
@@ -100,11 +127,14 @@ mixin SendingFileMappable {
   }
 }
 
-extension SendingFileValueCopy<$R, $Out> on ObjectCopyWith<$R, SendingFile, $Out> {
+extension SendingFileValueCopy<$R, $Out>
-  SendingFileCopyWith<$R, SendingFile, $Out> get $asSendingFile => $base.as((v, t, t2) => _SendingFileCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, SendingFile, $Out> {
+  SendingFileCopyWith<$R, SendingFile, $Out> get $asSendingFile =>
+      $base.as((v, t, t2) => _SendingFileCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class SendingFileCopyWith<$R, $In extends SendingFile, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class SendingFileCopyWith<$R, $In extends SendingFile, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes;
   $R call({
     FileDto? file,
@@ -119,14 +149,23 @@ abstract class SendingFileCopyWith<$R, $In extends SendingFile, $Out> implements
   SendingFileCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _SendingFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SendingFile, $Out> implements SendingFileCopyWith<$R, SendingFile, $Out> {
+class _SendingFileCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, SendingFile, $Out>
+    implements SendingFileCopyWith<$R, SendingFile, $Out> {
   _SendingFileCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<SendingFile> $mapper = SendingFileMapper.ensureInitialized();
+  late final ClassMapperBase<SendingFile> $mapper =
+      SendingFileMapper.ensureInitialized();
   @override
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes =>
-      $value.bytes != null ? ListCopyWith($value.bytes!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(bytes: v)) : null;
+      $value.bytes != null
+      ? ListCopyWith(
+          $value.bytes!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(bytes: v),
+        )
+      : null;
   @override
   $R call({
     FileDto? file,
@@ -162,5 +201,8 @@ class _SendingFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SendingFi
   );
 
   @override
-  SendingFileCopyWith<$R2, SendingFile, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _SendingFileCopyWithImpl($value, $cast, t);
+  SendingFileCopyWith<$R2, SendingFile, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _SendingFileCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/send/web/web_send_file.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,7 +24,10 @@ class WebSendFileMapper extends ClassMapperBase<WebSendFile> {
   static FileDto _$file(WebSendFile v) => v.file;
   static const Field<WebSendFile, FileDto> _f$file = Field('file', _$file);
   static AssetEntity? _$asset(WebSendFile v) => v.asset;
-  static const Field<WebSendFile, AssetEntity> _f$asset = Field('asset', _$asset);
+  static const Field<WebSendFile, AssetEntity> _f$asset = Field(
+    'asset',
+    _$asset,
+  );
   static String? _$path(WebSendFile v) => v.path;
   static const Field<WebSendFile, String> _f$path = Field('path', _$path);
   static List<int>? _$bytes(WebSendFile v) => v.bytes;
@@ -38,7 +42,12 @@ class WebSendFileMapper extends ClassMapperBase<WebSendFile> {
   };
 
   static WebSendFile _instantiate(DecodingData data) {
-    return WebSendFile(file: data.dec(_f$file), asset: data.dec(_f$asset), path: data.dec(_f$path), bytes: data.dec(_f$bytes));
+    return WebSendFile(
+      file: data.dec(_f$file),
+      asset: data.dec(_f$asset),
+      path: data.dec(_f$path),
+      bytes: data.dec(_f$bytes),
+    );
   }
 
   @override
@@ -55,22 +64,36 @@ class WebSendFileMapper extends ClassMapperBase<WebSendFile> {
 
 mixin WebSendFileMappable {
   String serialize() {
-    return WebSendFileMapper.ensureInitialized().encodeJson<WebSendFile>(this as WebSendFile);
+    return WebSendFileMapper.ensureInitialized().encodeJson<WebSendFile>(
+      this as WebSendFile,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return WebSendFileMapper.ensureInitialized().encodeMap<WebSendFile>(this as WebSendFile);
+    return WebSendFileMapper.ensureInitialized().encodeMap<WebSendFile>(
+      this as WebSendFile,
+    );
   }
 
-  WebSendFileCopyWith<WebSendFile, WebSendFile, WebSendFile> get copyWith => _WebSendFileCopyWithImpl(this as WebSendFile, $identity, $identity);
+  WebSendFileCopyWith<WebSendFile, WebSendFile, WebSendFile> get copyWith =>
+      _WebSendFileCopyWithImpl<WebSendFile, WebSendFile>(
+        this as WebSendFile,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return WebSendFileMapper.ensureInitialized().stringifyValue(this as WebSendFile);
+    return WebSendFileMapper.ensureInitialized().stringifyValue(
+      this as WebSendFile,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return WebSendFileMapper.ensureInitialized().equalsValue(this as WebSendFile, other);
+    return WebSendFileMapper.ensureInitialized().equalsValue(
+      this as WebSendFile,
+      other,
+    );
   }
 
   @override
@@ -79,26 +102,43 @@ mixin WebSendFileMappable {
   }
 }
 
-extension WebSendFileValueCopy<$R, $Out> on ObjectCopyWith<$R, WebSendFile, $Out> {
+extension WebSendFileValueCopy<$R, $Out>
-  WebSendFileCopyWith<$R, WebSendFile, $Out> get $asWebSendFile => $base.as((v, t, t2) => _WebSendFileCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, WebSendFile, $Out> {
+  WebSendFileCopyWith<$R, WebSendFile, $Out> get $asWebSendFile =>
+      $base.as((v, t, t2) => _WebSendFileCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class WebSendFileCopyWith<$R, $In extends WebSendFile, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class WebSendFileCopyWith<$R, $In extends WebSendFile, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes;
   $R call({FileDto? file, AssetEntity? asset, String? path, List<int>? bytes});
   WebSendFileCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _WebSendFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSendFile, $Out> implements WebSendFileCopyWith<$R, WebSendFile, $Out> {
+class _WebSendFileCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, WebSendFile, $Out>
+    implements WebSendFileCopyWith<$R, WebSendFile, $Out> {
   _WebSendFileCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<WebSendFile> $mapper = WebSendFileMapper.ensureInitialized();
+  late final ClassMapperBase<WebSendFile> $mapper =
+      WebSendFileMapper.ensureInitialized();
   @override
   ListCopyWith<$R, int, ObjectCopyWith<$R, int, int>>? get bytes =>
-      $value.bytes != null ? ListCopyWith($value.bytes!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(bytes: v)) : null;
+      $value.bytes != null
+      ? ListCopyWith(
+          $value.bytes!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(bytes: v),
+        )
+      : null;
   @override
-  $R call({FileDto? file, Object? asset = $none, Object? path = $none, Object? bytes = $none}) => $apply(
+  $R call({
+    FileDto? file,
+    Object? asset = $none,
+    Object? path = $none,
+    Object? bytes = $none,
+  }) => $apply(
     FieldCopyWithData({
       if (file != null) #file: file,
       if (asset != $none) #asset: asset,
@@ -115,5 +155,8 @@ class _WebSendFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSendFi
   );
 
   @override
-  WebSendFileCopyWith<$R2, WebSendFile, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _WebSendFileCopyWithImpl($value, $cast, t);
+  WebSendFileCopyWith<$R2, WebSendFile, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _WebSendFileCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/send/web/web_send_session.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,13 +22,21 @@ class WebSendSessionMapper extends ClassMapperBase<WebSendSession> {
   final String id = 'WebSendSession';
 
   static String _$sessionId(WebSendSession v) => v.sessionId;
-  static const Field<WebSendSession, String> _f$sessionId = Field('sessionId', _$sessionId);
+  static const Field<WebSendSession, String> _f$sessionId = Field(
-  static StreamController<bool>? _$responseHandler(WebSendSession v) => v.responseHandler;
+    'sessionId',
-  static const Field<WebSendSession, StreamController<bool>> _f$responseHandler = Field('responseHandler', _$responseHandler);
+    _$sessionId,
+  );
+  static StreamController<bool>? _$responseHandler(WebSendSession v) =>
+      v.responseHandler;
+  static const Field<WebSendSession, StreamController<bool>>
+  _f$responseHandler = Field('responseHandler', _$responseHandler);
   static String _$ip(WebSendSession v) => v.ip;
   static const Field<WebSendSession, String> _f$ip = Field('ip', _$ip);
   static String _$deviceInfo(WebSendSession v) => v.deviceInfo;
-  static const Field<WebSendSession, String> _f$deviceInfo = Field('deviceInfo', _$deviceInfo);
+  static const Field<WebSendSession, String> _f$deviceInfo = Field(
+    'deviceInfo',
+    _$deviceInfo,
+  );
 
   @override
   final MappableFields<WebSendSession> fields = const {
@@ -60,48 +69,80 @@ class WebSendSessionMapper extends ClassMapperBase<WebSendSession> {
 
 mixin WebSendSessionMappable {
   String serialize() {
-    return WebSendSessionMapper.ensureInitialized().encodeJson<WebSendSession>(this as WebSendSession);
+    return WebSendSessionMapper.ensureInitialized().encodeJson<WebSendSession>(
+      this as WebSendSession,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return WebSendSessionMapper.ensureInitialized().encodeMap<WebSendSession>(this as WebSendSession);
+    return WebSendSessionMapper.ensureInitialized().encodeMap<WebSendSession>(
+      this as WebSendSession,
+    );
   }
 
-  WebSendSessionCopyWith<WebSendSession, WebSendSession, WebSendSession> get copyWith =>
+  WebSendSessionCopyWith<WebSendSession, WebSendSession, WebSendSession>
-      _WebSendSessionCopyWithImpl(this as WebSendSession, $identity, $identity);
+  get copyWith => _WebSendSessionCopyWithImpl<WebSendSession, WebSendSession>(
+    this as WebSendSession,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return WebSendSessionMapper.ensureInitialized().stringifyValue(this as WebSendSession);
+    return WebSendSessionMapper.ensureInitialized().stringifyValue(
+      this as WebSendSession,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return WebSendSessionMapper.ensureInitialized().equalsValue(this as WebSendSession, other);
+    return WebSendSessionMapper.ensureInitialized().equalsValue(
+      this as WebSendSession,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return WebSendSessionMapper.ensureInitialized().hashValue(this as WebSendSession);
+    return WebSendSessionMapper.ensureInitialized().hashValue(
+      this as WebSendSession,
+    );
   }
 }
 
-extension WebSendSessionValueCopy<$R, $Out> on ObjectCopyWith<$R, WebSendSession, $Out> {
+extension WebSendSessionValueCopy<$R, $Out>
-  WebSendSessionCopyWith<$R, WebSendSession, $Out> get $asWebSendSession => $base.as((v, t, t2) => _WebSendSessionCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, WebSendSession, $Out> {
+  WebSendSessionCopyWith<$R, WebSendSession, $Out> get $asWebSendSession =>
+      $base.as((v, t, t2) => _WebSendSessionCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class WebSendSessionCopyWith<$R, $In extends WebSendSession, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class WebSendSessionCopyWith<$R, $In extends WebSendSession, $Out>
-  $R call({String? sessionId, StreamController<bool>? responseHandler, String? ip, String? deviceInfo});
+    implements ClassCopyWith<$R, $In, $Out> {
-  WebSendSessionCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  $R call({
+    String? sessionId,
+    StreamController<bool>? responseHandler,
+    String? ip,
+    String? deviceInfo,
+  });
+  WebSendSessionCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _WebSendSessionCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSendSession, $Out>
+class _WebSendSessionCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, WebSendSession, $Out>
     implements WebSendSessionCopyWith<$R, WebSendSession, $Out> {
   _WebSendSessionCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<WebSendSession> $mapper = WebSendSessionMapper.ensureInitialized();
+  late final ClassMapperBase<WebSendSession> $mapper =
+      WebSendSessionMapper.ensureInitialized();
   @override
-  $R call({String? sessionId, Object? responseHandler = $none, String? ip, String? deviceInfo}) => $apply(
+  $R call({
+    String? sessionId,
+    Object? responseHandler = $none,
+    String? ip,
+    String? deviceInfo,
+  }) => $apply(
     FieldCopyWithData({
       if (sessionId != null) #sessionId: sessionId,
       if (responseHandler != $none) #responseHandler: responseHandler,
@@ -118,5 +159,8 @@ class _WebSendSessionCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSen
   );
 
   @override
-  WebSendSessionCopyWith<$R2, WebSendSession, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _WebSendSessionCopyWithImpl($value, $cast, t);
+  WebSendSessionCopyWith<$R2, WebSendSession, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _WebSendSessionCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/send/web/web_send_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,15 +24,25 @@ class WebSendStateMapper extends ClassMapperBase<WebSendState> {
   final String id = 'WebSendState';
 
   static Map<String, WebSendSession> _$sessions(WebSendState v) => v.sessions;
-  static const Field<WebSendState, Map<String, WebSendSession>> _f$sessions = Field('sessions', _$sessions);
+  static const Field<WebSendState, Map<String, WebSendSession>> _f$sessions =
+      Field('sessions', _$sessions);
   static Map<String, WebSendFile> _$files(WebSendState v) => v.files;
-  static const Field<WebSendState, Map<String, WebSendFile>> _f$files = Field('files', _$files);
+  static const Field<WebSendState, Map<String, WebSendFile>> _f$files = Field(
+    'files',
+    _$files,
+  );
   static bool _$autoAccept(WebSendState v) => v.autoAccept;
-  static const Field<WebSendState, bool> _f$autoAccept = Field('autoAccept', _$autoAccept);
+  static const Field<WebSendState, bool> _f$autoAccept = Field(
+    'autoAccept',
+    _$autoAccept,
+  );
   static String? _$pin(WebSendState v) => v.pin;
   static const Field<WebSendState, String> _f$pin = Field('pin', _$pin);
   static Map<String, int> _$pinAttempts(WebSendState v) => v.pinAttempts;
-  static const Field<WebSendState, Map<String, int>> _f$pinAttempts = Field('pinAttempts', _$pinAttempts);
+  static const Field<WebSendState, Map<String, int>> _f$pinAttempts = Field(
+    'pinAttempts',
+    _$pinAttempts,
+  );
 
   @override
   final MappableFields<WebSendState> fields = const {
@@ -66,57 +77,118 @@ class WebSendStateMapper extends ClassMapperBase<WebSendState> {
 
 mixin WebSendStateMappable {
   String serialize() {
-    return WebSendStateMapper.ensureInitialized().encodeJson<WebSendState>(this as WebSendState);
+    return WebSendStateMapper.ensureInitialized().encodeJson<WebSendState>(
+      this as WebSendState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return WebSendStateMapper.ensureInitialized().encodeMap<WebSendState>(this as WebSendState);
+    return WebSendStateMapper.ensureInitialized().encodeMap<WebSendState>(
+      this as WebSendState,
+    );
   }
 
   WebSendStateCopyWith<WebSendState, WebSendState, WebSendState> get copyWith =>
-      _WebSendStateCopyWithImpl(this as WebSendState, $identity, $identity);
+      _WebSendStateCopyWithImpl<WebSendState, WebSendState>(
+        this as WebSendState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return WebSendStateMapper.ensureInitialized().stringifyValue(this as WebSendState);
+    return WebSendStateMapper.ensureInitialized().stringifyValue(
+      this as WebSendState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return WebSendStateMapper.ensureInitialized().equalsValue(this as WebSendState, other);
+    return WebSendStateMapper.ensureInitialized().equalsValue(
+      this as WebSendState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return WebSendStateMapper.ensureInitialized().hashValue(this as WebSendState);
+    return WebSendStateMapper.ensureInitialized().hashValue(
+      this as WebSendState,
+    );
   }
 }
 
-extension WebSendStateValueCopy<$R, $Out> on ObjectCopyWith<$R, WebSendState, $Out> {
+extension WebSendStateValueCopy<$R, $Out>
-  WebSendStateCopyWith<$R, WebSendState, $Out> get $asWebSendState => $base.as((v, t, t2) => _WebSendStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, WebSendState, $Out> {
+  WebSendStateCopyWith<$R, WebSendState, $Out> get $asWebSendState =>
+      $base.as((v, t, t2) => _WebSendStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class WebSendStateCopyWith<$R, $In extends WebSendState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class WebSendStateCopyWith<$R, $In extends WebSendState, $Out>
-  MapCopyWith<$R, String, WebSendSession, WebSendSessionCopyWith<$R, WebSendSession, WebSendSession>> get sessions;
+    implements ClassCopyWith<$R, $In, $Out> {
-  MapCopyWith<$R, String, WebSendFile, WebSendFileCopyWith<$R, WebSendFile, WebSendFile>> get files;
+  MapCopyWith<
+    $R,
+    String,
+    WebSendSession,
+    WebSendSessionCopyWith<$R, WebSendSession, WebSendSession>
+  >
+  get sessions;
+  MapCopyWith<
+    $R,
+    String,
+    WebSendFile,
+    WebSendFileCopyWith<$R, WebSendFile, WebSendFile>
+  >
+  get files;
   MapCopyWith<$R, String, int, ObjectCopyWith<$R, int, int>> get pinAttempts;
-  $R call({Map<String, WebSendSession>? sessions, Map<String, WebSendFile>? files, bool? autoAccept, String? pin, Map<String, int>? pinAttempts});
+  $R call({
+    Map<String, WebSendSession>? sessions,
+    Map<String, WebSendFile>? files,
+    bool? autoAccept,
+    String? pin,
+    Map<String, int>? pinAttempts,
+  });
   WebSendStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _WebSendStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSendState, $Out> implements WebSendStateCopyWith<$R, WebSendState, $Out> {
+class _WebSendStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, WebSendState, $Out>
+    implements WebSendStateCopyWith<$R, WebSendState, $Out> {
   _WebSendStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<WebSendState> $mapper = WebSendStateMapper.ensureInitialized();
+  late final ClassMapperBase<WebSendState> $mapper =
+      WebSendStateMapper.ensureInitialized();
   @override
-  MapCopyWith<$R, String, WebSendSession, WebSendSessionCopyWith<$R, WebSendSession, WebSendSession>> get sessions =>
+  MapCopyWith<
-      MapCopyWith($value.sessions, (v, t) => v.copyWith.$chain(t), (v) => call(sessions: v));
+    $R,
+    String,
+    WebSendSession,
+    WebSendSessionCopyWith<$R, WebSendSession, WebSendSession>
+  >
+  get sessions => MapCopyWith(
+    $value.sessions,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(sessions: v),
+  );
   @override
-  MapCopyWith<$R, String, WebSendFile, WebSendFileCopyWith<$R, WebSendFile, WebSendFile>> get files =>
+  MapCopyWith<
-      MapCopyWith($value.files, (v, t) => v.copyWith.$chain(t), (v) => call(files: v));
+    $R,
+    String,
+    WebSendFile,
+    WebSendFileCopyWith<$R, WebSendFile, WebSendFile>
+  >
+  get files => MapCopyWith(
+    $value.files,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(files: v),
+  );
   @override
   MapCopyWith<$R, String, int, ObjectCopyWith<$R, int, int>> get pinAttempts =>
-      MapCopyWith($value.pinAttempts, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(pinAttempts: v));
+      MapCopyWith(
+        $value.pinAttempts,
+        (v, t) => ObjectCopyWith(v, $identity, t),
+        (v) => call(pinAttempts: v),
+      );
   @override
   $R call({
     Map<String, WebSendSession>? sessions,
@@ -143,5 +215,8 @@ class _WebSendStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebSendS
   );
 
   @override
-  WebSendStateCopyWith<$R2, WebSendState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _WebSendStateCopyWithImpl($value, $cast, t);
+  WebSendStateCopyWith<$R2, WebSendState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _WebSendStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/server/receive_session_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,29 +24,77 @@ class ReceiveSessionStateMapper extends ClassMapperBase<ReceiveSessionState> {
   final String id = 'ReceiveSessionState';
 
   static String _$sessionId(ReceiveSessionState v) => v.sessionId;
-  static const Field<ReceiveSessionState, String> _f$sessionId = Field('sessionId', _$sessionId);
+  static const Field<ReceiveSessionState, String> _f$sessionId = Field(
+    'sessionId',
+    _$sessionId,
+  );
   static SessionStatus _$status(ReceiveSessionState v) => v.status;
-  static const Field<ReceiveSessionState, SessionStatus> _f$status = Field('status', _$status);
+  static const Field<ReceiveSessionState, SessionStatus> _f$status = Field(
+    'status',
+    _$status,
+  );
   static Device _$sender(ReceiveSessionState v) => v.sender;
-  static const Field<ReceiveSessionState, Device> _f$sender = Field('sender', _$sender);
+  static const Field<ReceiveSessionState, Device> _f$sender = Field(
+    'sender',
+    _$sender,
+  );
   static String _$senderAlias(ReceiveSessionState v) => v.senderAlias;
-  static const Field<ReceiveSessionState, String> _f$senderAlias = Field('senderAlias', _$senderAlias);
+  static const Field<ReceiveSessionState, String> _f$senderAlias = Field(
+    'senderAlias',
+    _$senderAlias,
+  );
   static Map<String, ReceivingFile> _$files(ReceiveSessionState v) => v.files;
-  static const Field<ReceiveSessionState, Map<String, ReceivingFile>> _f$files = Field('files', _$files);
+  static const Field<ReceiveSessionState, Map<String, ReceivingFile>> _f$files =
+      Field('files', _$files);
   static int? _$startTime(ReceiveSessionState v) => v.startTime;
-  static const Field<ReceiveSessionState, int> _f$startTime = Field('startTime', _$startTime);
+  static const Field<ReceiveSessionState, int> _f$startTime = Field(
+    'startTime',
+    _$startTime,
+  );
   static int? _$endTime(ReceiveSessionState v) => v.endTime;
-  static const Field<ReceiveSessionState, int> _f$endTime = Field('endTime', _$endTime);
+  static const Field<ReceiveSessionState, int> _f$endTime = Field(
-  static String _$destinationDirectory(ReceiveSessionState v) => v.destinationDirectory;
+    'endTime',
-  static const Field<ReceiveSessionState, String> _f$destinationDirectory = Field('destinationDirectory', _$destinationDirectory);
+    _$endTime,
+  );
+  static String _$destinationDirectory(ReceiveSessionState v) =>
+      v.destinationDirectory;
+  static const Field<ReceiveSessionState, String> _f$destinationDirectory =
+      Field('destinationDirectory', _$destinationDirectory);
   static String _$cacheDirectory(ReceiveSessionState v) => v.cacheDirectory;
-  static const Field<ReceiveSessionState, String> _f$cacheDirectory = Field('cacheDirectory', _$cacheDirectory);
+  static const Field<ReceiveSessionState, String> _f$cacheDirectory = Field(
+    'cacheDirectory',
+    _$cacheDirectory,
+  );
   static bool _$saveToGallery(ReceiveSessionState v) => v.saveToGallery;
-  static const Field<ReceiveSessionState, bool> _f$saveToGallery = Field('saveToGallery', _$saveToGallery);
+  static const Field<ReceiveSessionState, bool> _f$saveToGallery = Field(
-  static Set<String> _$createdDirectories(ReceiveSessionState v) => v.createdDirectories;
+    'saveToGallery',
-  static const Field<ReceiveSessionState, Set<String>> _f$createdDirectories = Field('createdDirectories', _$createdDirectories);
+    _$saveToGallery,
-  static StreamController<Map<String, String>?>? _$responseHandler(ReceiveSessionState v) => v.responseHandler;
+  );
-  static const Field<ReceiveSessionState, StreamController<Map<String, String>?>> _f$responseHandler = Field('responseHandler', _$responseHandler);
+  static Set<String> _$createdDirectories(ReceiveSessionState v) =>
+      v.createdDirectories;
+  static const Field<ReceiveSessionState, Set<String>> _f$createdDirectories =
+      Field('createdDirectories', _$createdDirectories);
+  static StreamController<Map<String, String>?>? _$responseHandler(
+    ReceiveSessionState v,
+  ) => v.responseHandler;
+  static const Field<
+    ReceiveSessionState,
+    StreamController<Map<String, String>?>
+  >
+  _f$responseHandler = Field('responseHandler', _$responseHandler);
+  static String? _$message(ReceiveSessionState v) => v.message;
+  static const Field<ReceiveSessionState, String> _f$message = Field(
+    'message',
+    _$message,
+    mode: FieldMode.member,
+  );
+  static bool _$containsDirectories(ReceiveSessionState v) =>
+      v.containsDirectories;
+  static const Field<ReceiveSessionState, bool> _f$containsDirectories = Field(
+    'containsDirectories',
+    _$containsDirectories,
+    mode: FieldMode.member,
+  );
 
   @override
   final MappableFields<ReceiveSessionState> fields = const {
@@ -61,6 +110,8 @@ class ReceiveSessionStateMapper extends ClassMapperBase<ReceiveSessionState> {
     #saveToGallery: _f$saveToGallery,
     #createdDirectories: _f$createdDirectories,
     #responseHandler: _f$responseHandler,
+    #message: _f$message,
+    #containsDirectories: _f$containsDirectories,
   };
 
   static ReceiveSessionState _instantiate(DecodingData data) {
@@ -94,39 +145,70 @@ class ReceiveSessionStateMapper extends ClassMapperBase<ReceiveSessionState> {
 
 mixin ReceiveSessionStateMappable {
   String serialize() {
-    return ReceiveSessionStateMapper.ensureInitialized().encodeJson<ReceiveSessionState>(this as ReceiveSessionState);
+    return ReceiveSessionStateMapper.ensureInitialized()
+        .encodeJson<ReceiveSessionState>(this as ReceiveSessionState);
   }
 
   Map<String, dynamic> toJson() {
-    return ReceiveSessionStateMapper.ensureInitialized().encodeMap<ReceiveSessionState>(this as ReceiveSessionState);
+    return ReceiveSessionStateMapper.ensureInitialized()
+        .encodeMap<ReceiveSessionState>(this as ReceiveSessionState);
   }
 
-  ReceiveSessionStateCopyWith<ReceiveSessionState, ReceiveSessionState, ReceiveSessionState> get copyWith =>
+  ReceiveSessionStateCopyWith<
-      _ReceiveSessionStateCopyWithImpl(this as ReceiveSessionState, $identity, $identity);
+    ReceiveSessionState,
+    ReceiveSessionState,
+    ReceiveSessionState
+  >
+  get copyWith =>
+      _ReceiveSessionStateCopyWithImpl<
+        ReceiveSessionState,
+        ReceiveSessionState
+      >(this as ReceiveSessionState, $identity, $identity);
   @override
   String toString() {
-    return ReceiveSessionStateMapper.ensureInitialized().stringifyValue(this as ReceiveSessionState);
+    return ReceiveSessionStateMapper.ensureInitialized().stringifyValue(
+      this as ReceiveSessionState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return ReceiveSessionStateMapper.ensureInitialized().equalsValue(this as ReceiveSessionState, other);
+    return ReceiveSessionStateMapper.ensureInitialized().equalsValue(
+      this as ReceiveSessionState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return ReceiveSessionStateMapper.ensureInitialized().hashValue(this as ReceiveSessionState);
+    return ReceiveSessionStateMapper.ensureInitialized().hashValue(
+      this as ReceiveSessionState,
+    );
   }
 }
 
-extension ReceiveSessionStateValueCopy<$R, $Out> on ObjectCopyWith<$R, ReceiveSessionState, $Out> {
+extension ReceiveSessionStateValueCopy<$R, $Out>
-  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, $Out> get $asReceiveSessionState =>
+    on ObjectCopyWith<$R, ReceiveSessionState, $Out> {
-      $base.as((v, t, t2) => _ReceiveSessionStateCopyWithImpl(v, t, t2));
+  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, $Out>
+  get $asReceiveSessionState => $base.as(
+    (v, t, t2) => _ReceiveSessionStateCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class ReceiveSessionStateCopyWith<$R, $In extends ReceiveSessionState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class ReceiveSessionStateCopyWith<
+  $R,
+  $In extends ReceiveSessionState,
+  $Out
+>
+    implements ClassCopyWith<$R, $In, $Out> {
   DeviceCopyWith<$R, Device, Device> get sender;
-  MapCopyWith<$R, String, ReceivingFile, ReceivingFileCopyWith<$R, ReceivingFile, ReceivingFile>> get files;
+  MapCopyWith<
+    $R,
+    String,
+    ReceivingFile,
+    ReceivingFileCopyWith<$R, ReceivingFile, ReceivingFile>
+  >
+  get files;
   $R call({
     String? sessionId,
     SessionStatus? status,
@@ -141,20 +223,34 @@ abstract class ReceiveSessionStateCopyWith<$R, $In extends ReceiveSessionState,
     Set<String>? createdDirectories,
     StreamController<Map<String, String>?>? responseHandler,
   });
-  ReceiveSessionStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  ReceiveSessionStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _ReceiveSessionStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ReceiveSessionState, $Out>
+class _ReceiveSessionStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ReceiveSessionState, $Out>
     implements ReceiveSessionStateCopyWith<$R, ReceiveSessionState, $Out> {
   _ReceiveSessionStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<ReceiveSessionState> $mapper = ReceiveSessionStateMapper.ensureInitialized();
+  late final ClassMapperBase<ReceiveSessionState> $mapper =
+      ReceiveSessionStateMapper.ensureInitialized();
   @override
-  DeviceCopyWith<$R, Device, Device> get sender => $value.sender.copyWith.$chain((v) => call(sender: v));
+  DeviceCopyWith<$R, Device, Device> get sender =>
+      $value.sender.copyWith.$chain((v) => call(sender: v));
   @override
-  MapCopyWith<$R, String, ReceivingFile, ReceivingFileCopyWith<$R, ReceivingFile, ReceivingFile>> get files =>
+  MapCopyWith<
-      MapCopyWith($value.files, (v, t) => v.copyWith.$chain(t), (v) => call(files: v));
+    $R,
+    String,
+    ReceivingFile,
+    ReceivingFileCopyWith<$R, ReceivingFile, ReceivingFile>
+  >
+  get files => MapCopyWith(
+    $value.files,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(files: v),
+  );
   @override
   $R call({
     String? sessionId,
@@ -178,7 +274,8 @@ class _ReceiveSessionStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, R
       if (files != null) #files: files,
       if (startTime != $none) #startTime: startTime,
       if (endTime != $none) #endTime: endTime,
-      if (destinationDirectory != null) #destinationDirectory: destinationDirectory,
+      if (destinationDirectory != null)
+        #destinationDirectory: destinationDirectory,
       if (cacheDirectory != null) #cacheDirectory: cacheDirectory,
       if (saveToGallery != null) #saveToGallery: saveToGallery,
       if (createdDirectories != null) #createdDirectories: createdDirectories,
@@ -194,14 +291,22 @@ class _ReceiveSessionStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, R
     files: data.get(#files, or: $value.files),
     startTime: data.get(#startTime, or: $value.startTime),
     endTime: data.get(#endTime, or: $value.endTime),
-    destinationDirectory: data.get(#destinationDirectory, or: $value.destinationDirectory),
+    destinationDirectory: data.get(
+      #destinationDirectory,
+      or: $value.destinationDirectory,
+    ),
     cacheDirectory: data.get(#cacheDirectory, or: $value.cacheDirectory),
     saveToGallery: data.get(#saveToGallery, or: $value.saveToGallery),
-    createdDirectories: data.get(#createdDirectories, or: $value.createdDirectories),
+    createdDirectories: data.get(
+      #createdDirectories,
+      or: $value.createdDirectories,
+    ),
     responseHandler: data.get(#responseHandler, or: $value.responseHandler),
   );
 
   @override
-  ReceiveSessionStateCopyWith<$R2, ReceiveSessionState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  ReceiveSessionStateCopyWith<$R2, ReceiveSessionState, $Out2>
-      _ReceiveSessionStateCopyWithImpl($value, $cast, t);
+  $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+      _ReceiveSessionStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/server/receiving_file.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,17 +24,29 @@ class ReceivingFileMapper extends ClassMapperBase<ReceivingFile> {
   static FileDto _$file(ReceivingFile v) => v.file;
   static const Field<ReceivingFile, FileDto> _f$file = Field('file', _$file);
   static FileStatus _$status(ReceivingFile v) => v.status;
-  static const Field<ReceivingFile, FileStatus> _f$status = Field('status', _$status);
+  static const Field<ReceivingFile, FileStatus> _f$status = Field(
+    'status',
+    _$status,
+  );
   static String? _$token(ReceivingFile v) => v.token;
   static const Field<ReceivingFile, String> _f$token = Field('token', _$token);
   static String? _$desiredName(ReceivingFile v) => v.desiredName;
-  static const Field<ReceivingFile, String> _f$desiredName = Field('desiredName', _$desiredName);
+  static const Field<ReceivingFile, String> _f$desiredName = Field(
+    'desiredName',
+    _$desiredName,
+  );
   static String? _$path(ReceivingFile v) => v.path;
   static const Field<ReceivingFile, String> _f$path = Field('path', _$path);
   static bool _$savedToGallery(ReceivingFile v) => v.savedToGallery;
-  static const Field<ReceivingFile, bool> _f$savedToGallery = Field('savedToGallery', _$savedToGallery);
+  static const Field<ReceivingFile, bool> _f$savedToGallery = Field(
+    'savedToGallery',
+    _$savedToGallery,
+  );
   static String? _$errorMessage(ReceivingFile v) => v.errorMessage;
-  static const Field<ReceivingFile, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
+  static const Field<ReceivingFile, String> _f$errorMessage = Field(
+    'errorMessage',
+    _$errorMessage,
+  );
 
   @override
   final MappableFields<ReceivingFile> fields = const {
@@ -72,46 +85,74 @@ class ReceivingFileMapper extends ClassMapperBase<ReceivingFile> {
 
 mixin ReceivingFileMappable {
   String serialize() {
-    return ReceivingFileMapper.ensureInitialized().encodeJson<ReceivingFile>(this as ReceivingFile);
+    return ReceivingFileMapper.ensureInitialized().encodeJson<ReceivingFile>(
+      this as ReceivingFile,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return ReceivingFileMapper.ensureInitialized().encodeMap<ReceivingFile>(this as ReceivingFile);
+    return ReceivingFileMapper.ensureInitialized().encodeMap<ReceivingFile>(
+      this as ReceivingFile,
+    );
   }
 
-  ReceivingFileCopyWith<ReceivingFile, ReceivingFile, ReceivingFile> get copyWith =>
+  ReceivingFileCopyWith<ReceivingFile, ReceivingFile, ReceivingFile>
-      _ReceivingFileCopyWithImpl(this as ReceivingFile, $identity, $identity);
+  get copyWith => _ReceivingFileCopyWithImpl<ReceivingFile, ReceivingFile>(
+    this as ReceivingFile,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return ReceivingFileMapper.ensureInitialized().stringifyValue(this as ReceivingFile);
+    return ReceivingFileMapper.ensureInitialized().stringifyValue(
+      this as ReceivingFile,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return ReceivingFileMapper.ensureInitialized().equalsValue(this as ReceivingFile, other);
+    return ReceivingFileMapper.ensureInitialized().equalsValue(
+      this as ReceivingFile,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return ReceivingFileMapper.ensureInitialized().hashValue(this as ReceivingFile);
+    return ReceivingFileMapper.ensureInitialized().hashValue(
+      this as ReceivingFile,
+    );
   }
 }
 
-extension ReceivingFileValueCopy<$R, $Out> on ObjectCopyWith<$R, ReceivingFile, $Out> {
+extension ReceivingFileValueCopy<$R, $Out>
-  ReceivingFileCopyWith<$R, ReceivingFile, $Out> get $asReceivingFile => $base.as((v, t, t2) => _ReceivingFileCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, ReceivingFile, $Out> {
+  ReceivingFileCopyWith<$R, ReceivingFile, $Out> get $asReceivingFile =>
+      $base.as((v, t, t2) => _ReceivingFileCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class ReceivingFileCopyWith<$R, $In extends ReceivingFile, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class ReceivingFileCopyWith<$R, $In extends ReceivingFile, $Out>
-  $R call({FileDto? file, FileStatus? status, String? token, String? desiredName, String? path, bool? savedToGallery, String? errorMessage});
+    implements ClassCopyWith<$R, $In, $Out> {
+  $R call({
+    FileDto? file,
+    FileStatus? status,
+    String? token,
+    String? desiredName,
+    String? path,
+    bool? savedToGallery,
+    String? errorMessage,
+  });
   ReceivingFileCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _ReceivingFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ReceivingFile, $Out>
+class _ReceivingFileCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ReceivingFile, $Out>
     implements ReceivingFileCopyWith<$R, ReceivingFile, $Out> {
   _ReceivingFileCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<ReceivingFile> $mapper = ReceivingFileMapper.ensureInitialized();
+  late final ClassMapperBase<ReceivingFile> $mapper =
+      ReceivingFileMapper.ensureInitialized();
   @override
   $R call({
     FileDto? file,
@@ -144,5 +185,8 @@ class _ReceivingFileCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Receivi
   );
 
   @override
-  ReceivingFileCopyWith<$R2, ReceivingFile, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _ReceivingFileCopyWithImpl($value, $cast, t);
+  ReceivingFileCopyWith<$R2, ReceivingFile, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _ReceivingFileCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/server/server_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,7 +24,10 @@ class ServerStateMapper extends ClassMapperBase<ServerState> {
   final String id = 'ServerState';
 
   static SimpleServer _$httpServer(ServerState v) => v.httpServer;
-  static const Field<ServerState, SimpleServer> _f$httpServer = Field('httpServer', _$httpServer);
+  static const Field<ServerState, SimpleServer> _f$httpServer = Field(
+    'httpServer',
+    _$httpServer,
+  );
   static String _$alias(ServerState v) => v.alias;
   static const Field<ServerState, String> _f$alias = Field('alias', _$alias);
   static int _$port(ServerState v) => v.port;
@@ -31,11 +35,20 @@ class ServerStateMapper extends ClassMapperBase<ServerState> {
   static bool _$https(ServerState v) => v.https;
   static const Field<ServerState, bool> _f$https = Field('https', _$https);
   static ReceiveSessionState? _$session(ServerState v) => v.session;
-  static const Field<ServerState, ReceiveSessionState> _f$session = Field('session', _$session);
+  static const Field<ServerState, ReceiveSessionState> _f$session = Field(
+    'session',
+    _$session,
+  );
   static WebSendState? _$webSendState(ServerState v) => v.webSendState;
-  static const Field<ServerState, WebSendState> _f$webSendState = Field('webSendState', _$webSendState);
+  static const Field<ServerState, WebSendState> _f$webSendState = Field(
+    'webSendState',
+    _$webSendState,
+  );
   static Map<String, int> _$pinAttempts(ServerState v) => v.pinAttempts;
-  static const Field<ServerState, Map<String, int>> _f$pinAttempts = Field('pinAttempts', _$pinAttempts);
+  static const Field<ServerState, Map<String, int>> _f$pinAttempts = Field(
+    'pinAttempts',
+    _$pinAttempts,
+  );
 
   @override
   final MappableFields<ServerState> fields = const {
@@ -74,22 +87,36 @@ class ServerStateMapper extends ClassMapperBase<ServerState> {
 
 mixin ServerStateMappable {
   String serialize() {
-    return ServerStateMapper.ensureInitialized().encodeJson<ServerState>(this as ServerState);
+    return ServerStateMapper.ensureInitialized().encodeJson<ServerState>(
+      this as ServerState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return ServerStateMapper.ensureInitialized().encodeMap<ServerState>(this as ServerState);
+    return ServerStateMapper.ensureInitialized().encodeMap<ServerState>(
+      this as ServerState,
+    );
   }
 
-  ServerStateCopyWith<ServerState, ServerState, ServerState> get copyWith => _ServerStateCopyWithImpl(this as ServerState, $identity, $identity);
+  ServerStateCopyWith<ServerState, ServerState, ServerState> get copyWith =>
+      _ServerStateCopyWithImpl<ServerState, ServerState>(
+        this as ServerState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return ServerStateMapper.ensureInitialized().stringifyValue(this as ServerState);
+    return ServerStateMapper.ensureInitialized().stringifyValue(
+      this as ServerState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return ServerStateMapper.ensureInitialized().equalsValue(this as ServerState, other);
+    return ServerStateMapper.ensureInitialized().equalsValue(
+      this as ServerState,
+      other,
+    );
   }
 
   @override
@@ -98,12 +125,16 @@ mixin ServerStateMappable {
   }
 }
 
-extension ServerStateValueCopy<$R, $Out> on ObjectCopyWith<$R, ServerState, $Out> {
+extension ServerStateValueCopy<$R, $Out>
-  ServerStateCopyWith<$R, ServerState, $Out> get $asServerState => $base.as((v, t, t2) => _ServerStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, ServerState, $Out> {
+  ServerStateCopyWith<$R, ServerState, $Out> get $asServerState =>
+      $base.as((v, t, t2) => _ServerStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class ServerStateCopyWith<$R, $In extends ServerState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class ServerStateCopyWith<$R, $In extends ServerState, $Out>
-  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>? get session;
+    implements ClassCopyWith<$R, $In, $Out> {
+  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>?
+  get session;
   WebSendStateCopyWith<$R, WebSendState, WebSendState>? get webSendState;
   MapCopyWith<$R, String, int, ObjectCopyWith<$R, int, int>> get pinAttempts;
   $R call({
@@ -118,18 +149,27 @@ abstract class ServerStateCopyWith<$R, $In extends ServerState, $Out> implements
   ServerStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _ServerStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ServerState, $Out> implements ServerStateCopyWith<$R, ServerState, $Out> {
+class _ServerStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ServerState, $Out>
+    implements ServerStateCopyWith<$R, ServerState, $Out> {
   _ServerStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<ServerState> $mapper = ServerStateMapper.ensureInitialized();
+  late final ClassMapperBase<ServerState> $mapper =
+      ServerStateMapper.ensureInitialized();
   @override
-  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>? get session => $value.session?.copyWith.$chain((v) => call(session: v));
+  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>?
+  get session => $value.session?.copyWith.$chain((v) => call(session: v));
   @override
-  WebSendStateCopyWith<$R, WebSendState, WebSendState>? get webSendState => $value.webSendState?.copyWith.$chain((v) => call(webSendState: v));
+  WebSendStateCopyWith<$R, WebSendState, WebSendState>? get webSendState =>
+      $value.webSendState?.copyWith.$chain((v) => call(webSendState: v));
   @override
   MapCopyWith<$R, String, int, ObjectCopyWith<$R, int, int>> get pinAttempts =>
-      MapCopyWith($value.pinAttempts, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(pinAttempts: v));
+      MapCopyWith(
+        $value.pinAttempts,
+        (v, t) => ObjectCopyWith(v, $identity, t),
+        (v) => call(pinAttempts: v),
+      );
   @override
   $R call({
     SimpleServer? httpServer,
@@ -162,5 +202,8 @@ class _ServerStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ServerSta
   );
 
   @override
-  ServerStateCopyWith<$R2, ServerState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _ServerStateCopyWithImpl($value, $cast, t);
+  ServerStateCopyWith<$R2, ServerState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _ServerStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/model/state/settings_state.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -22,57 +23,130 @@ class SettingsStateMapper extends ClassMapperBase<SettingsState> {
   final String id = 'SettingsState';
 
   static String _$showToken(SettingsState v) => v.showToken;
-  static const Field<SettingsState, String> _f$showToken = Field('showToken', _$showToken);
+  static const Field<SettingsState, String> _f$showToken = Field(
+    'showToken',
+    _$showToken,
+  );
   static String _$alias(SettingsState v) => v.alias;
   static const Field<SettingsState, String> _f$alias = Field('alias', _$alias);
   static ThemeMode _$theme(SettingsState v) => v.theme;
-  static const Field<SettingsState, ThemeMode> _f$theme = Field('theme', _$theme);
+  static const Field<SettingsState, ThemeMode> _f$theme = Field(
+    'theme',
+    _$theme,
+  );
   static ColorMode _$colorMode(SettingsState v) => v.colorMode;
-  static const Field<SettingsState, ColorMode> _f$colorMode = Field('colorMode', _$colorMode);
+  static const Field<SettingsState, ColorMode> _f$colorMode = Field(
+    'colorMode',
+    _$colorMode,
+  );
   static AppLocale? _$locale(SettingsState v) => v.locale;
-  static const Field<SettingsState, AppLocale> _f$locale = Field('locale', _$locale);
+  static const Field<SettingsState, AppLocale> _f$locale = Field(
+    'locale',
+    _$locale,
+  );
   static int _$port(SettingsState v) => v.port;
   static const Field<SettingsState, int> _f$port = Field('port', _$port);
-  static List<String>? _$networkWhitelist(SettingsState v) => v.networkWhitelist;
+  static List<String>? _$networkWhitelist(SettingsState v) =>
-  static const Field<SettingsState, List<String>> _f$networkWhitelist = Field('networkWhitelist', _$networkWhitelist);
+      v.networkWhitelist;
-  static List<String>? _$networkBlacklist(SettingsState v) => v.networkBlacklist;
+  static const Field<SettingsState, List<String>> _f$networkWhitelist = Field(
-  static const Field<SettingsState, List<String>> _f$networkBlacklist = Field('networkBlacklist', _$networkBlacklist);
+    'networkWhitelist',
+    _$networkWhitelist,
+  );
+  static List<String>? _$networkBlacklist(SettingsState v) =>
+      v.networkBlacklist;
+  static const Field<SettingsState, List<String>> _f$networkBlacklist = Field(
+    'networkBlacklist',
+    _$networkBlacklist,
+  );
   static String _$multicastGroup(SettingsState v) => v.multicastGroup;
-  static const Field<SettingsState, String> _f$multicastGroup = Field('multicastGroup', _$multicastGroup);
+  static const Field<SettingsState, String> _f$multicastGroup = Field(
+    'multicastGroup',
+    _$multicastGroup,
+  );
   static String? _$destination(SettingsState v) => v.destination;
-  static const Field<SettingsState, String> _f$destination = Field('destination', _$destination);
+  static const Field<SettingsState, String> _f$destination = Field(
+    'destination',
+    _$destination,
+  );
   static bool _$saveToGallery(SettingsState v) => v.saveToGallery;
-  static const Field<SettingsState, bool> _f$saveToGallery = Field('saveToGallery', _$saveToGallery);
+  static const Field<SettingsState, bool> _f$saveToGallery = Field(
+    'saveToGallery',
+    _$saveToGallery,
+  );
   static bool _$saveToHistory(SettingsState v) => v.saveToHistory;
-  static const Field<SettingsState, bool> _f$saveToHistory = Field('saveToHistory', _$saveToHistory);
+  static const Field<SettingsState, bool> _f$saveToHistory = Field(
+    'saveToHistory',
+    _$saveToHistory,
+  );
   static bool _$quickSave(SettingsState v) => v.quickSave;
-  static const Field<SettingsState, bool> _f$quickSave = Field('quickSave', _$quickSave);
+  static const Field<SettingsState, bool> _f$quickSave = Field(
-  static bool _$quickSaveFromFavorites(SettingsState v) => v.quickSaveFromFavorites;
+    'quickSave',
-  static const Field<SettingsState, bool> _f$quickSaveFromFavorites = Field('quickSaveFromFavorites', _$quickSaveFromFavorites);
+    _$quickSave,
+  );
+  static bool _$quickSaveFromFavorites(SettingsState v) =>
+      v.quickSaveFromFavorites;
+  static const Field<SettingsState, bool> _f$quickSaveFromFavorites = Field(
+    'quickSaveFromFavorites',
+    _$quickSaveFromFavorites,
+  );
   static String? _$receivePin(SettingsState v) => v.receivePin;
-  static const Field<SettingsState, String> _f$receivePin = Field('receivePin', _$receivePin);
+  static const Field<SettingsState, String> _f$receivePin = Field(
+    'receivePin',
+    _$receivePin,
+  );
   static bool _$autoFinish(SettingsState v) => v.autoFinish;
-  static const Field<SettingsState, bool> _f$autoFinish = Field('autoFinish', _$autoFinish);
+  static const Field<SettingsState, bool> _f$autoFinish = Field(
+    'autoFinish',
+    _$autoFinish,
+  );
   static bool _$minimizeToTray(SettingsState v) => v.minimizeToTray;
-  static const Field<SettingsState, bool> _f$minimizeToTray = Field('minimizeToTray', _$minimizeToTray);
+  static const Field<SettingsState, bool> _f$minimizeToTray = Field(
+    'minimizeToTray',
+    _$minimizeToTray,
+  );
   static bool _$https(SettingsState v) => v.https;
   static const Field<SettingsState, bool> _f$https = Field('https', _$https);
   static SendMode _$sendMode(SettingsState v) => v.sendMode;
-  static const Field<SettingsState, SendMode> _f$sendMode = Field('sendMode', _$sendMode);
+  static const Field<SettingsState, SendMode> _f$sendMode = Field(
+    'sendMode',
+    _$sendMode,
+  );
   static bool _$saveWindowPlacement(SettingsState v) => v.saveWindowPlacement;
-  static const Field<SettingsState, bool> _f$saveWindowPlacement = Field('saveWindowPlacement', _$saveWindowPlacement);
+  static const Field<SettingsState, bool> _f$saveWindowPlacement = Field(
+    'saveWindowPlacement',
+    _$saveWindowPlacement,
+  );
   static bool _$enableAnimations(SettingsState v) => v.enableAnimations;
-  static const Field<SettingsState, bool> _f$enableAnimations = Field('enableAnimations', _$enableAnimations);
+  static const Field<SettingsState, bool> _f$enableAnimations = Field(
+    'enableAnimations',
+    _$enableAnimations,
+  );
   static DeviceType? _$deviceType(SettingsState v) => v.deviceType;
-  static const Field<SettingsState, DeviceType> _f$deviceType = Field('deviceType', _$deviceType);
+  static const Field<SettingsState, DeviceType> _f$deviceType = Field(
+    'deviceType',
+    _$deviceType,
+  );
   static String? _$deviceModel(SettingsState v) => v.deviceModel;
-  static const Field<SettingsState, String> _f$deviceModel = Field('deviceModel', _$deviceModel);
+  static const Field<SettingsState, String> _f$deviceModel = Field(
-  static bool _$shareViaLinkAutoAccept(SettingsState v) => v.shareViaLinkAutoAccept;
+    'deviceModel',
-  static const Field<SettingsState, bool> _f$shareViaLinkAutoAccept = Field('shareViaLinkAutoAccept', _$shareViaLinkAutoAccept);
+    _$deviceModel,
+  );
+  static bool _$shareViaLinkAutoAccept(SettingsState v) =>
+      v.shareViaLinkAutoAccept;
+  static const Field<SettingsState, bool> _f$shareViaLinkAutoAccept = Field(
+    'shareViaLinkAutoAccept',
+    _$shareViaLinkAutoAccept,
+  );
   static int _$discoveryTimeout(SettingsState v) => v.discoveryTimeout;
-  static const Field<SettingsState, int> _f$discoveryTimeout = Field('discoveryTimeout', _$discoveryTimeout);
+  static const Field<SettingsState, int> _f$discoveryTimeout = Field(
+    'discoveryTimeout',
+    _$discoveryTimeout,
+  );
   static bool _$advancedSettings(SettingsState v) => v.advancedSettings;
-  static const Field<SettingsState, bool> _f$advancedSettings = Field('advancedSettings', _$advancedSettings);
+  static const Field<SettingsState, bool> _f$advancedSettings = Field(
+    'advancedSettings',
+    _$advancedSettings,
+  );
 
   @override
   final MappableFields<SettingsState> fields = const {
@@ -149,38 +223,58 @@ class SettingsStateMapper extends ClassMapperBase<SettingsState> {
 
 mixin SettingsStateMappable {
   String serialize() {
-    return SettingsStateMapper.ensureInitialized().encodeJson<SettingsState>(this as SettingsState);
+    return SettingsStateMapper.ensureInitialized().encodeJson<SettingsState>(
+      this as SettingsState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return SettingsStateMapper.ensureInitialized().encodeMap<SettingsState>(this as SettingsState);
+    return SettingsStateMapper.ensureInitialized().encodeMap<SettingsState>(
+      this as SettingsState,
+    );
   }
 
-  SettingsStateCopyWith<SettingsState, SettingsState, SettingsState> get copyWith =>
+  SettingsStateCopyWith<SettingsState, SettingsState, SettingsState>
-      _SettingsStateCopyWithImpl(this as SettingsState, $identity, $identity);
+  get copyWith => _SettingsStateCopyWithImpl<SettingsState, SettingsState>(
+    this as SettingsState,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return SettingsStateMapper.ensureInitialized().stringifyValue(this as SettingsState);
+    return SettingsStateMapper.ensureInitialized().stringifyValue(
+      this as SettingsState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return SettingsStateMapper.ensureInitialized().equalsValue(this as SettingsState, other);
+    return SettingsStateMapper.ensureInitialized().equalsValue(
+      this as SettingsState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return SettingsStateMapper.ensureInitialized().hashValue(this as SettingsState);
+    return SettingsStateMapper.ensureInitialized().hashValue(
+      this as SettingsState,
+    );
   }
 }
 
-extension SettingsStateValueCopy<$R, $Out> on ObjectCopyWith<$R, SettingsState, $Out> {
+extension SettingsStateValueCopy<$R, $Out>
-  SettingsStateCopyWith<$R, SettingsState, $Out> get $asSettingsState => $base.as((v, t, t2) => _SettingsStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, SettingsState, $Out> {
+  SettingsStateCopyWith<$R, SettingsState, $Out> get $asSettingsState =>
+      $base.as((v, t, t2) => _SettingsStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class SettingsStateCopyWith<$R, $In extends SettingsState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class SettingsStateCopyWith<$R, $In extends SettingsState, $Out>
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>? get networkWhitelist;
+    implements ClassCopyWith<$R, $In, $Out> {
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>? get networkBlacklist;
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>?
+  get networkWhitelist;
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>?
+  get networkBlacklist;
   $R call({
     String? showToken,
     String? alias,
@@ -212,19 +306,31 @@ abstract class SettingsStateCopyWith<$R, $In extends SettingsState, $Out> implem
   SettingsStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _SettingsStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SettingsState, $Out>
+class _SettingsStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, SettingsState, $Out>
     implements SettingsStateCopyWith<$R, SettingsState, $Out> {
   _SettingsStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<SettingsState> $mapper = SettingsStateMapper.ensureInitialized();
+  late final ClassMapperBase<SettingsState> $mapper =
+      SettingsStateMapper.ensureInitialized();
   @override
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>? get networkWhitelist => $value.networkWhitelist != null
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>?
-      ? ListCopyWith($value.networkWhitelist!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(networkWhitelist: v))
+  get networkWhitelist => $value.networkWhitelist != null
+      ? ListCopyWith(
+          $value.networkWhitelist!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(networkWhitelist: v),
+        )
       : null;
   @override
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>? get networkBlacklist => $value.networkBlacklist != null
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>?
-      ? ListCopyWith($value.networkBlacklist!, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(networkBlacklist: v))
+  get networkBlacklist => $value.networkBlacklist != null
+      ? ListCopyWith(
+          $value.networkBlacklist!,
+          (v, t) => ObjectCopyWith(v, $identity, t),
+          (v) => call(networkBlacklist: v),
+        )
       : null;
   @override
   $R call({
@@ -269,17 +375,20 @@ class _SettingsStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Setting
       if (saveToGallery != null) #saveToGallery: saveToGallery,
       if (saveToHistory != null) #saveToHistory: saveToHistory,
       if (quickSave != null) #quickSave: quickSave,
-      if (quickSaveFromFavorites != null) #quickSaveFromFavorites: quickSaveFromFavorites,
+      if (quickSaveFromFavorites != null)
+        #quickSaveFromFavorites: quickSaveFromFavorites,
       if (receivePin != $none) #receivePin: receivePin,
       if (autoFinish != null) #autoFinish: autoFinish,
       if (minimizeToTray != null) #minimizeToTray: minimizeToTray,
       if (https != null) #https: https,
       if (sendMode != null) #sendMode: sendMode,
-      if (saveWindowPlacement != null) #saveWindowPlacement: saveWindowPlacement,
+      if (saveWindowPlacement != null)
+        #saveWindowPlacement: saveWindowPlacement,
       if (enableAnimations != null) #enableAnimations: enableAnimations,
       if (deviceType != $none) #deviceType: deviceType,
       if (deviceModel != $none) #deviceModel: deviceModel,
-      if (shareViaLinkAutoAccept != null) #shareViaLinkAutoAccept: shareViaLinkAutoAccept,
+      if (shareViaLinkAutoAccept != null)
+        #shareViaLinkAutoAccept: shareViaLinkAutoAccept,
       if (discoveryTimeout != null) #discoveryTimeout: discoveryTimeout,
       if (advancedSettings != null) #advancedSettings: advancedSettings,
     }),
@@ -299,21 +408,33 @@ class _SettingsStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Setting
     saveToGallery: data.get(#saveToGallery, or: $value.saveToGallery),
     saveToHistory: data.get(#saveToHistory, or: $value.saveToHistory),
     quickSave: data.get(#quickSave, or: $value.quickSave),
-    quickSaveFromFavorites: data.get(#quickSaveFromFavorites, or: $value.quickSaveFromFavorites),
+    quickSaveFromFavorites: data.get(
+      #quickSaveFromFavorites,
+      or: $value.quickSaveFromFavorites,
+    ),
     receivePin: data.get(#receivePin, or: $value.receivePin),
     autoFinish: data.get(#autoFinish, or: $value.autoFinish),
     minimizeToTray: data.get(#minimizeToTray, or: $value.minimizeToTray),
     https: data.get(#https, or: $value.https),
     sendMode: data.get(#sendMode, or: $value.sendMode),
-    saveWindowPlacement: data.get(#saveWindowPlacement, or: $value.saveWindowPlacement),
+    saveWindowPlacement: data.get(
+      #saveWindowPlacement,
+      or: $value.saveWindowPlacement,
+    ),
     enableAnimations: data.get(#enableAnimations, or: $value.enableAnimations),
     deviceType: data.get(#deviceType, or: $value.deviceType),
     deviceModel: data.get(#deviceModel, or: $value.deviceModel),
-    shareViaLinkAutoAccept: data.get(#shareViaLinkAutoAccept, or: $value.shareViaLinkAutoAccept),
+    shareViaLinkAutoAccept: data.get(
+      #shareViaLinkAutoAccept,
+      or: $value.shareViaLinkAutoAccept,
+    ),
     discoveryTimeout: data.get(#discoveryTimeout, or: $value.discoveryTimeout),
     advancedSettings: data.get(#advancedSettings, or: $value.advancedSettings),
   );
 
   @override
-  SettingsStateCopyWith<$R2, SettingsState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _SettingsStateCopyWithImpl($value, $cast, t);
+  SettingsStateCopyWith<$R2, SettingsState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _SettingsStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/pages/tabs/settings_tab_vm.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -23,71 +24,160 @@ class SettingsTabVmMapper extends ClassMapperBase<SettingsTabVm> {
   final String id = 'SettingsTabVm';
 
   static bool _$advanced(SettingsTabVm v) => v.advanced;
-  static const Field<SettingsTabVm, bool> _f$advanced = Field('advanced', _$advanced);
+  static const Field<SettingsTabVm, bool> _f$advanced = Field(
-  static TextEditingController _$aliasController(SettingsTabVm v) => v.aliasController;
+    'advanced',
-  static const Field<SettingsTabVm, TextEditingController> _f$aliasController = Field('aliasController', _$aliasController);
+    _$advanced,
-  static TextEditingController _$deviceModelController(SettingsTabVm v) => v.deviceModelController;
+  );
-  static const Field<SettingsTabVm, TextEditingController> _f$deviceModelController = Field('deviceModelController', _$deviceModelController);
+  static TextEditingController _$aliasController(SettingsTabVm v) =>
-  static TextEditingController _$portController(SettingsTabVm v) => v.portController;
+      v.aliasController;
-  static const Field<SettingsTabVm, TextEditingController> _f$portController = Field('portController', _$portController);
+  static const Field<SettingsTabVm, TextEditingController> _f$aliasController =
-  static TextEditingController _$timeoutController(SettingsTabVm v) => v.timeoutController;
+      Field('aliasController', _$aliasController);
-  static const Field<SettingsTabVm, TextEditingController> _f$timeoutController = Field('timeoutController', _$timeoutController);
+  static TextEditingController _$deviceModelController(SettingsTabVm v) =>
-  static TextEditingController _$multicastController(SettingsTabVm v) => v.multicastController;
+      v.deviceModelController;
-  static const Field<SettingsTabVm, TextEditingController> _f$multicastController = Field('multicastController', _$multicastController);
+  static const Field<SettingsTabVm, TextEditingController>
+  _f$deviceModelController = Field(
+    'deviceModelController',
+    _$deviceModelController,
+  );
+  static TextEditingController _$portController(SettingsTabVm v) =>
+      v.portController;
+  static const Field<SettingsTabVm, TextEditingController> _f$portController =
+      Field('portController', _$portController);
+  static TextEditingController _$timeoutController(SettingsTabVm v) =>
+      v.timeoutController;
+  static const Field<SettingsTabVm, TextEditingController>
+  _f$timeoutController = Field('timeoutController', _$timeoutController);
+  static TextEditingController _$multicastController(SettingsTabVm v) =>
+      v.multicastController;
+  static const Field<SettingsTabVm, TextEditingController>
+  _f$multicastController = Field('multicastController', _$multicastController);
   static SettingsState _$settings(SettingsTabVm v) => v.settings;
-  static const Field<SettingsTabVm, SettingsState> _f$settings = Field('settings', _$settings);
+  static const Field<SettingsTabVm, SettingsState> _f$settings = Field(
+    'settings',
+    _$settings,
+  );
   static ServerState? _$serverState(SettingsTabVm v) => v.serverState;
-  static const Field<SettingsTabVm, ServerState> _f$serverState = Field('serverState', _$serverState);
+  static const Field<SettingsTabVm, ServerState> _f$serverState = Field(
+    'serverState',
+    _$serverState,
+  );
   static DeviceInfoResult _$deviceInfo(SettingsTabVm v) => v.deviceInfo;
-  static const Field<SettingsTabVm, DeviceInfoResult> _f$deviceInfo = Field('deviceInfo', _$deviceInfo);
+  static const Field<SettingsTabVm, DeviceInfoResult> _f$deviceInfo = Field(
+    'deviceInfo',
+    _$deviceInfo,
+  );
   static List<ColorMode> _$colorModes(SettingsTabVm v) => v.colorModes;
-  static const Field<SettingsTabVm, List<ColorMode>> _f$colorModes = Field('colorModes', _$colorModes);
+  static const Field<SettingsTabVm, List<ColorMode>> _f$colorModes = Field(
+    'colorModes',
+    _$colorModes,
+  );
   static bool _$autoStart(SettingsTabVm v) => v.autoStart;
-  static const Field<SettingsTabVm, bool> _f$autoStart = Field('autoStart', _$autoStart);
+  static const Field<SettingsTabVm, bool> _f$autoStart = Field(
-  static bool _$autoStartLaunchHidden(SettingsTabVm v) => v.autoStartLaunchHidden;
+    'autoStart',
-  static const Field<SettingsTabVm, bool> _f$autoStartLaunchHidden = Field('autoStartLaunchHidden', _$autoStartLaunchHidden);
+    _$autoStart,
+  );
+  static bool _$autoStartLaunchHidden(SettingsTabVm v) =>
+      v.autoStartLaunchHidden;
+  static const Field<SettingsTabVm, bool> _f$autoStartLaunchHidden = Field(
+    'autoStartLaunchHidden',
+    _$autoStartLaunchHidden,
+  );
   static bool _$showInContextMenu(SettingsTabVm v) => v.showInContextMenu;
-  static const Field<SettingsTabVm, bool> _f$showInContextMenu = Field('showInContextMenu', _$showInContextMenu);
+  static const Field<SettingsTabVm, bool> _f$showInContextMenu = Field(
-  static Function _$onChangeTheme(SettingsTabVm v) => (v as dynamic).onChangeTheme as Function;
+    'showInContextMenu',
-  static dynamic _arg$onChangeTheme(f) => f<void Function(BuildContext, ThemeMode)>();
+    _$showInContextMenu,
-  static const Field<SettingsTabVm, Function> _f$onChangeTheme = Field('onChangeTheme', _$onChangeTheme, arg: _arg$onChangeTheme);
+  );
-  static Function _$onChangeColorMode(SettingsTabVm v) => (v as dynamic).onChangeColorMode as Function;
+  static Function _$onChangeTheme(SettingsTabVm v) =>
+      (v as dynamic).onChangeTheme as Function;
+  static dynamic _arg$onChangeTheme(f) =>
+      f<void Function(BuildContext, ThemeMode)>();
+  static const Field<SettingsTabVm, Function> _f$onChangeTheme = Field(
+    'onChangeTheme',
+    _$onChangeTheme,
+    arg: _arg$onChangeTheme,
+  );
+  static Function _$onChangeColorMode(SettingsTabVm v) =>
+      (v as dynamic).onChangeColorMode as Function;
   static dynamic _arg$onChangeColorMode(f) => f<void Function(ColorMode)>();
-  static const Field<SettingsTabVm, Function> _f$onChangeColorMode = Field('onChangeColorMode', _$onChangeColorMode, arg: _arg$onChangeColorMode);
+  static const Field<SettingsTabVm, Function> _f$onChangeColorMode = Field(
-  static Function _$onTapLanguage(SettingsTabVm v) => (v as dynamic).onTapLanguage as Function;
+    'onChangeColorMode',
+    _$onChangeColorMode,
+    arg: _arg$onChangeColorMode,
+  );
+  static Function _$onTapLanguage(SettingsTabVm v) =>
+      (v as dynamic).onTapLanguage as Function;
   static dynamic _arg$onTapLanguage(f) => f<void Function(BuildContext)>();
-  static const Field<SettingsTabVm, Function> _f$onTapLanguage = Field('onTapLanguage', _$onTapLanguage, arg: _arg$onTapLanguage);
+  static const Field<SettingsTabVm, Function> _f$onTapLanguage = Field(
-  static Function _$onToggleAutoStart(SettingsTabVm v) => (v as dynamic).onToggleAutoStart as Function;
+    'onTapLanguage',
+    _$onTapLanguage,
+    arg: _arg$onTapLanguage,
+  );
+  static Function _$onToggleAutoStart(SettingsTabVm v) =>
+      (v as dynamic).onToggleAutoStart as Function;
   static dynamic _arg$onToggleAutoStart(f) => f<void Function(BuildContext)>();
-  static const Field<SettingsTabVm, Function> _f$onToggleAutoStart = Field('onToggleAutoStart', _$onToggleAutoStart, arg: _arg$onToggleAutoStart);
+  static const Field<SettingsTabVm, Function> _f$onToggleAutoStart = Field(
-  static Function _$onToggleAutoStartLaunchHidden(SettingsTabVm v) => (v as dynamic).onToggleAutoStartLaunchHidden as Function;
+    'onToggleAutoStart',
-  static dynamic _arg$onToggleAutoStartLaunchHidden(f) => f<void Function(BuildContext)>();
+    _$onToggleAutoStart,
-  static const Field<SettingsTabVm, Function> _f$onToggleAutoStartLaunchHidden = Field(
+    arg: _arg$onToggleAutoStart,
-    'onToggleAutoStartLaunchHidden',
-    _$onToggleAutoStartLaunchHidden,
-    arg: _arg$onToggleAutoStartLaunchHidden,
   );
-  static Function _$onToggleShowInContextMenu(SettingsTabVm v) => (v as dynamic).onToggleShowInContextMenu as Function;
+  static Function _$onToggleAutoStartLaunchHidden(SettingsTabVm v) =>
-  static dynamic _arg$onToggleShowInContextMenu(f) => f<void Function(BuildContext)>();
+      (v as dynamic).onToggleAutoStartLaunchHidden as Function;
-  static const Field<SettingsTabVm, Function> _f$onToggleShowInContextMenu = Field(
+  static dynamic _arg$onToggleAutoStartLaunchHidden(f) =>
-    'onToggleShowInContextMenu',
+      f<void Function(BuildContext)>();
-    _$onToggleShowInContextMenu,
+  static const Field<SettingsTabVm, Function> _f$onToggleAutoStartLaunchHidden =
-    arg: _arg$onToggleShowInContextMenu,
+      Field(
-  );
+        'onToggleAutoStartLaunchHidden',
-  static Function _$onTapRestartServer(SettingsTabVm v) => (v as dynamic).onTapRestartServer as Function;
+        _$onToggleAutoStartLaunchHidden,
+        arg: _arg$onToggleAutoStartLaunchHidden,
+      );
+  static Function _$onToggleShowInContextMenu(SettingsTabVm v) =>
+      (v as dynamic).onToggleShowInContextMenu as Function;
+  static dynamic _arg$onToggleShowInContextMenu(f) =>
+      f<void Function(BuildContext)>();
+  static const Field<SettingsTabVm, Function> _f$onToggleShowInContextMenu =
+      Field(
+        'onToggleShowInContextMenu',
+        _$onToggleShowInContextMenu,
+        arg: _arg$onToggleShowInContextMenu,
+      );
+  static Function _$onTapRestartServer(SettingsTabVm v) =>
+      (v as dynamic).onTapRestartServer as Function;
   static dynamic _arg$onTapRestartServer(f) => f<void Function(BuildContext)>();
-  static const Field<SettingsTabVm, Function> _f$onTapRestartServer = Field('onTapRestartServer', _$onTapRestartServer, arg: _arg$onTapRestartServer);
+  static const Field<SettingsTabVm, Function> _f$onTapRestartServer = Field(
-  static Function _$onTapStartServer(SettingsTabVm v) => (v as dynamic).onTapStartServer as Function;
+    'onTapRestartServer',
+    _$onTapRestartServer,
+    arg: _arg$onTapRestartServer,
+  );
+  static Function _$onTapStartServer(SettingsTabVm v) =>
+      (v as dynamic).onTapStartServer as Function;
   static dynamic _arg$onTapStartServer(f) => f<void Function(BuildContext)>();
-  static const Field<SettingsTabVm, Function> _f$onTapStartServer = Field('onTapStartServer', _$onTapStartServer, arg: _arg$onTapStartServer);
+  static const Field<SettingsTabVm, Function> _f$onTapStartServer = Field(
-  static Function _$onTapStopServer(SettingsTabVm v) => (v as dynamic).onTapStopServer as Function;
+    'onTapStartServer',
+    _$onTapStartServer,
+    arg: _arg$onTapStartServer,
+  );
+  static Function _$onTapStopServer(SettingsTabVm v) =>
+      (v as dynamic).onTapStopServer as Function;
   static dynamic _arg$onTapStopServer(f) => f<void Function()>();
-  static const Field<SettingsTabVm, Function> _f$onTapStopServer = Field('onTapStopServer', _$onTapStopServer, arg: _arg$onTapStopServer);
+  static const Field<SettingsTabVm, Function> _f$onTapStopServer = Field(
-  static Function _$onTapAdvanced(SettingsTabVm v) => (v as dynamic).onTapAdvanced as Function;
+    'onTapStopServer',
+    _$onTapStopServer,
+    arg: _arg$onTapStopServer,
+  );
+  static Function _$onTapAdvanced(SettingsTabVm v) =>
+      (v as dynamic).onTapAdvanced as Function;
   static dynamic _arg$onTapAdvanced(f) => f<void Function(bool)>();
-  static const Field<SettingsTabVm, Function> _f$onTapAdvanced = Field('onTapAdvanced', _$onTapAdvanced, arg: _arg$onTapAdvanced);
+  static const Field<SettingsTabVm, Function> _f$onTapAdvanced = Field(
+    'onTapAdvanced',
+    _$onTapAdvanced,
+    arg: _arg$onTapAdvanced,
+  );
   static List<ThemeMode> _$themeModes(SettingsTabVm v) => v.themeModes;
-  static const Field<SettingsTabVm, List<ThemeMode>> _f$themeModes = Field('themeModes', _$themeModes, mode: FieldMode.member);
+  static const Field<SettingsTabVm, List<ThemeMode>> _f$themeModes = Field(
+    'themeModes',
+    _$themeModes,
+    mode: FieldMode.member,
+  );
 
   @override
   final MappableFields<SettingsTabVm> fields = const {
@@ -159,39 +249,58 @@ class SettingsTabVmMapper extends ClassMapperBase<SettingsTabVm> {
 
 mixin SettingsTabVmMappable {
   String serialize() {
-    return SettingsTabVmMapper.ensureInitialized().encodeJson<SettingsTabVm>(this as SettingsTabVm);
+    return SettingsTabVmMapper.ensureInitialized().encodeJson<SettingsTabVm>(
+      this as SettingsTabVm,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return SettingsTabVmMapper.ensureInitialized().encodeMap<SettingsTabVm>(this as SettingsTabVm);
+    return SettingsTabVmMapper.ensureInitialized().encodeMap<SettingsTabVm>(
+      this as SettingsTabVm,
+    );
   }
 
-  SettingsTabVmCopyWith<SettingsTabVm, SettingsTabVm, SettingsTabVm> get copyWith =>
+  SettingsTabVmCopyWith<SettingsTabVm, SettingsTabVm, SettingsTabVm>
-      _SettingsTabVmCopyWithImpl(this as SettingsTabVm, $identity, $identity);
+  get copyWith => _SettingsTabVmCopyWithImpl<SettingsTabVm, SettingsTabVm>(
+    this as SettingsTabVm,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return SettingsTabVmMapper.ensureInitialized().stringifyValue(this as SettingsTabVm);
+    return SettingsTabVmMapper.ensureInitialized().stringifyValue(
+      this as SettingsTabVm,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return SettingsTabVmMapper.ensureInitialized().equalsValue(this as SettingsTabVm, other);
+    return SettingsTabVmMapper.ensureInitialized().equalsValue(
+      this as SettingsTabVm,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return SettingsTabVmMapper.ensureInitialized().hashValue(this as SettingsTabVm);
+    return SettingsTabVmMapper.ensureInitialized().hashValue(
+      this as SettingsTabVm,
+    );
   }
 }
 
-extension SettingsTabVmValueCopy<$R, $Out> on ObjectCopyWith<$R, SettingsTabVm, $Out> {
+extension SettingsTabVmValueCopy<$R, $Out>
-  SettingsTabVmCopyWith<$R, SettingsTabVm, $Out> get $asSettingsTabVm => $base.as((v, t, t2) => _SettingsTabVmCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, SettingsTabVm, $Out> {
+  SettingsTabVmCopyWith<$R, SettingsTabVm, $Out> get $asSettingsTabVm =>
+      $base.as((v, t, t2) => _SettingsTabVmCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class SettingsTabVmCopyWith<$R, $In extends SettingsTabVm, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class SettingsTabVmCopyWith<$R, $In extends SettingsTabVm, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   SettingsStateCopyWith<$R, SettingsState, SettingsState> get settings;
   ServerStateCopyWith<$R, ServerState, ServerState>? get serverState;
-  ListCopyWith<$R, ColorMode, ObjectCopyWith<$R, ColorMode, ColorMode>> get colorModes;
+  ListCopyWith<$R, ColorMode, ObjectCopyWith<$R, ColorMode, ColorMode>>
+  get colorModes;
   $R call({
     bool? advanced,
     TextEditingController? aliasController,
@@ -220,19 +329,27 @@ abstract class SettingsTabVmCopyWith<$R, $In extends SettingsTabVm, $Out> implem
   SettingsTabVmCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _SettingsTabVmCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SettingsTabVm, $Out>
+class _SettingsTabVmCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, SettingsTabVm, $Out>
     implements SettingsTabVmCopyWith<$R, SettingsTabVm, $Out> {
   _SettingsTabVmCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<SettingsTabVm> $mapper = SettingsTabVmMapper.ensureInitialized();
+  late final ClassMapperBase<SettingsTabVm> $mapper =
+      SettingsTabVmMapper.ensureInitialized();
   @override
-  SettingsStateCopyWith<$R, SettingsState, SettingsState> get settings => $value.settings.copyWith.$chain((v) => call(settings: v));
+  SettingsStateCopyWith<$R, SettingsState, SettingsState> get settings =>
+      $value.settings.copyWith.$chain((v) => call(settings: v));
   @override
-  ServerStateCopyWith<$R, ServerState, ServerState>? get serverState => $value.serverState?.copyWith.$chain((v) => call(serverState: v));
+  ServerStateCopyWith<$R, ServerState, ServerState>? get serverState =>
+      $value.serverState?.copyWith.$chain((v) => call(serverState: v));
   @override
-  ListCopyWith<$R, ColorMode, ObjectCopyWith<$R, ColorMode, ColorMode>> get colorModes =>
+  ListCopyWith<$R, ColorMode, ObjectCopyWith<$R, ColorMode, ColorMode>>
-      ListCopyWith($value.colorModes, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(colorModes: v));
+  get colorModes => ListCopyWith(
+    $value.colorModes,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(colorModes: v),
+  );
   @override
   $R call({
     bool? advanced,
@@ -262,23 +379,28 @@ class _SettingsTabVmCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Setting
     FieldCopyWithData({
       if (advanced != null) #advanced: advanced,
       if (aliasController != null) #aliasController: aliasController,
-      if (deviceModelController != null) #deviceModelController: deviceModelController,
+      if (deviceModelController != null)
+        #deviceModelController: deviceModelController,
       if (portController != null) #portController: portController,
       if (timeoutController != null) #timeoutController: timeoutController,
-      if (multicastController != null) #multicastController: multicastController,
+      if (multicastController != null)
+        #multicastController: multicastController,
       if (settings != null) #settings: settings,
       if (serverState != $none) #serverState: serverState,
       if (deviceInfo != null) #deviceInfo: deviceInfo,
       if (colorModes != null) #colorModes: colorModes,
       if (autoStart != null) #autoStart: autoStart,
-      if (autoStartLaunchHidden != null) #autoStartLaunchHidden: autoStartLaunchHidden,
+      if (autoStartLaunchHidden != null)
+        #autoStartLaunchHidden: autoStartLaunchHidden,
       if (showInContextMenu != null) #showInContextMenu: showInContextMenu,
       if (onChangeTheme != null) #onChangeTheme: onChangeTheme,
       if (onChangeColorMode != null) #onChangeColorMode: onChangeColorMode,
       if (onTapLanguage != null) #onTapLanguage: onTapLanguage,
       if (onToggleAutoStart != null) #onToggleAutoStart: onToggleAutoStart,
-      if (onToggleAutoStartLaunchHidden != null) #onToggleAutoStartLaunchHidden: onToggleAutoStartLaunchHidden,
+      if (onToggleAutoStartLaunchHidden != null)
-      if (onToggleShowInContextMenu != null) #onToggleShowInContextMenu: onToggleShowInContextMenu,
+        #onToggleAutoStartLaunchHidden: onToggleAutoStartLaunchHidden,
+      if (onToggleShowInContextMenu != null)
+        #onToggleShowInContextMenu: onToggleShowInContextMenu,
       if (onTapRestartServer != null) #onTapRestartServer: onTapRestartServer,
       if (onTapStartServer != null) #onTapStartServer: onTapStartServer,
       if (onTapStopServer != null) #onTapStopServer: onTapStopServer,
@@ -289,29 +411,62 @@ class _SettingsTabVmCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Setting
   SettingsTabVm $make(CopyWithData data) => SettingsTabVm(
     advanced: data.get(#advanced, or: $value.advanced),
     aliasController: data.get(#aliasController, or: $value.aliasController),
-    deviceModelController: data.get(#deviceModelController, or: $value.deviceModelController),
+    deviceModelController: data.get(
+      #deviceModelController,
+      or: $value.deviceModelController,
+    ),
     portController: data.get(#portController, or: $value.portController),
-    timeoutController: data.get(#timeoutController, or: $value.timeoutController),
+    timeoutController: data.get(
-    multicastController: data.get(#multicastController, or: $value.multicastController),
+      #timeoutController,
+      or: $value.timeoutController,
+    ),
+    multicastController: data.get(
+      #multicastController,
+      or: $value.multicastController,
+    ),
     settings: data.get(#settings, or: $value.settings),
     serverState: data.get(#serverState, or: $value.serverState),
     deviceInfo: data.get(#deviceInfo, or: $value.deviceInfo),
     colorModes: data.get(#colorModes, or: $value.colorModes),
     autoStart: data.get(#autoStart, or: $value.autoStart),
-    autoStartLaunchHidden: data.get(#autoStartLaunchHidden, or: $value.autoStartLaunchHidden),
+    autoStartLaunchHidden: data.get(
-    showInContextMenu: data.get(#showInContextMenu, or: $value.showInContextMenu),
+      #autoStartLaunchHidden,
+      or: $value.autoStartLaunchHidden,
+    ),
+    showInContextMenu: data.get(
+      #showInContextMenu,
+      or: $value.showInContextMenu,
+    ),
     onChangeTheme: data.get(#onChangeTheme, or: $value.onChangeTheme),
-    onChangeColorMode: data.get(#onChangeColorMode, or: $value.onChangeColorMode),
+    onChangeColorMode: data.get(
+      #onChangeColorMode,
+      or: $value.onChangeColorMode,
+    ),
     onTapLanguage: data.get(#onTapLanguage, or: $value.onTapLanguage),
-    onToggleAutoStart: data.get(#onToggleAutoStart, or: $value.onToggleAutoStart),
+    onToggleAutoStart: data.get(
-    onToggleAutoStartLaunchHidden: data.get(#onToggleAutoStartLaunchHidden, or: $value.onToggleAutoStartLaunchHidden),
+      #onToggleAutoStart,
-    onToggleShowInContextMenu: data.get(#onToggleShowInContextMenu, or: $value.onToggleShowInContextMenu),
+      or: $value.onToggleAutoStart,
-    onTapRestartServer: data.get(#onTapRestartServer, or: $value.onTapRestartServer),
+    ),
+    onToggleAutoStartLaunchHidden: data.get(
+      #onToggleAutoStartLaunchHidden,
+      or: $value.onToggleAutoStartLaunchHidden,
+    ),
+    onToggleShowInContextMenu: data.get(
+      #onToggleShowInContextMenu,
+      or: $value.onToggleShowInContextMenu,
+    ),
+    onTapRestartServer: data.get(
+      #onTapRestartServer,
+      or: $value.onTapRestartServer,
+    ),
     onTapStartServer: data.get(#onTapStartServer, or: $value.onTapStartServer),
     onTapStopServer: data.get(#onTapStopServer, or: $value.onTapStopServer),
     onTapAdvanced: data.get(#onTapAdvanced, or: $value.onTapAdvanced),
   );
 
   @override
-  SettingsTabVmCopyWith<$R2, SettingsTabVm, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _SettingsTabVmCopyWithImpl($value, $cast, t);
+  SettingsTabVmCopyWith<$R2, SettingsTabVm, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _SettingsTabVmCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/provider/network/webrtc/signaling_provider.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -20,12 +21,21 @@ class SignalingStateMapper extends ClassMapperBase<SignalingState> {
   @override
   final String id = 'SignalingState';
 
-  static List<String> _$signalingServers(SignalingState v) => v.signalingServers;
+  static List<String> _$signalingServers(SignalingState v) =>
-  static const Field<SignalingState, List<String>> _f$signalingServers = Field('signalingServers', _$signalingServers);
+      v.signalingServers;
+  static const Field<SignalingState, List<String>> _f$signalingServers = Field(
+    'signalingServers',
+    _$signalingServers,
+  );
   static List<String> _$stunServers(SignalingState v) => v.stunServers;
-  static const Field<SignalingState, List<String>> _f$stunServers = Field('stunServers', _$stunServers);
+  static const Field<SignalingState, List<String>> _f$stunServers = Field(
-  static Map<String, LsSignalingConnection> _$connections(SignalingState v) => v.connections;
+    'stunServers',
-  static const Field<SignalingState, Map<String, LsSignalingConnection>> _f$connections = Field('connections', _$connections);
+    _$stunServers,
+  );
+  static Map<String, LsSignalingConnection> _$connections(SignalingState v) =>
+      v.connections;
+  static const Field<SignalingState, Map<String, LsSignalingConnection>>
+  _f$connections = Field('connections', _$connections);
 
   @override
   final MappableFields<SignalingState> fields = const {
@@ -56,60 +66,114 @@ class SignalingStateMapper extends ClassMapperBase<SignalingState> {
 
 mixin SignalingStateMappable {
   String serialize() {
-    return SignalingStateMapper.ensureInitialized().encodeJson<SignalingState>(this as SignalingState);
+    return SignalingStateMapper.ensureInitialized().encodeJson<SignalingState>(
+      this as SignalingState,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return SignalingStateMapper.ensureInitialized().encodeMap<SignalingState>(this as SignalingState);
+    return SignalingStateMapper.ensureInitialized().encodeMap<SignalingState>(
+      this as SignalingState,
+    );
   }
 
-  SignalingStateCopyWith<SignalingState, SignalingState, SignalingState> get copyWith =>
+  SignalingStateCopyWith<SignalingState, SignalingState, SignalingState>
-      _SignalingStateCopyWithImpl(this as SignalingState, $identity, $identity);
+  get copyWith => _SignalingStateCopyWithImpl<SignalingState, SignalingState>(
+    this as SignalingState,
+    $identity,
+    $identity,
+  );
   @override
   String toString() {
-    return SignalingStateMapper.ensureInitialized().stringifyValue(this as SignalingState);
+    return SignalingStateMapper.ensureInitialized().stringifyValue(
+      this as SignalingState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return SignalingStateMapper.ensureInitialized().equalsValue(this as SignalingState, other);
+    return SignalingStateMapper.ensureInitialized().equalsValue(
+      this as SignalingState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return SignalingStateMapper.ensureInitialized().hashValue(this as SignalingState);
+    return SignalingStateMapper.ensureInitialized().hashValue(
+      this as SignalingState,
+    );
   }
 }
 
-extension SignalingStateValueCopy<$R, $Out> on ObjectCopyWith<$R, SignalingState, $Out> {
+extension SignalingStateValueCopy<$R, $Out>
-  SignalingStateCopyWith<$R, SignalingState, $Out> get $asSignalingState => $base.as((v, t, t2) => _SignalingStateCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, SignalingState, $Out> {
+  SignalingStateCopyWith<$R, SignalingState, $Out> get $asSignalingState =>
+      $base.as((v, t, t2) => _SignalingStateCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class SignalingStateCopyWith<$R, $In extends SignalingState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class SignalingStateCopyWith<$R, $In extends SignalingState, $Out>
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get signalingServers;
+    implements ClassCopyWith<$R, $In, $Out> {
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>
+  get signalingServers;
   ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get stunServers;
-  MapCopyWith<$R, String, LsSignalingConnection, ObjectCopyWith<$R, LsSignalingConnection, LsSignalingConnection>> get connections;
+  MapCopyWith<
-  $R call({List<String>? signalingServers, List<String>? stunServers, Map<String, LsSignalingConnection>? connections});
+    $R,
-  SignalingStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+    String,
+    LsSignalingConnection,
+    ObjectCopyWith<$R, LsSignalingConnection, LsSignalingConnection>
+  >
+  get connections;
+  $R call({
+    List<String>? signalingServers,
+    List<String>? stunServers,
+    Map<String, LsSignalingConnection>? connections,
+  });
+  SignalingStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _SignalingStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, SignalingState, $Out>
+class _SignalingStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, SignalingState, $Out>
     implements SignalingStateCopyWith<$R, SignalingState, $Out> {
   _SignalingStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<SignalingState> $mapper = SignalingStateMapper.ensureInitialized();
+  late final ClassMapperBase<SignalingState> $mapper =
+      SignalingStateMapper.ensureInitialized();
   @override
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get signalingServers =>
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>
-      ListCopyWith($value.signalingServers, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(signalingServers: v));
+  get signalingServers => ListCopyWith(
+    $value.signalingServers,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(signalingServers: v),
+  );
   @override
-  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>> get stunServers =>
+  ListCopyWith<$R, String, ObjectCopyWith<$R, String, String>>
-      ListCopyWith($value.stunServers, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(stunServers: v));
+  get stunServers => ListCopyWith(
+    $value.stunServers,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(stunServers: v),
+  );
   @override
-  MapCopyWith<$R, String, LsSignalingConnection, ObjectCopyWith<$R, LsSignalingConnection, LsSignalingConnection>> get connections =>
+  MapCopyWith<
-      MapCopyWith($value.connections, (v, t) => ObjectCopyWith(v, $identity, t), (v) => call(connections: v));
+    $R,
+    String,
+    LsSignalingConnection,
+    ObjectCopyWith<$R, LsSignalingConnection, LsSignalingConnection>
+  >
+  get connections => MapCopyWith(
+    $value.connections,
+    (v, t) => ObjectCopyWith(v, $identity, t),
+    (v) => call(connections: v),
+  );
   @override
-  $R call({List<String>? signalingServers, List<String>? stunServers, Map<String, LsSignalingConnection>? connections}) => $apply(
+  $R call({
+    List<String>? signalingServers,
+    List<String>? stunServers,
+    Map<String, LsSignalingConnection>? connections,
+  }) => $apply(
     FieldCopyWithData({
       if (signalingServers != null) #signalingServers: signalingServers,
       if (stunServers != null) #stunServers: stunServers,
@@ -124,5 +188,8 @@ class _SignalingStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, Signal
   );
 
   @override
-  SignalingStateCopyWith<$R2, SignalingState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _SignalingStateCopyWithImpl($value, $cast, t);
+  SignalingStateCopyWith<$R2, SignalingState, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _SignalingStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/provider/network/webrtc/webrtc_receiver.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,16 +22,28 @@ class WebRTCReceiveStateMapper extends ClassMapperBase<WebRTCReceiveState> {
   @override
   final String id = 'WebRTCReceiveState';
 
-  static LsSignalingConnection _$connection(WebRTCReceiveState v) => v.connection;
+  static LsSignalingConnection _$connection(WebRTCReceiveState v) =>
-  static const Field<WebRTCReceiveState, LsSignalingConnection> _f$connection = Field('connection', _$connection);
+      v.connection;
+  static const Field<WebRTCReceiveState, LsSignalingConnection> _f$connection =
+      Field('connection', _$connection);
   static WsServerSdpMessage _$offer(WebRTCReceiveState v) => v.offer;
-  static const Field<WebRTCReceiveState, WsServerSdpMessage> _f$offer = Field('offer', _$offer);
+  static const Field<WebRTCReceiveState, WsServerSdpMessage> _f$offer = Field(
+    'offer',
+    _$offer,
+  );
   static RTCStatus? _$status(WebRTCReceiveState v) => v.status;
-  static const Field<WebRTCReceiveState, RTCStatus> _f$status = Field('status', _$status);
+  static const Field<WebRTCReceiveState, RTCStatus> _f$status = Field(
-  static RtcReceiveController? _$controller(WebRTCReceiveState v) => v.controller;
+    'status',
-  static const Field<WebRTCReceiveState, RtcReceiveController> _f$controller = Field('controller', _$controller);
+    _$status,
-  static ReceiveSessionState? _$sessionState(WebRTCReceiveState v) => v.sessionState;
+  );
-  static const Field<WebRTCReceiveState, ReceiveSessionState> _f$sessionState = Field('sessionState', _$sessionState);
+  static RtcReceiveController? _$controller(WebRTCReceiveState v) =>
+      v.controller;
+  static const Field<WebRTCReceiveState, RtcReceiveController> _f$controller =
+      Field('controller', _$controller);
+  static ReceiveSessionState? _$sessionState(WebRTCReceiveState v) =>
+      v.sessionState;
+  static const Field<WebRTCReceiveState, ReceiveSessionState> _f$sessionState =
+      Field('sessionState', _$sessionState);
 
   @override
   final MappableFields<WebRTCReceiveState> fields = const {
@@ -65,38 +78,65 @@ class WebRTCReceiveStateMapper extends ClassMapperBase<WebRTCReceiveState> {
 
 mixin WebRTCReceiveStateMappable {
   String serialize() {
-    return WebRTCReceiveStateMapper.ensureInitialized().encodeJson<WebRTCReceiveState>(this as WebRTCReceiveState);
+    return WebRTCReceiveStateMapper.ensureInitialized()
+        .encodeJson<WebRTCReceiveState>(this as WebRTCReceiveState);
   }
 
   Map<String, dynamic> toJson() {
-    return WebRTCReceiveStateMapper.ensureInitialized().encodeMap<WebRTCReceiveState>(this as WebRTCReceiveState);
+    return WebRTCReceiveStateMapper.ensureInitialized()
+        .encodeMap<WebRTCReceiveState>(this as WebRTCReceiveState);
   }
 
-  WebRTCReceiveStateCopyWith<WebRTCReceiveState, WebRTCReceiveState, WebRTCReceiveState> get copyWith =>
+  WebRTCReceiveStateCopyWith<
-      _WebRTCReceiveStateCopyWithImpl(this as WebRTCReceiveState, $identity, $identity);
+    WebRTCReceiveState,
+    WebRTCReceiveState,
+    WebRTCReceiveState
+  >
+  get copyWith =>
+      _WebRTCReceiveStateCopyWithImpl<WebRTCReceiveState, WebRTCReceiveState>(
+        this as WebRTCReceiveState,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return WebRTCReceiveStateMapper.ensureInitialized().stringifyValue(this as WebRTCReceiveState);
+    return WebRTCReceiveStateMapper.ensureInitialized().stringifyValue(
+      this as WebRTCReceiveState,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return WebRTCReceiveStateMapper.ensureInitialized().equalsValue(this as WebRTCReceiveState, other);
+    return WebRTCReceiveStateMapper.ensureInitialized().equalsValue(
+      this as WebRTCReceiveState,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return WebRTCReceiveStateMapper.ensureInitialized().hashValue(this as WebRTCReceiveState);
+    return WebRTCReceiveStateMapper.ensureInitialized().hashValue(
+      this as WebRTCReceiveState,
+    );
   }
 }
 
-extension WebRTCReceiveStateValueCopy<$R, $Out> on ObjectCopyWith<$R, WebRTCReceiveState, $Out> {
+extension WebRTCReceiveStateValueCopy<$R, $Out>
-  WebRTCReceiveStateCopyWith<$R, WebRTCReceiveState, $Out> get $asWebRTCReceiveState =>
+    on ObjectCopyWith<$R, WebRTCReceiveState, $Out> {
-      $base.as((v, t, t2) => _WebRTCReceiveStateCopyWithImpl(v, t, t2));
+  WebRTCReceiveStateCopyWith<$R, WebRTCReceiveState, $Out>
+  get $asWebRTCReceiveState => $base.as(
+    (v, t, t2) => _WebRTCReceiveStateCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class WebRTCReceiveStateCopyWith<$R, $In extends WebRTCReceiveState, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class WebRTCReceiveStateCopyWith<
-  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>? get sessionState;
+  $R,
+  $In extends WebRTCReceiveState,
+  $Out
+>
+    implements ClassCopyWith<$R, $In, $Out> {
+  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>?
+  get sessionState;
   $R call({
     LsSignalingConnection? connection,
     WsServerSdpMessage? offer,
@@ -104,17 +144,22 @@ abstract class WebRTCReceiveStateCopyWith<$R, $In extends WebRTCReceiveState, $O
     RtcReceiveController? controller,
     ReceiveSessionState? sessionState,
   });
-  WebRTCReceiveStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  WebRTCReceiveStateCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _WebRTCReceiveStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, WebRTCReceiveState, $Out>
+class _WebRTCReceiveStateCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, WebRTCReceiveState, $Out>
     implements WebRTCReceiveStateCopyWith<$R, WebRTCReceiveState, $Out> {
   _WebRTCReceiveStateCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<WebRTCReceiveState> $mapper = WebRTCReceiveStateMapper.ensureInitialized();
+  late final ClassMapperBase<WebRTCReceiveState> $mapper =
+      WebRTCReceiveStateMapper.ensureInitialized();
   @override
-  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>? get sessionState =>
+  ReceiveSessionStateCopyWith<$R, ReceiveSessionState, ReceiveSessionState>?
+  get sessionState =>
       $value.sessionState?.copyWith.$chain((v) => call(sessionState: v));
   @override
   $R call({
@@ -142,6 +187,8 @@ class _WebRTCReceiveStateCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, We
   );
 
   @override
-  WebRTCReceiveStateCopyWith<$R2, WebRTCReceiveState, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  WebRTCReceiveStateCopyWith<$R2, WebRTCReceiveState, $Out2> $chain<$R2, $Out2>(
-      _WebRTCReceiveStateCopyWithImpl($value, $cast, t);
+    Then<$Out2, $R2> t,
+  ) => _WebRTCReceiveStateCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/provider/param/apk_provider_param.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -21,13 +22,26 @@ class ApkProviderParamMapper extends ClassMapperBase<ApkProviderParam> {
   final String id = 'ApkProviderParam';
 
   static String _$query(ApkProviderParam v) => v.query;
-  static const Field<ApkProviderParam, String> _f$query = Field('query', _$query);
+  static const Field<ApkProviderParam, String> _f$query = Field(
+    'query',
+    _$query,
+  );
   static bool _$includeSystemApps(ApkProviderParam v) => v.includeSystemApps;
-  static const Field<ApkProviderParam, bool> _f$includeSystemApps = Field('includeSystemApps', _$includeSystemApps);
+  static const Field<ApkProviderParam, bool> _f$includeSystemApps = Field(
-  static bool _$onlyAppsWithLaunchIntent(ApkProviderParam v) => v.onlyAppsWithLaunchIntent;
+    'includeSystemApps',
-  static const Field<ApkProviderParam, bool> _f$onlyAppsWithLaunchIntent = Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
+    _$includeSystemApps,
+  );
+  static bool _$onlyAppsWithLaunchIntent(ApkProviderParam v) =>
+      v.onlyAppsWithLaunchIntent;
+  static const Field<ApkProviderParam, bool> _f$onlyAppsWithLaunchIntent =
+      Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
   static bool _$selectMultipleApps(ApkProviderParam v) => v.selectMultipleApps;
-  static const Field<ApkProviderParam, bool> _f$selectMultipleApps = Field('selectMultipleApps', _$selectMultipleApps, opt: true, def: false);
+  static const Field<ApkProviderParam, bool> _f$selectMultipleApps = Field(
+    'selectMultipleApps',
+    _$selectMultipleApps,
+    opt: true,
+    def: false,
+  );
 
   @override
   final MappableFields<ApkProviderParam> fields = const {
@@ -60,63 +74,108 @@ class ApkProviderParamMapper extends ClassMapperBase<ApkProviderParam> {
 
 mixin ApkProviderParamMappable {
   String serialize() {
-    return ApkProviderParamMapper.ensureInitialized().encodeJson<ApkProviderParam>(this as ApkProviderParam);
+    return ApkProviderParamMapper.ensureInitialized()
+        .encodeJson<ApkProviderParam>(this as ApkProviderParam);
   }
 
   Map<String, dynamic> toJson() {
-    return ApkProviderParamMapper.ensureInitialized().encodeMap<ApkProviderParam>(this as ApkProviderParam);
+    return ApkProviderParamMapper.ensureInitialized()
+        .encodeMap<ApkProviderParam>(this as ApkProviderParam);
   }
 
-  ApkProviderParamCopyWith<ApkProviderParam, ApkProviderParam, ApkProviderParam> get copyWith =>
+  ApkProviderParamCopyWith<ApkProviderParam, ApkProviderParam, ApkProviderParam>
-      _ApkProviderParamCopyWithImpl(this as ApkProviderParam, $identity, $identity);
+  get copyWith =>
+      _ApkProviderParamCopyWithImpl<ApkProviderParam, ApkProviderParam>(
+        this as ApkProviderParam,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
-    return ApkProviderParamMapper.ensureInitialized().stringifyValue(this as ApkProviderParam);
+    return ApkProviderParamMapper.ensureInitialized().stringifyValue(
+      this as ApkProviderParam,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return ApkProviderParamMapper.ensureInitialized().equalsValue(this as ApkProviderParam, other);
+    return ApkProviderParamMapper.ensureInitialized().equalsValue(
+      this as ApkProviderParam,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return ApkProviderParamMapper.ensureInitialized().hashValue(this as ApkProviderParam);
+    return ApkProviderParamMapper.ensureInitialized().hashValue(
+      this as ApkProviderParam,
+    );
   }
 }
 
-extension ApkProviderParamValueCopy<$R, $Out> on ObjectCopyWith<$R, ApkProviderParam, $Out> {
+extension ApkProviderParamValueCopy<$R, $Out>
-  ApkProviderParamCopyWith<$R, ApkProviderParam, $Out> get $asApkProviderParam => $base.as((v, t, t2) => _ApkProviderParamCopyWithImpl(v, t, t2));
+    on ObjectCopyWith<$R, ApkProviderParam, $Out> {
+  ApkProviderParamCopyWith<$R, ApkProviderParam, $Out>
+  get $asApkProviderParam =>
+      $base.as((v, t, t2) => _ApkProviderParamCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class ApkProviderParamCopyWith<$R, $In extends ApkProviderParam, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class ApkProviderParamCopyWith<$R, $In extends ApkProviderParam, $Out>
-  $R call({String? query, bool? includeSystemApps, bool? onlyAppsWithLaunchIntent, bool? selectMultipleApps});
+    implements ClassCopyWith<$R, $In, $Out> {
-  ApkProviderParamCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  $R call({
+    String? query,
+    bool? includeSystemApps,
+    bool? onlyAppsWithLaunchIntent,
+    bool? selectMultipleApps,
+  });
+  ApkProviderParamCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _ApkProviderParamCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, ApkProviderParam, $Out>
+class _ApkProviderParamCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, ApkProviderParam, $Out>
     implements ApkProviderParamCopyWith<$R, ApkProviderParam, $Out> {
   _ApkProviderParamCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<ApkProviderParam> $mapper = ApkProviderParamMapper.ensureInitialized();
+  late final ClassMapperBase<ApkProviderParam> $mapper =
+      ApkProviderParamMapper.ensureInitialized();
   @override
-  $R call({String? query, bool? includeSystemApps, bool? onlyAppsWithLaunchIntent, bool? selectMultipleApps}) => $apply(
+  $R call({
+    String? query,
+    bool? includeSystemApps,
+    bool? onlyAppsWithLaunchIntent,
+    bool? selectMultipleApps,
+  }) => $apply(
     FieldCopyWithData({
       if (query != null) #query: query,
       if (includeSystemApps != null) #includeSystemApps: includeSystemApps,
-      if (onlyAppsWithLaunchIntent != null) #onlyAppsWithLaunchIntent: onlyAppsWithLaunchIntent,
+      if (onlyAppsWithLaunchIntent != null)
+        #onlyAppsWithLaunchIntent: onlyAppsWithLaunchIntent,
       if (selectMultipleApps != null) #selectMultipleApps: selectMultipleApps,
     }),
   );
   @override
   ApkProviderParam $make(CopyWithData data) => ApkProviderParam(
     query: data.get(#query, or: $value.query),
-    includeSystemApps: data.get(#includeSystemApps, or: $value.includeSystemApps),
+    includeSystemApps: data.get(
-    onlyAppsWithLaunchIntent: data.get(#onlyAppsWithLaunchIntent, or: $value.onlyAppsWithLaunchIntent),
+      #includeSystemApps,
-    selectMultipleApps: data.get(#selectMultipleApps, or: $value.selectMultipleApps),
+      or: $value.includeSystemApps,
+    ),
+    onlyAppsWithLaunchIntent: data.get(
+      #onlyAppsWithLaunchIntent,
+      or: $value.onlyAppsWithLaunchIntent,
+    ),
+    selectMultipleApps: data.get(
+      #selectMultipleApps,
+      or: $value.selectMultipleApps,
+    ),
   );
 
   @override
-  ApkProviderParamCopyWith<$R2, ApkProviderParam, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _ApkProviderParamCopyWithImpl($value, $cast, t);
+  ApkProviderParamCopyWith<$R2, ApkProviderParam, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _ApkProviderParamCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/provider/param/cached_apk_provider_param.mapper.dart

@@ -1,12 +1,14 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
 
 part of 'cached_apk_provider_param.dart';
 
-class CachedApkProviderParamMapper extends ClassMapperBase<CachedApkProviderParam> {
+class CachedApkProviderParamMapper
+    extends ClassMapperBase<CachedApkProviderParam> {
   CachedApkProviderParamMapper._();
 
   static CachedApkProviderParamMapper? _instance;
@@ -20,12 +22,20 @@ class CachedApkProviderParamMapper extends ClassMapperBase<CachedApkProviderPara
   @override
   final String id = 'CachedApkProviderParam';
 
-  static bool _$includeSystemApps(CachedApkProviderParam v) => v.includeSystemApps;
+  static bool _$includeSystemApps(CachedApkProviderParam v) =>
-  static const Field<CachedApkProviderParam, bool> _f$includeSystemApps = Field('includeSystemApps', _$includeSystemApps);
+      v.includeSystemApps;
-  static bool _$onlyAppsWithLaunchIntent(CachedApkProviderParam v) => v.onlyAppsWithLaunchIntent;
+  static const Field<CachedApkProviderParam, bool> _f$includeSystemApps = Field(
-  static const Field<CachedApkProviderParam, bool> _f$onlyAppsWithLaunchIntent = Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
+    'includeSystemApps',
-  static bool _$selectMultipleApps(CachedApkProviderParam v) => v.selectMultipleApps;
+    _$includeSystemApps,
-  static const Field<CachedApkProviderParam, bool> _f$selectMultipleApps = Field('selectMultipleApps', _$selectMultipleApps, opt: true, def: false);
+  );
+  static bool _$onlyAppsWithLaunchIntent(CachedApkProviderParam v) =>
+      v.onlyAppsWithLaunchIntent;
+  static const Field<CachedApkProviderParam, bool> _f$onlyAppsWithLaunchIntent =
+      Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
+  static bool _$selectMultipleApps(CachedApkProviderParam v) =>
+      v.selectMultipleApps;
+  static const Field<CachedApkProviderParam, bool> _f$selectMultipleApps =
+      Field('selectMultipleApps', _$selectMultipleApps, opt: true, def: false);
 
   @override
   final MappableFields<CachedApkProviderParam> fields = const {
@@ -56,63 +66,113 @@ class CachedApkProviderParamMapper extends ClassMapperBase<CachedApkProviderPara
 
 mixin CachedApkProviderParamMappable {
   String serialize() {
-    return CachedApkProviderParamMapper.ensureInitialized().encodeJson<CachedApkProviderParam>(this as CachedApkProviderParam);
+    return CachedApkProviderParamMapper.ensureInitialized()
+        .encodeJson<CachedApkProviderParam>(this as CachedApkProviderParam);
   }
 
   Map<String, dynamic> toJson() {
-    return CachedApkProviderParamMapper.ensureInitialized().encodeMap<CachedApkProviderParam>(this as CachedApkProviderParam);
+    return CachedApkProviderParamMapper.ensureInitialized()
+        .encodeMap<CachedApkProviderParam>(this as CachedApkProviderParam);
   }
 
-  CachedApkProviderParamCopyWith<CachedApkProviderParam, CachedApkProviderParam, CachedApkProviderParam> get copyWith =>
+  CachedApkProviderParamCopyWith<
-      _CachedApkProviderParamCopyWithImpl(this as CachedApkProviderParam, $identity, $identity);
+    CachedApkProviderParam,
+    CachedApkProviderParam,
+    CachedApkProviderParam
+  >
+  get copyWith =>
+      _CachedApkProviderParamCopyWithImpl<
+        CachedApkProviderParam,
+        CachedApkProviderParam
+      >(this as CachedApkProviderParam, $identity, $identity);
   @override
   String toString() {
-    return CachedApkProviderParamMapper.ensureInitialized().stringifyValue(this as CachedApkProviderParam);
+    return CachedApkProviderParamMapper.ensureInitialized().stringifyValue(
+      this as CachedApkProviderParam,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return CachedApkProviderParamMapper.ensureInitialized().equalsValue(this as CachedApkProviderParam, other);
+    return CachedApkProviderParamMapper.ensureInitialized().equalsValue(
+      this as CachedApkProviderParam,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return CachedApkProviderParamMapper.ensureInitialized().hashValue(this as CachedApkProviderParam);
+    return CachedApkProviderParamMapper.ensureInitialized().hashValue(
+      this as CachedApkProviderParam,
+    );
   }
 }
 
-extension CachedApkProviderParamValueCopy<$R, $Out> on ObjectCopyWith<$R, CachedApkProviderParam, $Out> {
+extension CachedApkProviderParamValueCopy<$R, $Out>
-  CachedApkProviderParamCopyWith<$R, CachedApkProviderParam, $Out> get $asCachedApkProviderParam =>
+    on ObjectCopyWith<$R, CachedApkProviderParam, $Out> {
-      $base.as((v, t, t2) => _CachedApkProviderParamCopyWithImpl(v, t, t2));
+  CachedApkProviderParamCopyWith<$R, CachedApkProviderParam, $Out>
+  get $asCachedApkProviderParam => $base.as(
+    (v, t, t2) => _CachedApkProviderParamCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class CachedApkProviderParamCopyWith<$R, $In extends CachedApkProviderParam, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class CachedApkProviderParamCopyWith<
-  $R call({bool? includeSystemApps, bool? onlyAppsWithLaunchIntent, bool? selectMultipleApps});
+  $R,
-  CachedApkProviderParamCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  $In extends CachedApkProviderParam,
+  $Out
+>
+    implements ClassCopyWith<$R, $In, $Out> {
+  $R call({
+    bool? includeSystemApps,
+    bool? onlyAppsWithLaunchIntent,
+    bool? selectMultipleApps,
+  });
+  CachedApkProviderParamCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _CachedApkProviderParamCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, CachedApkProviderParam, $Out>
+class _CachedApkProviderParamCopyWithImpl<$R, $Out>
-    implements CachedApkProviderParamCopyWith<$R, CachedApkProviderParam, $Out> {
+    extends ClassCopyWithBase<$R, CachedApkProviderParam, $Out>
+    implements
+        CachedApkProviderParamCopyWith<$R, CachedApkProviderParam, $Out> {
   _CachedApkProviderParamCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<CachedApkProviderParam> $mapper = CachedApkProviderParamMapper.ensureInitialized();
+  late final ClassMapperBase<CachedApkProviderParam> $mapper =
+      CachedApkProviderParamMapper.ensureInitialized();
   @override
-  $R call({bool? includeSystemApps, bool? onlyAppsWithLaunchIntent, bool? selectMultipleApps}) => $apply(
+  $R call({
+    bool? includeSystemApps,
+    bool? onlyAppsWithLaunchIntent,
+    bool? selectMultipleApps,
+  }) => $apply(
     FieldCopyWithData({
       if (includeSystemApps != null) #includeSystemApps: includeSystemApps,
-      if (onlyAppsWithLaunchIntent != null) #onlyAppsWithLaunchIntent: onlyAppsWithLaunchIntent,
+      if (onlyAppsWithLaunchIntent != null)
+        #onlyAppsWithLaunchIntent: onlyAppsWithLaunchIntent,
       if (selectMultipleApps != null) #selectMultipleApps: selectMultipleApps,
     }),
   );
   @override
   CachedApkProviderParam $make(CopyWithData data) => CachedApkProviderParam(
-    includeSystemApps: data.get(#includeSystemApps, or: $value.includeSystemApps),
+    includeSystemApps: data.get(
-    onlyAppsWithLaunchIntent: data.get(#onlyAppsWithLaunchIntent, or: $value.onlyAppsWithLaunchIntent),
+      #includeSystemApps,
-    selectMultipleApps: data.get(#selectMultipleApps, or: $value.selectMultipleApps),
+      or: $value.includeSystemApps,
+    ),
+    onlyAppsWithLaunchIntent: data.get(
+      #onlyAppsWithLaunchIntent,
+      or: $value.onlyAppsWithLaunchIntent,
+    ),
+    selectMultipleApps: data.get(
+      #selectMultipleApps,
+      or: $value.selectMultipleApps,
+    ),
   );
 
   @override
-  CachedApkProviderParamCopyWith<$R2, CachedApkProviderParam, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  CachedApkProviderParamCopyWith<$R2, CachedApkProviderParam, $Out2>
-      _CachedApkProviderParamCopyWithImpl($value, $cast, t);
+  $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+      _CachedApkProviderParamCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/lib/rust/api/crypto.dart

@@ -6,8 +6,10 @@
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 import 'package:localsend_app/rust/frb_generated.dart';
 
-Future<void> verifyCert({required String cert, required String publicKey}) =>
+Future<void> verifyCert({required String cert, required String publicKey}) => RustLib.instance.api.crateApiCryptoVerifyCert(
-    RustLib.instance.api.crateApiCryptoVerifyCert(cert: cert, publicKey: publicKey);
+  cert: cert,
+  publicKey: publicKey,
+);
 
 Future<KeyPair> generateKeyPair() => RustLib.instance.api.crateApiCryptoGenerateKeyPair();
 

app/lib/rust/api/http.dart

@@ -0,0 +1,100 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.11.1.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+import 'package:localsend_app/rust/api/model.dart';
+import 'package:localsend_app/rust/api/stream.dart';
+import 'package:localsend_app/rust/frb_generated.dart';
+
+Future<RsHttpClient> createClient({
+  required String privateKey,
+  required String cert,
+  required LsHttpClientVersion version,
+}) => RustLib.instance.api.crateApiHttpCreateClient(
+  privateKey: privateKey,
+  cert: cert,
+  version: version,
+);
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<ClientError>>
+abstract class ClientError implements RustOpaqueInterface {}
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<RsHttpClient>>
+abstract class RsHttpClient implements RustOpaqueInterface {
+  Future<void> cancel({
+    required ProtocolType protocol,
+    required String ip,
+    required int port,
+    required String sessionId,
+  });
+
+  Future<PrepareUploadResult> prepareUpload({
+    required ProtocolType protocol,
+    required String ip,
+    required int port,
+    required PrepareUploadRequestDto payload,
+    String? publicKey,
+    String? pin,
+  });
+
+  Future<ResultWithPublicKeyRegisterResponseDto> register({
+    required ProtocolType protocol,
+    required String ip,
+    required int port,
+    required RegisterDto payload,
+  });
+
+  Future<void> upload({
+    required ProtocolType protocol,
+    required String ip,
+    required int port,
+    String? publicKey,
+    required String sessionId,
+    required String fileId,
+    required String token,
+    required Dart2RustStreamReceiver binary,
+  });
+}
+
+enum LsHttpClientVersion {
+  v2,
+  v3,
+}
+
+class PrepareUploadResult {
+  final int statusCode;
+  final PrepareUploadResponseDto response;
+
+  const PrepareUploadResult({
+    required this.statusCode,
+    required this.response,
+  });
+
+  @override
+  int get hashCode => statusCode.hashCode ^ response.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PrepareUploadResult && runtimeType == other.runtimeType && statusCode == other.statusCode && response == other.response;
+}
+
+class ResultWithPublicKeyRegisterResponseDto {
+  final String? publicKey;
+  final RegisterResponseDto body;
+
+  const ResultWithPublicKeyRegisterResponseDto({
+    this.publicKey,
+    required this.body,
+  });
+
+  @override
+  int get hashCode => publicKey.hashCode ^ body.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is ResultWithPublicKeyRegisterResponseDto && runtimeType == other.runtimeType && publicKey == other.publicKey && body == other.body;
+}

app/lib/rust/api/model.dart

@@ -6,8 +6,6 @@
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 import 'package:localsend_app/rust/frb_generated.dart';
 
-// These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `PrepareUploadRequestDto`, `PrepareUploadResponseDto`, `ProtocolType`, `RegisterDto`, `RegisterResponseDto`
-
 enum DeviceType {
   mobile,
   desktop,
@@ -68,3 +66,123 @@ class FileMetadata {
   bool operator ==(Object other) =>
       identical(this, other) || other is FileMetadata && runtimeType == other.runtimeType && modified == other.modified && accessed == other.accessed;
 }
+
+class PrepareUploadRequestDto {
+  final RegisterDto info;
+  final Map<String, FileDto> files;
+
+  const PrepareUploadRequestDto({
+    required this.info,
+    required this.files,
+  });
+
+  @override
+  int get hashCode => info.hashCode ^ files.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || other is PrepareUploadRequestDto && runtimeType == other.runtimeType && info == other.info && files == other.files;
+}
+
+class PrepareUploadResponseDto {
+  final String sessionId;
+  final Map<String, String> files;
+
+  const PrepareUploadResponseDto({
+    required this.sessionId,
+    required this.files,
+  });
+
+  @override
+  int get hashCode => sessionId.hashCode ^ files.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PrepareUploadResponseDto && runtimeType == other.runtimeType && sessionId == other.sessionId && files == other.files;
+}
+
+enum ProtocolType {
+  http,
+  https,
+}
+
+class RegisterDto {
+  final String alias;
+  final String version;
+  final String? deviceModel;
+  final DeviceType? deviceType;
+  final String token;
+  final int port;
+  final ProtocolType protocol;
+  final bool hasWebInterface;
+
+  const RegisterDto({
+    required this.alias,
+    required this.version,
+    this.deviceModel,
+    this.deviceType,
+    required this.token,
+    required this.port,
+    required this.protocol,
+    required this.hasWebInterface,
+  });
+
+  @override
+  int get hashCode =>
+      alias.hashCode ^
+      version.hashCode ^
+      deviceModel.hashCode ^
+      deviceType.hashCode ^
+      token.hashCode ^
+      port.hashCode ^
+      protocol.hashCode ^
+      hasWebInterface.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is RegisterDto &&
+          runtimeType == other.runtimeType &&
+          alias == other.alias &&
+          version == other.version &&
+          deviceModel == other.deviceModel &&
+          deviceType == other.deviceType &&
+          token == other.token &&
+          port == other.port &&
+          protocol == other.protocol &&
+          hasWebInterface == other.hasWebInterface;
+}
+
+class RegisterResponseDto {
+  final String alias;
+  final String version;
+  final String? deviceModel;
+  final DeviceType? deviceType;
+  final String token;
+  final bool hasWebInterface;
+
+  const RegisterResponseDto({
+    required this.alias,
+    required this.version,
+    this.deviceModel,
+    this.deviceType,
+    required this.token,
+    required this.hasWebInterface,
+  });
+
+  @override
+  int get hashCode => alias.hashCode ^ version.hashCode ^ deviceModel.hashCode ^ deviceType.hashCode ^ token.hashCode ^ hasWebInterface.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is RegisterResponseDto &&
+          runtimeType == other.runtimeType &&
+          alias == other.alias &&
+          version == other.version &&
+          deviceModel == other.deviceModel &&
+          deviceType == other.deviceType &&
+          token == other.token &&
+          hasWebInterface == other.hasWebInterface;
+}

app/lib/rust/api/stream.dart

@@ -0,0 +1,17 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.11.1.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+import 'package:localsend_app/rust/frb_generated.dart';
+
+Future<(Dart2RustStreamSink, Dart2RustStreamReceiver)> createStream() => RustLib.instance.api.crateApiStreamCreateStream();
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Dart2RustStreamReceiver>>
+abstract class Dart2RustStreamReceiver implements RustOpaqueInterface {}
+
+// Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<Dart2RustStreamSink>>
+abstract class Dart2RustStreamSink implements RustOpaqueInterface {
+  Future<void> add({required List<int> data});
+}

app/lib/rust/api/webrtc.dart

@@ -18,7 +18,12 @@ Stream<WsServerMessage> connect({
   required ProposingClientInfo info,
   required String privateKey,
   required FutureOr<void> Function(LsSignalingConnection) onConnection,
-}) => RustLib.instance.api.crateApiWebrtcConnect(uri: uri, info: info, privateKey: privateKey, onConnection: onConnection);
+}) => RustLib.instance.api.crateApiWebrtcConnect(
+  uri: uri,
+  info: info,
+  privateKey: privateKey,
+  onConnection: onConnection,
+);
 
 // Rust type: RustOpaqueMoi<flutter_rust_bridge::for_generated::RustAutoOpaqueInner<LsSignalingConnection>>
 abstract class LsSignalingConnection implements RustOpaqueInterface {

app/lib/util/native/channel/android_channel.mapper.dart

@@ -1,5 +1,6 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// dart format off
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
 // ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
@@ -22,9 +23,15 @@ class PickDirectoryResultMapper extends ClassMapperBase<PickDirectoryResult> {
   final String id = 'PickDirectoryResult';
 
   static String _$directoryUri(PickDirectoryResult v) => v.directoryUri;
-  static const Field<PickDirectoryResult, String> _f$directoryUri = Field('directoryUri', _$directoryUri);
+  static const Field<PickDirectoryResult, String> _f$directoryUri = Field(
+    'directoryUri',
+    _$directoryUri,
+  );
   static List<FileInfo> _$files(PickDirectoryResult v) => v.files;
-  static const Field<PickDirectoryResult, List<FileInfo>> _f$files = Field('files', _$files);
+  static const Field<PickDirectoryResult, List<FileInfo>> _f$files = Field(
+    'files',
+    _$files,
+  );
 
   @override
   final MappableFields<PickDirectoryResult> fields = const {
@@ -33,7 +40,10 @@ class PickDirectoryResultMapper extends ClassMapperBase<PickDirectoryResult> {
   };
 
   static PickDirectoryResult _instantiate(DecodingData data) {
-    return PickDirectoryResult(directoryUri: data.dec(_f$directoryUri), files: data.dec(_f$files));
+    return PickDirectoryResult(
+      directoryUri: data.dec(_f$directoryUri),
+      files: data.dec(_f$files),
+    );
   }
 
   @override
@@ -50,54 +60,92 @@ class PickDirectoryResultMapper extends ClassMapperBase<PickDirectoryResult> {
 
 mixin PickDirectoryResultMappable {
   String serialize() {
-    return PickDirectoryResultMapper.ensureInitialized().encodeJson<PickDirectoryResult>(this as PickDirectoryResult);
+    return PickDirectoryResultMapper.ensureInitialized()
+        .encodeJson<PickDirectoryResult>(this as PickDirectoryResult);
   }
 
   Map<String, dynamic> toJson() {
-    return PickDirectoryResultMapper.ensureInitialized().encodeMap<PickDirectoryResult>(this as PickDirectoryResult);
+    return PickDirectoryResultMapper.ensureInitialized()
+        .encodeMap<PickDirectoryResult>(this as PickDirectoryResult);
   }
 
-  PickDirectoryResultCopyWith<PickDirectoryResult, PickDirectoryResult, PickDirectoryResult> get copyWith =>
+  PickDirectoryResultCopyWith<
-      _PickDirectoryResultCopyWithImpl(this as PickDirectoryResult, $identity, $identity);
+    PickDirectoryResult,
+    PickDirectoryResult,
+    PickDirectoryResult
+  >
+  get copyWith =>
+      _PickDirectoryResultCopyWithImpl<
+        PickDirectoryResult,
+        PickDirectoryResult
+      >(this as PickDirectoryResult, $identity, $identity);
   @override
   String toString() {
-    return PickDirectoryResultMapper.ensureInitialized().stringifyValue(this as PickDirectoryResult);
+    return PickDirectoryResultMapper.ensureInitialized().stringifyValue(
+      this as PickDirectoryResult,
+    );
   }
 
   @override
   bool operator ==(Object other) {
-    return PickDirectoryResultMapper.ensureInitialized().equalsValue(this as PickDirectoryResult, other);
+    return PickDirectoryResultMapper.ensureInitialized().equalsValue(
+      this as PickDirectoryResult,
+      other,
+    );
   }
 
   @override
   int get hashCode {
-    return PickDirectoryResultMapper.ensureInitialized().hashValue(this as PickDirectoryResult);
+    return PickDirectoryResultMapper.ensureInitialized().hashValue(
+      this as PickDirectoryResult,
+    );
   }
 }
 
-extension PickDirectoryResultValueCopy<$R, $Out> on ObjectCopyWith<$R, PickDirectoryResult, $Out> {
+extension PickDirectoryResultValueCopy<$R, $Out>
-  PickDirectoryResultCopyWith<$R, PickDirectoryResult, $Out> get $asPickDirectoryResult =>
+    on ObjectCopyWith<$R, PickDirectoryResult, $Out> {
-      $base.as((v, t, t2) => _PickDirectoryResultCopyWithImpl(v, t, t2));
+  PickDirectoryResultCopyWith<$R, PickDirectoryResult, $Out>
+  get $asPickDirectoryResult => $base.as(
+    (v, t, t2) => _PickDirectoryResultCopyWithImpl<$R, $Out>(v, t, t2),
+  );
 }
 
-abstract class PickDirectoryResultCopyWith<$R, $In extends PickDirectoryResult, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class PickDirectoryResultCopyWith<
-  ListCopyWith<$R, FileInfo, FileInfoCopyWith<$R, FileInfo, FileInfo>> get files;
+  $R,
+  $In extends PickDirectoryResult,
+  $Out
+>
+    implements ClassCopyWith<$R, $In, $Out> {
+  ListCopyWith<$R, FileInfo, FileInfoCopyWith<$R, FileInfo, FileInfo>>
+  get files;
   $R call({String? directoryUri, List<FileInfo>? files});
-  PickDirectoryResultCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
+  PickDirectoryResultCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  );
 }
 
-class _PickDirectoryResultCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, PickDirectoryResult, $Out>
+class _PickDirectoryResultCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, PickDirectoryResult, $Out>
     implements PickDirectoryResultCopyWith<$R, PickDirectoryResult, $Out> {
   _PickDirectoryResultCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<PickDirectoryResult> $mapper = PickDirectoryResultMapper.ensureInitialized();
+  late final ClassMapperBase<PickDirectoryResult> $mapper =
+      PickDirectoryResultMapper.ensureInitialized();
   @override
-  ListCopyWith<$R, FileInfo, FileInfoCopyWith<$R, FileInfo, FileInfo>> get files =>
+  ListCopyWith<$R, FileInfo, FileInfoCopyWith<$R, FileInfo, FileInfo>>
-      ListCopyWith($value.files, (v, t) => v.copyWith.$chain(t), (v) => call(files: v));
+  get files => ListCopyWith(
+    $value.files,
+    (v, t) => v.copyWith.$chain(t),
+    (v) => call(files: v),
+  );
   @override
-  $R call({String? directoryUri, List<FileInfo>? files}) =>
+  $R call({String? directoryUri, List<FileInfo>? files}) => $apply(
-      $apply(FieldCopyWithData({if (directoryUri != null) #directoryUri: directoryUri, if (files != null) #files: files}));
+    FieldCopyWithData({
+      if (directoryUri != null) #directoryUri: directoryUri,
+      if (files != null) #files: files,
+    }),
+  );
   @override
   PickDirectoryResult $make(CopyWithData data) => PickDirectoryResult(
     directoryUri: data.get(#directoryUri, or: $value.directoryUri),
@@ -105,8 +153,9 @@ class _PickDirectoryResultCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, P
   );
 
   @override
-  PickDirectoryResultCopyWith<$R2, PickDirectoryResult, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+  PickDirectoryResultCopyWith<$R2, PickDirectoryResult, $Out2>
-      _PickDirectoryResultCopyWithImpl($value, $cast, t);
+  $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+      _PickDirectoryResultCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
 
 class FileInfoMapper extends ClassMapperBase<FileInfo> {
@@ -130,7 +179,10 @@ class FileInfoMapper extends ClassMapperBase<FileInfo> {
   static String _$uri(FileInfo v) => v.uri;
   static const Field<FileInfo, String> _f$uri = Field('uri', _$uri);
   static int _$lastModified(FileInfo v) => v.lastModified;
-  static const Field<FileInfo, int> _f$lastModified = Field('lastModified', _$lastModified);
+  static const Field<FileInfo, int> _f$lastModified = Field(
+    'lastModified',
+    _$lastModified,
+  );
 
   @override
   final MappableFields<FileInfo> fields = const {
@@ -141,7 +193,12 @@ class FileInfoMapper extends ClassMapperBase<FileInfo> {
   };
 
   static FileInfo _instantiate(DecodingData data) {
-    return FileInfo(name: data.dec(_f$name), size: data.dec(_f$size), uri: data.dec(_f$uri), lastModified: data.dec(_f$lastModified));
+    return FileInfo(
+      name: data.dec(_f$name),
+      size: data.dec(_f$size),
+      uri: data.dec(_f$uri),
+      lastModified: data.dec(_f$lastModified),
+    );
   }
 
   @override
@@ -158,14 +215,23 @@ class FileInfoMapper extends ClassMapperBase<FileInfo> {
 
 mixin FileInfoMappable {
   String serialize() {
-    return FileInfoMapper.ensureInitialized().encodeJson<FileInfo>(this as FileInfo);
+    return FileInfoMapper.ensureInitialized().encodeJson<FileInfo>(
+      this as FileInfo,
+    );
   }
 
   Map<String, dynamic> toJson() {
-    return FileInfoMapper.ensureInitialized().encodeMap<FileInfo>(this as FileInfo);
+    return FileInfoMapper.ensureInitialized().encodeMap<FileInfo>(
+      this as FileInfo,
+    );
   }
 
-  FileInfoCopyWith<FileInfo, FileInfo, FileInfo> get copyWith => _FileInfoCopyWithImpl(this as FileInfo, $identity, $identity);
+  FileInfoCopyWith<FileInfo, FileInfo, FileInfo> get copyWith =>
+      _FileInfoCopyWithImpl<FileInfo, FileInfo>(
+        this as FileInfo,
+        $identity,
+        $identity,
+      );
   @override
   String toString() {
     return FileInfoMapper.ensureInitialized().stringifyValue(this as FileInfo);
@@ -173,7 +239,10 @@ mixin FileInfoMappable {
 
   @override
   bool operator ==(Object other) {
-    return FileInfoMapper.ensureInitialized().equalsValue(this as FileInfo, other);
+    return FileInfoMapper.ensureInitialized().equalsValue(
+      this as FileInfo,
+      other,
+    );
   }
 
   @override
@@ -183,19 +252,24 @@ mixin FileInfoMappable {
 }
 
 extension FileInfoValueCopy<$R, $Out> on ObjectCopyWith<$R, FileInfo, $Out> {
-  FileInfoCopyWith<$R, FileInfo, $Out> get $asFileInfo => $base.as((v, t, t2) => _FileInfoCopyWithImpl(v, t, t2));
+  FileInfoCopyWith<$R, FileInfo, $Out> get $asFileInfo =>
+      $base.as((v, t, t2) => _FileInfoCopyWithImpl<$R, $Out>(v, t, t2));
 }
 
-abstract class FileInfoCopyWith<$R, $In extends FileInfo, $Out> implements ClassCopyWith<$R, $In, $Out> {
+abstract class FileInfoCopyWith<$R, $In extends FileInfo, $Out>
+    implements ClassCopyWith<$R, $In, $Out> {
   $R call({String? name, int? size, String? uri, int? lastModified});
   FileInfoCopyWith<$R2, $In, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t);
 }
 
-class _FileInfoCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, FileInfo, $Out> implements FileInfoCopyWith<$R, FileInfo, $Out> {
+class _FileInfoCopyWithImpl<$R, $Out>
+    extends ClassCopyWithBase<$R, FileInfo, $Out>
+    implements FileInfoCopyWith<$R, FileInfo, $Out> {
   _FileInfoCopyWithImpl(super.value, super.then, super.then2);
 
   @override
-  late final ClassMapperBase<FileInfo> $mapper = FileInfoMapper.ensureInitialized();
+  late final ClassMapperBase<FileInfo> $mapper =
+      FileInfoMapper.ensureInitialized();
   @override
   $R call({String? name, int? size, String? uri, int? lastModified}) => $apply(
     FieldCopyWithData({
@@ -214,5 +288,8 @@ class _FileInfoCopyWithImpl<$R, $Out> extends ClassCopyWithBase<$R, FileInfo, $O
   );
 
   @override
-  FileInfoCopyWith<$R2, FileInfo, $Out2> $chain<$R2, $Out2>(Then<$Out2, $R2> t) => _FileInfoCopyWithImpl($value, $cast, t);
+  FileInfoCopyWith<$R2, FileInfo, $Out2> $chain<$R2, $Out2>(
+    Then<$Out2, $R2> t,
+  ) => _FileInfoCopyWithImpl<$R2, $Out2>($value, $cast, t);
 }
+

app/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.93.1"
 targets = ["aarch64-linux-android", "armv7-linux-androideabi", "x86_64-linux-android", "aarch64-apple-darwin", "x86_64-apple-darwin"]

app/rust/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "rust_lib_localsend_app"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib", "staticlib"]
 
 [dependencies]
-anyhow = "1.0.95"
+anyhow = "1.0"
-bytes = "1.9.0"
+bytes = "1.9"
 flutter_rust_bridge = { version = "=2.11.1", features = ["uuid"] }
 localsend = { path = "../../core", features = ["full"] }
-tokio = { version = "1.43.0", features = ["full"] }
+tokio = { version = "1.49", features = ["full"] }
-tracing = "0.1.41"
+tracing = "0.1.44"
-tracing-subscriber = { version = "0.3.19" }
+tracing-subscriber = { version = "0.3.22" }
 uuid = { version = "1.11.1", features = ["v4"] }

app/rust/src/api/crypto.rs

@@ -1,5 +1,5 @@
 pub fn verify_cert(cert: String, public_key: String) -> anyhow::Result<()> {
-    localsend::crypto::cert::verify_cert_from_pem(cert, Some(public_key))
+    localsend::crypto::cert::verify_cert_from_pem(cert, Some(&public_key))
 }
 
 pub fn generate_key_pair() -> anyhow::Result<KeyPair> {

app/rust/src/api/http.rs

@@ -0,0 +1,113 @@
+use crate::api::stream;
+use flutter_rust_bridge::frb;
+use localsend::http::{
+    client::{ClientError, LsHttpClientVersion},
+    dto::{
+        PrepareUploadRequestDto, PrepareUploadResponseDto, PrepareUploadResult, ProtocolType,
+        RegisterDto, RegisterResponseDto,
+    },
+};
+
+pub struct RsHttpClient {
+    inner: localsend::http::client::LsHttpClient,
+}
+
+pub fn create_client(
+    private_key: String,
+    cert: String,
+    version: LsHttpClientVersion,
+) -> Result<RsHttpClient, ClientError> {
+    let inner = localsend::http::client::LsHttpClient::new(&private_key, &cert, version)?;
+
+    Ok(RsHttpClient { inner })
+}
+
+impl RsHttpClient {
+    pub async fn register(
+        &self,
+        protocol: ProtocolType,
+        ip: &str,
+        port: u16,
+        payload: RegisterDto,
+    ) -> Result<ResultWithPublicKeyRegisterResponseDto, ClientError> {
+        let response = self.inner.register(protocol, ip, port, payload).await?;
+
+        Ok(ResultWithPublicKeyRegisterResponseDto {
+            public_key: response.public_key,
+            body: response.body,
+        })
+    }
+
+    pub async fn prepare_upload(
+        &self,
+        protocol: ProtocolType,
+        ip: &str,
+        port: u16,
+        payload: PrepareUploadRequestDto,
+        public_key: Option<String>,
+        pin: Option<String>,
+    ) -> Result<PrepareUploadResult, ClientError> {
+        let response = self
+            .inner
+            .prepare_upload(protocol, ip, port, public_key, payload, pin.as_deref())
+            .await?;
+
+        Ok(response)
+    }
+
+    pub async fn upload(
+        &self,
+        protocol: ProtocolType,
+        ip: &str,
+        port: u16,
+        public_key: Option<String>,
+        session_id: &str,
+        file_id: &str,
+        token: &str,
+        binary: stream::Dart2RustStreamReceiver,
+    ) -> Result<(), ClientError> {
+        self.inner
+            .upload(
+                protocol,
+                ip,
+                port,
+                public_key,
+                session_id,
+                file_id,
+                token,
+                binary.receiver,
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    pub async fn cancel(
+        &self,
+        protocol: ProtocolType,
+        ip: &str,
+        port: u16,
+        session_id: &str,
+    ) -> Result<(), ClientError> {
+        self.inner.cancel(protocol, ip, port, session_id).await?;
+
+        Ok(())
+    }
+}
+
+#[frb(mirror(LsHttpClientVersion))]
+pub enum _LsHttpClientVersion {
+    V2,
+    V3,
+}
+
+#[frb(mirror(PrepareUploadResult))]
+pub struct _PrepareUploadResult {
+    pub status_code: u16,
+    pub response: PrepareUploadResponseDto,
+}
+
+pub struct ResultWithPublicKeyRegisterResponseDto {
+    pub public_key: Option<String>,
+    pub body: RegisterResponseDto,
+}

app/rust/src/api/mod.rs

@@ -1,4 +1,6 @@
 pub mod crypto;
+pub mod http;
 pub mod logging;
 pub mod model;
+pub mod stream;
 pub mod webrtc;

app/rust/src/api/model.rs

@@ -1,7 +1,8 @@
 use flutter_rust_bridge::frb;
-pub use localsend::model::discovery::{DeviceType, ProtocolType, RegisterDto, RegisterResponseDto};
+pub use localsend::http::dto::{ProtocolType, RegisterDto, RegisterResponseDto, PrepareUploadRequestDto, PrepareUploadResponseDto};
+pub use localsend::model::discovery::{DeviceType};
 pub use localsend::model::transfer::{
-    FileDto, FileMetadata, PrepareUploadRequestDto, PrepareUploadResponseDto,
+    FileDto, FileMetadata
 };
 use std::collections::HashMap;
 
@@ -11,10 +12,10 @@ pub struct _RegisterDto {
     pub version: String,
     pub device_model: Option<String>,
     pub device_type: Option<DeviceType>,
-    pub fingerprint: String,
+    pub token: String,
     pub port: u16,
     pub protocol: ProtocolType,
-    pub download: bool,
+    pub has_web_interface: bool,
 }
 
 #[frb(mirror(RegisterResponseDto))]
@@ -23,8 +24,8 @@ pub struct _RegisterResponseDto {
     pub version: String,
     pub device_model: Option<String>,
     pub device_type: Option<DeviceType>,
-    pub fingerprint: String,
+    pub token: String,
-    pub download: bool,
+    pub has_web_interface: bool,
 }
 
 #[frb(mirror(DeviceType))]

app/rust/src/api/stream.rs

@@ -0,0 +1,28 @@
+use tokio::sync::mpsc;
+
+pub struct Dart2RustStreamSink {
+    sender: mpsc::Sender<Vec<u8>>,
+}
+
+pub struct Dart2RustStreamReceiver {
+    pub(crate) receiver: mpsc::Receiver<Vec<u8>>,
+}
+
+pub fn create_stream() -> (Dart2RustStreamSink, Dart2RustStreamReceiver) {
+    // We don't need to have a buffer because we already buffer on Dart side.
+    // However, a buffer of 1 seems to improve performance.
+    let (sender, receiver) = mpsc::channel(1);
+    (
+        Dart2RustStreamSink { sender },
+        Dart2RustStreamReceiver { receiver },
+    )
+}
+
+impl Dart2RustStreamSink {
+    pub async fn add(&mut self, data: Vec<u8>) -> Result<(), String> {
+        self.sender
+            .send(data)
+            .await
+            .map_err(|_| "Failed to send data".to_string())
+    }
+}

app/test/mocks.mocks.dart

@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.4.4 from annotations
+// Mocks generated by Mockito 5.4.6 from annotations
 // in localsend_app/test/mocks.dart.
 // Do not manually edit this file.
 
@@ -26,19 +26,14 @@ import 'package:shared_preferences/shared_preferences.dart' as _i13;
 // ignore_for_file: deprecated_member_use_from_same_package
 // ignore_for_file: implementation_imports
 // ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
 // ignore_for_file: subtype_of_sealed_class
 
 class _FakeStoredSecurityContext_0 extends _i1.SmartFake implements _i2.StoredSecurityContext {
-  _FakeStoredSecurityContext_0(
+  _FakeStoredSecurityContext_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-        parent,
-        parentInvocation,
-      );
 }
 
 /// A class which mocks [PersistenceService].
@@ -57,10 +52,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isPortableMode() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isPortableMode, []),
-              #isPortableMode,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -69,23 +61,14 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i2.StoredSecurityContext getSecurityContext() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getSecurityContext, []),
-              #getSecurityContext,
-              [],
-            ),
             returnValue: _FakeStoredSecurityContext_0(
               this,
-              Invocation.method(
+              Invocation.method(#getSecurityContext, []),
-                #getSecurityContext,
-                [],
-              ),
             ),
             returnValueForMissingStub: _FakeStoredSecurityContext_0(
               this,
-              Invocation.method(
+              Invocation.method(#getSecurityContext, []),
-                #getSecurityContext,
-                [],
-              ),
             ),
           )
           as _i2.StoredSecurityContext);
@@ -93,10 +76,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSecurityContext(_i2.StoredSecurityContext? context) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSecurityContext, [context]),
-              #setSecurityContext,
-              [context],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -105,10 +85,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSignalingServers(List<String>? servers) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSignalingServers, [servers]),
-              #setSignalingServers,
-              [servers],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -117,10 +94,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setStunServers(List<String>? servers) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setStunServers, [servers]),
-              #setStunServers,
-              [servers],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -129,10 +103,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   List<_i5.ReceiveHistoryEntry> getReceiveHistory() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getReceiveHistory, []),
-              #getReceiveHistory,
-              [],
-            ),
             returnValue: <_i5.ReceiveHistoryEntry>[],
             returnValueForMissingStub: <_i5.ReceiveHistoryEntry>[],
           )
@@ -141,10 +112,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setReceiveHistory(List<_i5.ReceiveHistoryEntry>? entries) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setReceiveHistory, [entries]),
-              #setReceiveHistory,
-              [entries],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -153,10 +121,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   List<_i6.FavoriteDevice> getFavorites() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getFavorites, []),
-              #getFavorites,
-              [],
-            ),
             returnValue: <_i6.FavoriteDevice>[],
             returnValueForMissingStub: <_i6.FavoriteDevice>[],
           )
@@ -165,10 +130,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setFavorites(List<_i6.FavoriteDevice>? entries) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setFavorites, [entries]),
-              #setFavorites,
-              [entries],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -177,23 +139,14 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   String getShowToken() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getShowToken, []),
-              #getShowToken,
-              [],
-            ),
             returnValue: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getShowToken, []),
-                #getShowToken,
-                [],
-              ),
             ),
             returnValueForMissingStub: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getShowToken, []),
-                #getShowToken,
-                [],
-              ),
             ),
           )
           as String);
@@ -201,23 +154,14 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   String getAlias() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getAlias, []),
-              #getAlias,
-              [],
-            ),
             returnValue: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getAlias, []),
-                #getAlias,
-                [],
-              ),
             ),
             returnValueForMissingStub: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getAlias, []),
-                #getAlias,
-                [],
-              ),
             ),
           )
           as String);
@@ -225,10 +169,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setAlias(String? alias) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setAlias, [alias]),
-              #setAlias,
-              [alias],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -237,10 +178,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i8.ThemeMode getTheme() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getTheme, []),
-              #getTheme,
-              [],
-            ),
             returnValue: _i8.ThemeMode.system,
             returnValueForMissingStub: _i8.ThemeMode.system,
           )
@@ -249,10 +187,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setTheme(_i8.ThemeMode? theme) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setTheme, [theme]),
-              #setTheme,
-              [theme],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -261,10 +196,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i9.ColorMode getColorMode() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getColorMode, []),
-              #getColorMode,
-              [],
-            ),
             returnValue: _i9.ColorMode.system,
             returnValueForMissingStub: _i9.ColorMode.system,
           )
@@ -273,10 +205,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setColorMode(_i9.ColorMode? color) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setColorMode, [color]),
-              #setColorMode,
-              [color],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -285,10 +214,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setLocale(_i10.AppLocale? locale) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setLocale, [locale]),
-              #setLocale,
-              [locale],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -297,10 +223,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   int getPort() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getPort, []),
-              #getPort,
-              [],
-            ),
             returnValue: 0,
             returnValueForMissingStub: 0,
           )
@@ -309,10 +232,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setPort(int? port) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setPort, [port]),
-              #setPort,
-              [port],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -321,10 +241,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setNetworkWhitelist(List<String>? whitelist) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setNetworkWhitelist, [whitelist]),
-              #setNetworkWhitelist,
-              [whitelist],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -333,10 +250,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setNetworkBlacklist(List<String>? blacklist) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setNetworkBlacklist, [blacklist]),
-              #setNetworkBlacklist,
-              [blacklist],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -345,10 +259,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   int getDiscoveryTimeout() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getDiscoveryTimeout, []),
-              #getDiscoveryTimeout,
-              [],
-            ),
             returnValue: 0,
             returnValueForMissingStub: 0,
           )
@@ -357,10 +268,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setDiscoveryTimeout(int? timeout) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setDiscoveryTimeout, [timeout]),
-              #setDiscoveryTimeout,
-              [timeout],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -369,10 +277,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool getShareViaLinkAutoAccept() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getShareViaLinkAutoAccept, []),
-              #getShareViaLinkAutoAccept,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -381,10 +286,9 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setShareViaLinkAutoAccept(bool? shareViaLinkAutoAccept) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setShareViaLinkAutoAccept, [
-              #setShareViaLinkAutoAccept,
+              shareViaLinkAutoAccept,
-              [shareViaLinkAutoAccept],
+            ]),
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -393,23 +297,14 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   String getMulticastGroup() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getMulticastGroup, []),
-              #getMulticastGroup,
-              [],
-            ),
             returnValue: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getMulticastGroup, []),
-                #getMulticastGroup,
-                [],
-              ),
             ),
             returnValueForMissingStub: _i7.dummyValue<String>(
               this,
-              Invocation.method(
+              Invocation.method(#getMulticastGroup, []),
-                #getMulticastGroup,
-                [],
-              ),
             ),
           )
           as String);
@@ -417,10 +312,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setMulticastGroup(String? group) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setMulticastGroup, [group]),
-              #setMulticastGroup,
-              [group],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -429,10 +321,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setDestination(String? destination) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setDestination, [destination]),
-              #setDestination,
-              [destination],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -441,10 +330,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isSaveToGallery() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isSaveToGallery, []),
-              #isSaveToGallery,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -453,10 +339,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSaveToGallery(bool? saveToGallery) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSaveToGallery, [saveToGallery]),
-              #setSaveToGallery,
-              [saveToGallery],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -465,10 +348,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isSaveToHistory() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isSaveToHistory, []),
-              #isSaveToHistory,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -477,10 +357,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSaveToHistory(bool? saveToHistory) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSaveToHistory, [saveToHistory]),
-              #setSaveToHistory,
-              [saveToHistory],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -489,10 +366,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool getAdvancedSettingsEnabled() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getAdvancedSettingsEnabled, []),
-              #getAdvancedSettingsEnabled,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -501,10 +375,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setAdvancedSettingsEnabled(bool? isEnabled) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setAdvancedSettingsEnabled, [isEnabled]),
-              #setAdvancedSettingsEnabled,
-              [isEnabled],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -513,10 +384,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isQuickSave() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isQuickSave, []),
-              #isQuickSave,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -525,10 +393,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setQuickSave(bool? quickSave) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setQuickSave, [quickSave]),
-              #setQuickSave,
-              [quickSave],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -537,10 +402,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isQuickSaveFromFavorites() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isQuickSaveFromFavorites, []),
-              #isQuickSaveFromFavorites,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -549,10 +411,9 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setQuickSaveFromFavorites(bool? quickSaveFromFavorites) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setQuickSaveFromFavorites, [
-              #setQuickSaveFromFavorites,
+              quickSaveFromFavorites,
-              [quickSaveFromFavorites],
+            ]),
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -561,10 +422,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setReceivePin(String? pin) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setReceivePin, [pin]),
-              #setReceivePin,
-              [pin],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -573,10 +431,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isAutoFinish() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isAutoFinish, []),
-              #isAutoFinish,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -585,10 +440,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setAutoFinish(bool? autoFinish) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setAutoFinish, [autoFinish]),
-              #setAutoFinish,
-              [autoFinish],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -597,10 +449,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isMinimizeToTray() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isMinimizeToTray, []),
-              #isMinimizeToTray,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -609,10 +458,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setMinimizeToTray(bool? minimizeToTray) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setMinimizeToTray, [minimizeToTray]),
-              #setMinimizeToTray,
-              [minimizeToTray],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -621,10 +467,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool isHttps() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#isHttps, []),
-              #isHttps,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -633,10 +476,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setHttps(bool? https) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setHttps, [https]),
-              #setHttps,
-              [https],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -645,10 +485,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i11.SendMode getSendMode() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getSendMode, []),
-              #getSendMode,
-              [],
-            ),
             returnValue: _i11.SendMode.single,
             returnValueForMissingStub: _i11.SendMode.single,
           )
@@ -657,10 +494,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSendMode(_i11.SendMode? mode) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSendMode, [mode]),
-              #setSendMode,
-              [mode],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -669,10 +503,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setWindowOffsetX(double? x) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setWindowOffsetX, [x]),
-              #setWindowOffsetX,
-              [x],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -681,10 +512,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setWindowOffsetY(double? y) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setWindowOffsetY, [y]),
-              #setWindowOffsetY,
-              [y],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -693,10 +521,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setWindowHeight(double? height) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setWindowHeight, [height]),
-              #setWindowHeight,
-              [height],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -705,10 +530,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setWindowWidth(double? width) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setWindowWidth, [width]),
-              #setWindowWidth,
-              [width],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -717,10 +539,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setSaveWindowPlacement(bool? savePlacement) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setSaveWindowPlacement, [savePlacement]),
-              #setSaveWindowPlacement,
-              [savePlacement],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -729,10 +548,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool getSaveWindowPlacement() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getSaveWindowPlacement, []),
-              #getSaveWindowPlacement,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -741,10 +557,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setEnableAnimations(bool? enableAnimations) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setEnableAnimations, [enableAnimations]),
-              #setEnableAnimations,
-              [enableAnimations],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -753,10 +566,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   bool getEnableAnimations() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getEnableAnimations, []),
-              #getEnableAnimations,
-              [],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -765,10 +575,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setDeviceType(_i12.DeviceType? deviceType) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setDeviceType, [deviceType]),
-              #setDeviceType,
-              [deviceType],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -777,10 +584,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> setDeviceModel(String? deviceModel) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setDeviceModel, [deviceModel]),
-              #setDeviceModel,
-              [deviceModel],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -789,10 +593,7 @@ class MockPersistenceService extends _i1.Mock implements _i3.PersistenceService
   @override
   _i4.Future<void> clear() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#clear, []),
-              #clear,
-              [],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )
@@ -806,10 +607,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   Set<String> getKeys() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getKeys, []),
-              #getKeys,
-              [],
-            ),
             returnValue: <String>{},
             returnValueForMissingStub: <String>{},
           )
@@ -818,10 +616,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   Object? get(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#get, [key]),
-              #get,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as Object?);
@@ -829,10 +624,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   bool? getBool(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getBool, [key]),
-              #getBool,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as bool?);
@@ -840,10 +632,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   int? getInt(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getInt, [key]),
-              #getInt,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as int?);
@@ -851,10 +640,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   double? getDouble(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getDouble, [key]),
-              #getDouble,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as double?);
@@ -862,10 +648,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   String? getString(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getString, [key]),
-              #getString,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as String?);
@@ -873,10 +656,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   bool containsKey(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#containsKey, [key]),
-              #containsKey,
-              [key],
-            ),
             returnValue: false,
             returnValueForMissingStub: false,
           )
@@ -885,99 +665,51 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   List<String>? getStringList(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#getStringList, [key]),
-              #getStringList,
-              [key],
-            ),
             returnValueForMissingStub: null,
           )
           as List<String>?);
 
   @override
-  _i4.Future<bool> setBool(
+  _i4.Future<bool> setBool(String? key, bool? value) =>
-    String? key,
-    bool? value,
-  ) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setBool, [key, value]),
-              #setBool,
-              [
-                key,
-                value,
-              ],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
           as _i4.Future<bool>);
 
   @override
-  _i4.Future<bool> setInt(
+  _i4.Future<bool> setInt(String? key, int? value) =>
-    String? key,
-    int? value,
-  ) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setInt, [key, value]),
-              #setInt,
-              [
-                key,
-                value,
-              ],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
           as _i4.Future<bool>);
 
   @override
-  _i4.Future<bool> setDouble(
+  _i4.Future<bool> setDouble(String? key, double? value) =>
-    String? key,
-    double? value,
-  ) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setDouble, [key, value]),
-              #setDouble,
-              [
-                key,
-                value,
-              ],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
           as _i4.Future<bool>);
 
   @override
-  _i4.Future<bool> setString(
+  _i4.Future<bool> setString(String? key, String? value) =>
-    String? key,
-    String? value,
-  ) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setString, [key, value]),
-              #setString,
-              [
-                key,
-                value,
-              ],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
           as _i4.Future<bool>);
 
   @override
-  _i4.Future<bool> setStringList(
+  _i4.Future<bool> setStringList(String? key, List<String>? value) =>
-    String? key,
-    List<String>? value,
-  ) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#setStringList, [key, value]),
-              #setStringList,
-              [
-                key,
-                value,
-              ],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
@@ -986,10 +718,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   _i4.Future<bool> remove(String? key) =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#remove, [key]),
-              #remove,
-              [key],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
@@ -998,10 +727,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   _i4.Future<bool> commit() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#commit, []),
-              #commit,
-              [],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
@@ -1010,10 +736,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   _i4.Future<bool> clear() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#clear, []),
-              #clear,
-              [],
-            ),
             returnValue: _i4.Future<bool>.value(false),
             returnValueForMissingStub: _i4.Future<bool>.value(false),
           )
@@ -1022,10 +745,7 @@ class MockSharedPreferences extends _i1.Mock implements _i13.SharedPreferences {
   @override
   _i4.Future<void> reload() =>
       (super.noSuchMethod(
-            Invocation.method(
+            Invocation.method(#reload, []),
-              #reload,
-              [],
-            ),
             returnValue: _i4.Future<void>.value(),
             returnValueForMissingStub: _i4.Future<void>.value(),
           )

core/src/http/client/mod.rs

@@ -5,8 +5,8 @@ pub mod v3;
 pub use v2::LsHttpClientV2;
 pub use v3::LsHttpClientV3;
 
-use crate::crypto;
 use crate::http::StatusCodeError;
+use crate::{crypto, http};
 use reqwest::Response;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
@@ -16,6 +16,11 @@ pub enum LsHttpClient {
     V3(LsHttpClientV3),
 }
 
+pub enum LsHttpClientVersion {
+    V2,
+    V3,
+}
+
 #[derive(Debug, Error)]
 pub enum ClientError {
     #[error(transparent)]
@@ -34,7 +39,114 @@ pub enum ClientError {
     Other(#[from] anyhow::Error),
 }
 
-pub(super) fn create_reqwest_client(private_key: &str, cert: &str) -> Result<reqwest::Client, ClientError> {
+impl LsHttpClient {
+    pub fn new(
+        private_key: &str,
+        cert: &str,
+        version: LsHttpClientVersion,
+    ) -> Result<LsHttpClient, ClientError> {
+        let client = match version {
+            LsHttpClientVersion::V2 => {
+                LsHttpClient::V2(LsHttpClientV2::try_new(&private_key, &cert)?)
+            }
+            LsHttpClientVersion::V3 => {
+                LsHttpClient::V3(LsHttpClientV3::try_new(&private_key, &cert)?)
+            }
+        };
+
+        Ok(client)
+    }
+
+    pub async fn register(
+        &self,
+        protocol: http::dto::ProtocolType,
+        ip: &str,
+        port: u16,
+        payload: http::dto::RegisterDto,
+    ) -> Result<ResultWithPublicKey<http::dto::RegisterResponseDto>, ClientError> {
+        match self {
+            LsHttpClient::V2(client) => {
+                let result = client.register(protocol, ip, port, payload.into()).await?;
+                Ok(ResultWithPublicKey {
+                    public_key: result.public_key,
+                    body: result.body.into(),
+                })
+            }
+            LsHttpClient::V3(client) => client.register(protocol, ip, port, payload).await,
+        }
+    }
+
+    pub async fn prepare_upload(
+        &self,
+        protocol: http::dto::ProtocolType,
+        ip: &str,
+        port: u16,
+        public_key: Option<String>,
+        payload: http::dto::PrepareUploadRequestDto,
+        pin: Option<&str>,
+    ) -> Result<http::dto::PrepareUploadResult, ClientError> {
+        match self {
+            LsHttpClient::V2(client) => {
+                let result = client
+                    .prepare_upload(protocol, ip, port, public_key, payload.into(), pin)
+                    .await?;
+                Ok(result.into())
+            }
+            LsHttpClient::V3(client) => {
+                client
+                    .prepare_upload(protocol, ip, port, public_key, payload)
+                    .await
+            }
+        }
+    }
+
+    pub async fn upload(
+        &self,
+        protocol: http::dto::ProtocolType,
+        ip: &str,
+        port: u16,
+        public_key: Option<String>,
+        session_id: &str,
+        file_id: &str,
+        token: &str,
+        binary: tokio::sync::mpsc::Receiver<Vec<u8>>,
+    ) -> Result<(), ClientError> {
+        match self {
+            LsHttpClient::V2(client) => {
+                client
+                    .upload(
+                        protocol, ip, port, public_key, session_id, file_id, token, binary,
+                    )
+                    .await
+            }
+            LsHttpClient::V3(client) => {
+                client
+                    .upload(
+                        protocol, ip, port, public_key, session_id, file_id, token, binary,
+                    )
+                    .await
+            }
+        }
+    }
+
+    pub async fn cancel(
+        &self,
+        protocol: http::dto::ProtocolType,
+        ip: &str,
+        port: u16,
+        session_id: &str,
+    ) -> Result<(), ClientError> {
+        match self {
+            LsHttpClient::V2(client) => client.cancel(protocol, ip, port, session_id).await,
+            LsHttpClient::V3(client) => client.cancel(protocol, ip, port, session_id).await,
+        }
+    }
+}
+
+pub(super) fn create_reqwest_client(
+    private_key: &str,
+    cert: &str,
+) -> Result<reqwest::Client, ClientError> {
     let _ = rustls::crypto::ring::default_provider().install_default();
 
     let identity = {
@@ -78,6 +190,16 @@ struct ErrorResponse {
     message: String,
 }
 
+pub struct ResultWithPublicKey<T> {
+    /// The public key extracted from the certificate.
+    /// Encoded in PEM format.
+    /// Only available in HTTPS mode.
+    pub public_key: Option<String>,
+
+    /// The response body.
+    pub body: T,
+}
+
 pub(super) trait ResponseExt {
     async fn into_error<T>(self) -> Result<T, ClientError>;
 }
@@ -92,7 +214,11 @@ impl ResponseExt for Response {
         };
         Err(ClientError::StatusCode(StatusCodeError {
             status,
-            message: if message.is_empty() { None } else { Some(message) },
+            message: if message.is_empty() {
+                None
+            } else {
+                Some(message)
+            },
         }))
     }
 }

core/src/http/client/v2.rs

@@ -1,22 +1,16 @@
-use super::{ClientError, ResponseExt};
+use super::{ClientError, ResponseExt, ResultWithPublicKey};
 use crate::http::client::url::{ApiVersion, TargetUrl};
-use crate::http::dto_v2::{InfoResponseDtoV2, PrepareDownloadResponseDtoV2, PrepareUploadRequestDtoV2, PrepareUploadResponseDtoV2, PrepareUploadResultV2, ProtocolTypeV2, RegisterDtoV2, RegisterResponseDtoV2};
+use crate::http::dto_v2::{
+    InfoResponseDtoV2, PrepareDownloadResponseDtoV2, PrepareUploadRequestDtoV2,
+    PrepareUploadResponseDtoV2, PrepareUploadResultV2, RegisterDtoV2,
+    RegisterResponseDtoV2,
+};
 use futures_util::StreamExt;
 use reqwest::{Response, StatusCode};
 use tokio::io::AsyncWriteExt;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
-
+use crate::http::dto::ProtocolType;
-/// Result of a successful register request.
-pub struct RegisterResultV2 {
-    /// The public key extracted from the certificate.
-    /// Encoded in PEM format.
-    /// Only available in HTTPS mode.
-    pub public_key: Option<String>,
-
-    /// The response body from the register request.
-    pub body: RegisterResponseDtoV2,
-}
 
 /// HTTP client for LocalSend Protocol v2.1.
 pub struct LsHttpClientV2 {
@@ -67,11 +61,11 @@ impl LsHttpClientV2 {
     /// Registration result containing the remote device info and optional public key.
     pub async fn register(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         payload: RegisterDtoV2,
-    ) -> Result<RegisterResultV2, ClientError> {
+    ) -> Result<ResultWithPublicKey<RegisterResponseDtoV2>, ClientError> {
         let url = TargetUrl {
             version: ApiVersion::V2,
             protocol: protocol.as_str(),
@@ -95,13 +89,13 @@ impl LsHttpClientV2 {
         }
 
         let public_key = match protocol {
-            ProtocolTypeV2::Https => Some(super::verify_cert_from_res(&res, None)?),
+            ProtocolType::Https => Some(super::verify_cert_from_res(&res, None)?),
             _ => None,
         };
 
         let body = res.json::<RegisterResponseDtoV2>().await?;
 
-        Ok(RegisterResultV2 { public_key, body })
+        Ok(ResultWithPublicKey { public_key, body })
     }
 
     /// Prepares a file upload session with the receiver.
@@ -131,7 +125,7 @@ impl LsHttpClientV2 {
     /// * 500 - Unknown error
     pub async fn prepare_upload(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         public_key: Option<String>,
@@ -160,8 +154,8 @@ impl LsHttpClientV2 {
             .send()
             .await?;
 
-        if let Some(public_key) = public_key {
+        if protocol == ProtocolType::Https {
-            super::verify_cert_from_res(&res, Some(public_key))?;
+            super::verify_cert_from_res(&res, public_key)?;
         }
 
         let status = res.status();
@@ -201,9 +195,10 @@ impl LsHttpClientV2 {
     /// * 500 - Unknown error
     pub async fn upload(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
+        public_key: Option<String>,
         session_id: &str,
         file_id: &str,
         token: &str,
@@ -228,6 +223,10 @@ impl LsHttpClientV2 {
 
         let res = self.client.post(&url).body(body).send().await?;
 
+        if protocol == ProtocolType::Https {
+            super::verify_cert_from_res(&res, public_key)?;
+        }
+
         if res.status() != StatusCode::OK {
             return res.into_error().await;
         }
@@ -246,7 +245,7 @@ impl LsHttpClientV2 {
     /// * `session_id` - Session ID to cancel
     pub async fn cancel(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         session_id: &str,
@@ -281,7 +280,7 @@ impl LsHttpClientV2 {
     /// Device information including alias, version, device type, fingerprint, etc.
     pub async fn info(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
     ) -> Result<InfoResponseDtoV2, ClientError> {
@@ -330,7 +329,7 @@ impl LsHttpClientV2 {
     /// * 500 - Unknown error
     pub async fn prepare_download(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         session_id: Option<&str>,
@@ -381,7 +380,7 @@ impl LsHttpClientV2 {
     /// Response containing the file data stream.
     pub async fn download(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         session_id: &str,
@@ -420,7 +419,7 @@ impl LsHttpClientV2 {
     /// Total bytes written.
     pub async fn download_to_writer<W: tokio::io::AsyncWrite + Unpin>(
         &self,
-        protocol: &ProtocolTypeV2,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         session_id: &str,

core/src/http/client/v3.rs

@@ -1,4 +1,4 @@
-use super::{ClientError, ResponseExt};
+use super::{ClientError, ResponseExt, ResultWithPublicKey};
 use crate::http;
 use crate::http::client::url::{ApiVersion, TargetUrl};
 use crate::http::dto::ProtocolType;
@@ -21,16 +21,6 @@ pub struct LsHttpClientV3 {
     generated_nonce_map: Arc<Mutex<LruCache<String, Vec<u8>>>>,
 }
 
-pub struct RegisterResult {
-    /// The public key extracted from the certificate.
-    /// Encoded in PEM format.
-    /// Only available in HTTPS.
-    pub public_key: Option<String>,
-
-    /// The response body from the register request.
-    pub body: http::dto::RegisterResponseDto,
-}
-
 impl LsHttpClientV3 {
     pub fn try_new(private_key: &str, cert: &str) -> Result<Self, ClientError> {
         Ok(Self {
@@ -46,7 +36,7 @@ impl LsHttpClientV3 {
 
     pub async fn nonce(
         &self,
-        protocol: &ProtocolType,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
     ) -> Result<String, ClientError> {
@@ -79,7 +69,7 @@ impl LsHttpClientV3 {
             return res.into_error().await;
         }
 
-        let remote_key = to_identifier(&res, protocol == &ProtocolType::Https, None)?;
+        let remote_key = to_identifier(&res, protocol == ProtocolType::Https, None)?;
         let body = res.json::<http::dto::NonceResponse>().await?;
 
         // Save the response nonce and our generated nonce
@@ -107,11 +97,11 @@ impl LsHttpClientV3 {
 
     pub async fn register(
         &self,
-        protocol: &ProtocolType,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         payload: http::dto::RegisterDto,
-    ) -> Result<RegisterResult, ClientError> {
+    ) -> Result<ResultWithPublicKey<http::dto::RegisterResponseDto>, ClientError> {
         let res = self
             .client
             .post(
@@ -136,17 +126,17 @@ impl LsHttpClientV3 {
 
         let body = res.json::<http::dto::RegisterResponseDto>().await?;
 
-        Ok(RegisterResult { public_key, body })
+        Ok(ResultWithPublicKey { public_key, body })
     }
 
     pub async fn prepare_upload(
         &self,
-        protocol: &ProtocolType,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
         public_key: Option<String>,
         payload: http::dto::PrepareUploadRequestDto,
-    ) -> Result<http::dto::PrepareUploadResponseDto, ClientError> {
+    ) -> Result<http::dto::PrepareUploadResult, ClientError> {
         let res = self
             .client
             .post(
@@ -164,28 +154,34 @@ impl LsHttpClientV3 {
             .send()
             .await?;
 
-        if let Some(public_key) = public_key {
+        if protocol == ProtocolType::Https {
-            super::verify_cert_from_res(&res, Some(public_key))?;
+            super::verify_cert_from_res(&res, public_key)?;
         }
 
-        if res.status() != StatusCode::OK {
+        let status = res.status();
+
+        if status.as_u16() >= 400 {
             return res.into_error().await;
         }
 
-        let body = res.json::<http::dto::PrepareUploadResponseDto>().await?;
+        let response = res.json::<http::dto::PrepareUploadResponseDto>().await?;
 
-        Ok(body)
+        Ok(http::dto::PrepareUploadResult {
+            status_code: status.as_u16(),
+            response,
+        })
     }
 
     /// Uploads a file to the server.
     pub async fn upload(
         &self,
-        protocol: &ProtocolType,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
-        session_id: String,
+        public_key: Option<String>,
-        file_id: String,
+        session_id: &str,
-        token: String,
+        file_id: &str,
+        token: &str,
         binary: mpsc::Receiver<Vec<u8>>,
     ) -> Result<(), ClientError> {
         let res = self
@@ -212,6 +208,10 @@ impl LsHttpClientV3 {
             .send()
             .await?;
 
+        if protocol == ProtocolType::Https {
+            super::verify_cert_from_res(&res, public_key)?;
+        }
+
         if res.status() != StatusCode::OK {
             return res.into_error().await;
         }
@@ -221,10 +221,10 @@ impl LsHttpClientV3 {
 
     pub async fn cancel(
         &self,
-        protocol: &ProtocolType,
+        protocol: ProtocolType,
         ip: &str,
         port: u16,
-        session_id: String,
+        session_id: &str,
     ) -> Result<(), ClientError> {
         self.client
             .post(
@@ -234,7 +234,7 @@ impl LsHttpClientV3 {
                     host: ip.to_string(),
                     port,
                     path: "/cancel",
-                    params: &[("sessionId", &session_id)],
+                    params: &[("sessionId", session_id)],
                 }
                 .to_string(),
             )

core/src/http/dto.rs

@@ -1,3 +1,7 @@
+use crate::http::dto_v2::{
+    PrepareUploadRequestDtoV2, PrepareUploadResponseDtoV2, ProtocolTypeV2, RegisterDtoV2,
+    RegisterResponseDtoV2,
+};
 use crate::model::discovery::DeviceType;
 use crate::model::transfer::FileDto;
 use serde::{Deserialize, Serialize};
@@ -60,6 +64,30 @@ impl ProtocolType {
     }
 }
 
+impl From<ProtocolType> for ProtocolTypeV2 {
+    fn from(p: ProtocolType) -> Self {
+        match p {
+            ProtocolType::Http => ProtocolTypeV2::Http,
+            ProtocolType::Https => ProtocolTypeV2::Https,
+        }
+    }
+}
+
+impl From<RegisterDto> for RegisterDtoV2 {
+    fn from(v3: RegisterDto) -> Self {
+        RegisterDtoV2 {
+            alias: v3.alias,
+            version: v3.version,
+            device_model: v3.device_model,
+            device_type: v3.device_type,
+            fingerprint: v3.token,
+            port: v3.port,
+            protocol: v3.protocol.into(),
+            download: v3.has_web_interface,
+        }
+    }
+}
+
 /// Similar to `RegisterDto`, but without `port` and `protocol` (those are already known).
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -94,6 +122,51 @@ pub struct PrepareUploadResponseDto {
     pub files: HashMap<String, String>,
 }
 
+impl From<PrepareUploadRequestDto> for PrepareUploadRequestDtoV2 {
+    fn from(v3: PrepareUploadRequestDto) -> Self {
+        PrepareUploadRequestDtoV2 {
+            info: v3.info.into(),
+            files: v3.files,
+        }
+    }
+}
+
+pub struct PrepareUploadResult {
+    pub status_code: u16,
+    pub response: PrepareUploadResponseDto,
+}
+
+impl From<PrepareUploadResponseDtoV2> for PrepareUploadResponseDto {
+    fn from(v2: PrepareUploadResponseDtoV2) -> Self {
+        PrepareUploadResponseDto {
+            session_id: v2.session_id,
+            files: v2.files,
+        }
+    }
+}
+
+impl From<crate::http::dto_v2::PrepareUploadResultV2> for PrepareUploadResult {
+    fn from(v2: crate::http::dto_v2::PrepareUploadResultV2) -> Self {
+        PrepareUploadResult {
+            status_code: v2.status_code,
+            response: v2.response.into(),
+        }
+    }
+}
+
+impl From<RegisterResponseDtoV2> for RegisterResponseDto {
+    fn from(v2: RegisterResponseDtoV2) -> Self {
+        RegisterResponseDto {
+            alias: v2.alias,
+            version: v2.version,
+            device_model: v2.device_model,
+            device_type: v2.device_type,
+            token: v2.fingerprint,
+            has_web_interface: v2.download,
+        }
+    }
+}
+
 fn is_default<T: Default + PartialEq>(t: &T) -> bool {
     t == &T::default()
 }

core/src/main.rs

@@ -161,7 +161,7 @@ async fn client_test() -> Result<()> {
     let client = LsHttpClientV3::try_new(PRIVATE_KEY, CERT)?;
 
     let nonce = client
-        .nonce(&ProtocolType::Https, "localhost", 53317)
+        .nonce(ProtocolType::Https, "localhost", 53317)
         .await?;
 
     println!("Received Nonce: {}", nonce);
@@ -179,7 +179,7 @@ async fn client_test() -> Result<()> {
 
     let response = client
         .register(
-            &ProtocolType::Https,
+            ProtocolType::Https,
             "localhost",
             53317,
             register_dto.clone(),
@@ -210,15 +210,15 @@ async fn client_test() -> Result<()> {
 
     let prepare_upload_response = client
         .prepare_upload(
-            &ProtocolType::Https,
+            ProtocolType::Https,
             "localhost",
             53317,
-            response.public_key,
+            None,
             prepare_upload_dto,
         )
         .await?;
 
-    println!("Prepare Upload Response: {:?}", prepare_upload_response);
+    println!("Prepare Upload Response: {:?}", prepare_upload_response.response);
 
     Ok(())
 }