increase min sdk and apply new formatter

app/lib/features/user/data/models/engine_settings.dart

@@ -60,24 +60,25 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
     bool? cookieBannerHandlingGlobalRulesSubFrames,
     WebContentIsolationStrategy? webContentIsolationStrategy,
   }) : super(
-          javascriptEnabled: javascriptEnabled ?? true,
-          trackingProtectionPolicy:
-              trackingProtectionPolicy ?? TrackingProtectionPolicy.strict,
-          httpsOnlyMode: httpsOnlyMode ?? HttpsOnlyMode.enabled,
-          globalPrivacyControlEnabled: globalPrivacyControlEnabled ?? true,
-          preferredColorScheme: preferredColorScheme ?? ColorScheme.system,
-          cookieBannerHandlingMode:
-              cookieBannerHandlingMode ?? CookieBannerHandlingMode.rejectAll,
-          cookieBannerHandlingModePrivateBrowsing:
-              cookieBannerHandlingModePrivateBrowsing ??
-                  CookieBannerHandlingMode.rejectAll,
-          cookieBannerHandlingGlobalRules:
-              cookieBannerHandlingGlobalRules ?? true,
-          cookieBannerHandlingGlobalRulesSubFrames:
-              cookieBannerHandlingGlobalRulesSubFrames ?? true,
-          webContentIsolationStrategy: webContentIsolationStrategy ??
-              WebContentIsolationStrategy.isolateHighValue,
-        );
+         javascriptEnabled: javascriptEnabled ?? true,
+         trackingProtectionPolicy:
+             trackingProtectionPolicy ?? TrackingProtectionPolicy.strict,
+         httpsOnlyMode: httpsOnlyMode ?? HttpsOnlyMode.enabled,
+         globalPrivacyControlEnabled: globalPrivacyControlEnabled ?? true,
+         preferredColorScheme: preferredColorScheme ?? ColorScheme.system,
+         cookieBannerHandlingMode:
+             cookieBannerHandlingMode ?? CookieBannerHandlingMode.rejectAll,
+         cookieBannerHandlingModePrivateBrowsing:
+             cookieBannerHandlingModePrivateBrowsing ??
+             CookieBannerHandlingMode.rejectAll,
+         cookieBannerHandlingGlobalRules:
+             cookieBannerHandlingGlobalRules ?? true,
+         cookieBannerHandlingGlobalRulesSubFrames:
+             cookieBannerHandlingGlobalRulesSubFrames ?? true,
+         webContentIsolationStrategy:
+             webContentIsolationStrategy ??
+             WebContentIsolationStrategy.isolateHighValue,
+       );
 
   factory EngineSettings.fromJson(Map<String, dynamic> json) =>
       _$EngineSettingsFromJson(json);
@@ -89,15 +90,15 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
 
   @override
   List<Object?> get hashParameters => [
-        super.javascriptEnabled,
-        super.trackingProtectionPolicy,
-        super.httpsOnlyMode,
-        super.globalPrivacyControlEnabled,
-        super.preferredColorScheme,
-        super.cookieBannerHandlingMode,
-        super.cookieBannerHandlingModePrivateBrowsing,
-        super.cookieBannerHandlingGlobalRules,
-        super.cookieBannerHandlingGlobalRulesSubFrames,
-        super.webContentIsolationStrategy,
-      ];
+    super.javascriptEnabled,
+    super.trackingProtectionPolicy,
+    super.httpsOnlyMode,
+    super.globalPrivacyControlEnabled,
+    super.preferredColorScheme,
+    super.cookieBannerHandlingMode,
+    super.cookieBannerHandlingModePrivateBrowsing,
+    super.cookieBannerHandlingGlobalRules,
+    super.cookieBannerHandlingGlobalRulesSubFrames,
+    super.webContentIsolationStrategy,
+  ];
 }

app/lib/features/user/data/models/engine_settings.g.dart

@@ -10,7 +10,8 @@ abstract class _$EngineSettingsCWProxy {
   EngineSettings javascriptEnabled(bool? javascriptEnabled);
 
   EngineSettings trackingProtectionPolicy(
-      TrackingProtectionPolicy? trackingProtectionPolicy);
+    TrackingProtectionPolicy? trackingProtectionPolicy,
+  );
 
   EngineSettings httpsOnlyMode(HttpsOnlyMode? httpsOnlyMode);
 
@@ -19,19 +20,24 @@ abstract class _$EngineSettingsCWProxy {
   EngineSettings preferredColorScheme(ColorScheme? preferredColorScheme);
 
   EngineSettings cookieBannerHandlingMode(
-      CookieBannerHandlingMode? cookieBannerHandlingMode);
+    CookieBannerHandlingMode? cookieBannerHandlingMode,
+  );
 
   EngineSettings cookieBannerHandlingModePrivateBrowsing(
-      CookieBannerHandlingMode? cookieBannerHandlingModePrivateBrowsing);
+    CookieBannerHandlingMode? cookieBannerHandlingModePrivateBrowsing,
+  );
 
   EngineSettings cookieBannerHandlingGlobalRules(
-      bool? cookieBannerHandlingGlobalRules);
+    bool? cookieBannerHandlingGlobalRules,
+  );
 
   EngineSettings cookieBannerHandlingGlobalRulesSubFrames(
-      bool? cookieBannerHandlingGlobalRulesSubFrames);
+    bool? cookieBannerHandlingGlobalRulesSubFrames,
+  );
 
   EngineSettings webContentIsolationStrategy(
-      WebContentIsolationStrategy? webContentIsolationStrategy);
+    WebContentIsolationStrategy? webContentIsolationStrategy,
+  );
 
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `EngineSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
@@ -65,8 +71,8 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
 
   @override
   EngineSettings trackingProtectionPolicy(
-          TrackingProtectionPolicy? trackingProtectionPolicy) =>
-      this(trackingProtectionPolicy: trackingProtectionPolicy);
+    TrackingProtectionPolicy? trackingProtectionPolicy,
+  ) => this(trackingProtectionPolicy: trackingProtectionPolicy);
 
   @override
   EngineSettings httpsOnlyMode(HttpsOnlyMode? httpsOnlyMode) =>
@@ -74,8 +80,8 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
 
   @override
   EngineSettings globalPrivacyControlEnabled(
-          bool? globalPrivacyControlEnabled) =>
-      this(globalPrivacyControlEnabled: globalPrivacyControlEnabled);
+    bool? globalPrivacyControlEnabled,
+  ) => this(globalPrivacyControlEnabled: globalPrivacyControlEnabled);
 
   @override
   EngineSettings preferredColorScheme(ColorScheme? preferredColorScheme) =>
@@ -83,35 +89,36 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
 
   @override
   EngineSettings cookieBannerHandlingMode(
-          CookieBannerHandlingMode? cookieBannerHandlingMode) =>
-      this(cookieBannerHandlingMode: cookieBannerHandlingMode);
+    CookieBannerHandlingMode? cookieBannerHandlingMode,
+  ) => this(cookieBannerHandlingMode: cookieBannerHandlingMode);
 
   @override
   EngineSettings cookieBannerHandlingModePrivateBrowsing(
-          CookieBannerHandlingMode? cookieBannerHandlingModePrivateBrowsing) =>
-      this(
-          cookieBannerHandlingModePrivateBrowsing:
-              cookieBannerHandlingModePrivateBrowsing);
+    CookieBannerHandlingMode? cookieBannerHandlingModePrivateBrowsing,
+  ) => this(
+    cookieBannerHandlingModePrivateBrowsing:
+        cookieBannerHandlingModePrivateBrowsing,
+  );
 
   @override
   EngineSettings cookieBannerHandlingGlobalRules(
-          bool? cookieBannerHandlingGlobalRules) =>
-      this(cookieBannerHandlingGlobalRules: cookieBannerHandlingGlobalRules);
+    bool? cookieBannerHandlingGlobalRules,
+  ) => this(cookieBannerHandlingGlobalRules: cookieBannerHandlingGlobalRules);
 
   @override
   EngineSettings cookieBannerHandlingGlobalRulesSubFrames(
-          bool? cookieBannerHandlingGlobalRulesSubFrames) =>
-      this(
-          cookieBannerHandlingGlobalRulesSubFrames:
-              cookieBannerHandlingGlobalRulesSubFrames);
+    bool? cookieBannerHandlingGlobalRulesSubFrames,
+  ) => this(
+    cookieBannerHandlingGlobalRulesSubFrames:
+        cookieBannerHandlingGlobalRulesSubFrames,
+  );
 
   @override
   EngineSettings webContentIsolationStrategy(
-          WebContentIsolationStrategy? webContentIsolationStrategy) =>
-      this(webContentIsolationStrategy: webContentIsolationStrategy);
+    WebContentIsolationStrategy? webContentIsolationStrategy,
+  ) => this(webContentIsolationStrategy: webContentIsolationStrategy);
 
   @override
-
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `EngineSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
@@ -133,28 +140,31 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
     Object? webContentIsolationStrategy = const $CopyWithPlaceholder(),
   }) {
     return EngineSettings(
-      javascriptEnabled: javascriptEnabled == const $CopyWithPlaceholder()
-          ? _value.javascriptEnabled
-          // ignore: cast_nullable_to_non_nullable
-          : javascriptEnabled as bool?,
+      javascriptEnabled:
+          javascriptEnabled == const $CopyWithPlaceholder()
+              ? _value.javascriptEnabled
+              // ignore: cast_nullable_to_non_nullable
+              : javascriptEnabled as bool?,
       trackingProtectionPolicy:
           trackingProtectionPolicy == const $CopyWithPlaceholder()
               ? _value.trackingProtectionPolicy
               // ignore: cast_nullable_to_non_nullable
               : trackingProtectionPolicy as TrackingProtectionPolicy?,
-      httpsOnlyMode: httpsOnlyMode == const $CopyWithPlaceholder()
-          ? _value.httpsOnlyMode
-          // ignore: cast_nullable_to_non_nullable
-          : httpsOnlyMode as HttpsOnlyMode?,
+      httpsOnlyMode:
+          httpsOnlyMode == const $CopyWithPlaceholder()
+              ? _value.httpsOnlyMode
+              // ignore: cast_nullable_to_non_nullable
+              : httpsOnlyMode as HttpsOnlyMode?,
       globalPrivacyControlEnabled:
           globalPrivacyControlEnabled == const $CopyWithPlaceholder()
               ? _value.globalPrivacyControlEnabled
               // ignore: cast_nullable_to_non_nullable
               : globalPrivacyControlEnabled as bool?,
-      preferredColorScheme: preferredColorScheme == const $CopyWithPlaceholder()
-          ? _value.preferredColorScheme
-          // ignore: cast_nullable_to_non_nullable
-          : preferredColorScheme as ColorScheme?,
+      preferredColorScheme:
+          preferredColorScheme == const $CopyWithPlaceholder()
+              ? _value.preferredColorScheme
+              // ignore: cast_nullable_to_non_nullable
+              : preferredColorScheme as ColorScheme?,
       cookieBannerHandlingMode:
           cookieBannerHandlingMode == const $CopyWithPlaceholder()
               ? _value.cookieBannerHandlingMode
@@ -201,47 +211,57 @@ EngineSettings _$EngineSettingsFromJson(Map<String, dynamic> json) =>
     EngineSettings.withDefaults(
       javascriptEnabled: json['javascriptEnabled'] as bool?,
       trackingProtectionPolicy: $enumDecodeNullable(
-          _$TrackingProtectionPolicyEnumMap, json['trackingProtectionPolicy']),
-      httpsOnlyMode:
-          $enumDecodeNullable(_$HttpsOnlyModeEnumMap, json['httpsOnlyMode']),
+        _$TrackingProtectionPolicyEnumMap,
+        json['trackingProtectionPolicy'],
+      ),
+      httpsOnlyMode: $enumDecodeNullable(
+        _$HttpsOnlyModeEnumMap,
+        json['httpsOnlyMode'],
+      ),
       globalPrivacyControlEnabled: json['globalPrivacyControlEnabled'] as bool?,
       preferredColorScheme: $enumDecodeNullable(
-          _$ColorSchemeEnumMap, json['preferredColorScheme']),
+        _$ColorSchemeEnumMap,
+        json['preferredColorScheme'],
+      ),
       cookieBannerHandlingMode: $enumDecodeNullable(
-          _$CookieBannerHandlingModeEnumMap, json['cookieBannerHandlingMode']),
+        _$CookieBannerHandlingModeEnumMap,
+        json['cookieBannerHandlingMode'],
+      ),
       cookieBannerHandlingModePrivateBrowsing: $enumDecodeNullable(
-          _$CookieBannerHandlingModeEnumMap,
-          json['cookieBannerHandlingModePrivateBrowsing']),
+        _$CookieBannerHandlingModeEnumMap,
+        json['cookieBannerHandlingModePrivateBrowsing'],
+      ),
       cookieBannerHandlingGlobalRules:
           json['cookieBannerHandlingGlobalRules'] as bool?,
       cookieBannerHandlingGlobalRulesSubFrames:
           json['cookieBannerHandlingGlobalRulesSubFrames'] as bool?,
       webContentIsolationStrategy: $enumDecodeNullable(
-          _$WebContentIsolationStrategyEnumMap,
-          json['webContentIsolationStrategy']),
+        _$WebContentIsolationStrategyEnumMap,
+        json['webContentIsolationStrategy'],
+      ),
     );
 
-Map<String, dynamic> _$EngineSettingsToJson(EngineSettings instance) =>
-    <String, dynamic>{
-      'javascriptEnabled': instance.javascriptEnabled,
-      'trackingProtectionPolicy':
-          _$TrackingProtectionPolicyEnumMap[instance.trackingProtectionPolicy]!,
-      'httpsOnlyMode': _$HttpsOnlyModeEnumMap[instance.httpsOnlyMode]!,
-      'preferredColorScheme':
-          _$ColorSchemeEnumMap[instance.preferredColorScheme]!,
-      'globalPrivacyControlEnabled': instance.globalPrivacyControlEnabled,
-      'cookieBannerHandlingMode':
-          _$CookieBannerHandlingModeEnumMap[instance.cookieBannerHandlingMode]!,
-      'cookieBannerHandlingModePrivateBrowsing':
-          _$CookieBannerHandlingModeEnumMap[
-              instance.cookieBannerHandlingModePrivateBrowsing]!,
-      'cookieBannerHandlingGlobalRules':
-          instance.cookieBannerHandlingGlobalRules,
-      'cookieBannerHandlingGlobalRulesSubFrames':
-          instance.cookieBannerHandlingGlobalRulesSubFrames,
-      'webContentIsolationStrategy': _$WebContentIsolationStrategyEnumMap[
-          instance.webContentIsolationStrategy]!,
-    };
+Map<String, dynamic> _$EngineSettingsToJson(
+  EngineSettings instance,
+) => <String, dynamic>{
+  'javascriptEnabled': instance.javascriptEnabled,
+  'trackingProtectionPolicy':
+      _$TrackingProtectionPolicyEnumMap[instance.trackingProtectionPolicy]!,
+  'httpsOnlyMode': _$HttpsOnlyModeEnumMap[instance.httpsOnlyMode]!,
+  'preferredColorScheme': _$ColorSchemeEnumMap[instance.preferredColorScheme]!,
+  'globalPrivacyControlEnabled': instance.globalPrivacyControlEnabled,
+  'cookieBannerHandlingMode':
+      _$CookieBannerHandlingModeEnumMap[instance.cookieBannerHandlingMode]!,
+  'cookieBannerHandlingModePrivateBrowsing':
+      _$CookieBannerHandlingModeEnumMap[instance
+          .cookieBannerHandlingModePrivateBrowsing]!,
+  'cookieBannerHandlingGlobalRules': instance.cookieBannerHandlingGlobalRules,
+  'cookieBannerHandlingGlobalRulesSubFrames':
+      instance.cookieBannerHandlingGlobalRulesSubFrames,
+  'webContentIsolationStrategy':
+      _$WebContentIsolationStrategyEnumMap[instance
+          .webContentIsolationStrategy]!,
+};
 
 const _$TrackingProtectionPolicyEnumMap = {
   TrackingProtectionPolicy.none: 'none',

app/lib/features/user/data/models/general_settings.dart

@@ -36,8 +36,8 @@ class GeneralSettings with FastEquatable {
     ThemeMode? themeMode,
     bool? enableReadability,
     this.deleteBrowsingDataOnQuit,
-  })  : themeMode = themeMode ?? ThemeMode.dark,
-        enableReadability = enableReadability ?? true;
+  }) : themeMode = themeMode ?? ThemeMode.dark,
+       enableReadability = enableReadability ?? true;
 
   factory GeneralSettings.fromJson(Map<String, dynamic> json) =>
       _$GeneralSettingsFromJson(json);
@@ -49,8 +49,8 @@ class GeneralSettings with FastEquatable {
 
   @override
   List<Object?> get hashParameters => [
-        themeMode,
-        enableReadability,
-        deleteBrowsingDataOnQuit,
-      ];
+    themeMode,
+    enableReadability,
+    deleteBrowsingDataOnQuit,
+  ];
 }

app/lib/features/user/data/models/general_settings.g.dart

@@ -12,7 +12,8 @@ abstract class _$GeneralSettingsCWProxy {
   GeneralSettings enableReadability(bool enableReadability);
 
   GeneralSettings deleteBrowsingDataOnQuit(
-      Set<DeleteBrowsingDataType>? deleteBrowsingDataOnQuit);
+    Set<DeleteBrowsingDataType>? deleteBrowsingDataOnQuit,
+  );
 
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `GeneralSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
@@ -42,11 +43,10 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy {
 
   @override
   GeneralSettings deleteBrowsingDataOnQuit(
-          Set<DeleteBrowsingDataType>? deleteBrowsingDataOnQuit) =>
-      this(deleteBrowsingDataOnQuit: deleteBrowsingDataOnQuit);
+    Set<DeleteBrowsingDataType>? deleteBrowsingDataOnQuit,
+  ) => this(deleteBrowsingDataOnQuit: deleteBrowsingDataOnQuit);
 
   @override
-
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `GeneralSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
@@ -59,14 +59,16 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy {
     Object? deleteBrowsingDataOnQuit = const $CopyWithPlaceholder(),
   }) {
     return GeneralSettings(
-      themeMode: themeMode == const $CopyWithPlaceholder()
-          ? _value.themeMode
-          // ignore: cast_nullable_to_non_nullable
-          : themeMode as ThemeMode,
-      enableReadability: enableReadability == const $CopyWithPlaceholder()
-          ? _value.enableReadability
-          // ignore: cast_nullable_to_non_nullable
-          : enableReadability as bool,
+      themeMode:
+          themeMode == const $CopyWithPlaceholder()
+              ? _value.themeMode
+              // ignore: cast_nullable_to_non_nullable
+              : themeMode as ThemeMode,
+      enableReadability:
+          enableReadability == const $CopyWithPlaceholder()
+              ? _value.enableReadability
+              // ignore: cast_nullable_to_non_nullable
+              : enableReadability as bool,
       deleteBrowsingDataOnQuit:
           deleteBrowsingDataOnQuit == const $CopyWithPlaceholder()
               ? _value.deleteBrowsingDataOnQuit
@@ -100,9 +102,10 @@ Map<String, dynamic> _$GeneralSettingsToJson(GeneralSettings instance) =>
     <String, dynamic>{
       'themeMode': _$ThemeModeEnumMap[instance.themeMode]!,
       'enableReadability': instance.enableReadability,
-      'deleteBrowsingDataOnQuit': instance.deleteBrowsingDataOnQuit
-          ?.map((e) => _$DeleteBrowsingDataTypeEnumMap[e]!)
-          .toList(),
+      'deleteBrowsingDataOnQuit':
+          instance.deleteBrowsingDataOnQuit
+              ?.map((e) => _$DeleteBrowsingDataTypeEnumMap[e]!)
+              .toList(),
     };
 
 const _$ThemeModeEnumMap = {