diff --git a/app/lib/core/providers/defaults.g.dart b/app/lib/core/providers/defaults.g.dart index d2fe6bfa..2c2d36dc 100644 --- a/app/lib/core/providers/defaults.g.dart +++ b/app/lib/core/providers/defaults.g.dart @@ -14,10 +14,9 @@ String _$lightSeedColorFallbackHash() => final lightSeedColorFallbackProvider = Provider.internal( lightSeedColorFallback, name: r'lightSeedColorFallbackProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$lightSeedColorFallbackHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$lightSeedColorFallbackHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ String _$darkSeedColorFallbackHash() => final darkSeedColorFallbackProvider = Provider.internal( darkSeedColorFallback, name: r'darkSeedColorFallbackProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$darkSeedColorFallbackHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$darkSeedColorFallbackHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/core/providers/format.g.dart b/app/lib/core/providers/format.g.dart index 4a2c1ce9..a2fcf636 100644 --- a/app/lib/core/providers/format.g.dart +++ b/app/lib/core/providers/format.g.dart @@ -13,8 +13,9 @@ String _$formatHash() => r'fe7fcdd19b512784a36f3838c57701030475e429'; final formatProvider = AsyncNotifierProvider.internal( Format.new, name: r'formatProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$formatHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$formatHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/core/providers/global_drop.g.dart b/app/lib/core/providers/global_drop.g.dart index 1f50c1a5..5bb3e188 100644 --- a/app/lib/core/providers/global_drop.g.dart +++ b/app/lib/core/providers/global_drop.g.dart @@ -14,10 +14,9 @@ final willAcceptDropProvider = AutoDisposeNotifierProvider.internal( WillAcceptDrop.new, name: r'willAcceptDropProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$willAcceptDropHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$willAcceptDropHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/core/providers/router.g.dart b/app/lib/core/providers/router.g.dart index 37f10e38..c098746c 100644 --- a/app/lib/core/providers/router.g.dart +++ b/app/lib/core/providers/router.g.dart @@ -13,8 +13,9 @@ String _$routerHash() => r'25fc899b87c080600f6e1d87d510db333378bdfd'; final routerProvider = Provider.internal( router, name: r'routerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$routerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$routerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/core/routing/routes.bangs.dart b/app/lib/core/routing/routes.bangs.dart index 0b1a0a68..5656a02e 100644 --- a/app/lib/core/routing/routes.bangs.dart +++ b/app/lib/core/routing/routes.bangs.dart @@ -64,10 +64,9 @@ class BangSearchRoute extends GoRouteData { @override Widget build(BuildContext context, GoRouterState state) { return BangSearchScreen( - initialSearchText: - (searchText.isEmpty || searchText == emptySearchText) - ? null - : searchText, + initialSearchText: (searchText.isEmpty || searchText == emptySearchText) + ? null + : searchText, ); } } diff --git a/app/lib/core/routing/routes.browser.dart b/app/lib/core/routing/routes.browser.dart index f214ff23..b5f12206 100644 --- a/app/lib/core/routing/routes.browser.dart +++ b/app/lib/core/routing/routes.browser.dart @@ -72,10 +72,9 @@ class SearchRoute extends GoRouteData { Widget build(BuildContext context, GoRouterState state) { return SearchScreen( tabType: tabType, - initialSearchText: - (searchText.isEmpty || searchText == emptySearchText) - ? null - : searchText, + initialSearchText: (searchText.isEmpty || searchText == emptySearchText) + ? null + : searchText, ); } } @@ -124,8 +123,8 @@ class ContextMenuRoute extends GoRouteData { @override Page buildPage(BuildContext context, GoRouterState state) { return DialogPage( - builder: - (_) => ContextMenuDialog(hitResult: HitResultJson.fromJson($extra)), + builder: (_) => + ContextMenuDialog(hitResult: HitResultJson.fromJson($extra)), ); } } diff --git a/app/lib/data/models/web_page_info.g.dart b/app/lib/data/models/web_page_info.g.dart index 4180fb4e..296ae1fd 100644 --- a/app/lib/data/models/web_page_info.g.dart +++ b/app/lib/data/models/web_page_info.g.dart @@ -61,26 +61,22 @@ class _$WebPageInfoCWProxyImpl implements _$WebPageInfoCWProxy { Object? feeds = const $CopyWithPlaceholder(), }) { return WebPageInfo( - url: - url == const $CopyWithPlaceholder() - ? _value.url - // ignore: cast_nullable_to_non_nullable - : url as Uri, - title: - title == const $CopyWithPlaceholder() - ? _value.title - // ignore: cast_nullable_to_non_nullable - : title as String?, - favicon: - favicon == const $CopyWithPlaceholder() - ? _value.favicon - // ignore: cast_nullable_to_non_nullable - : favicon as BrowserIcon?, - feeds: - feeds == const $CopyWithPlaceholder() - ? _value.feeds - // ignore: cast_nullable_to_non_nullable - : feeds as Set?, + url: url == const $CopyWithPlaceholder() + ? _value.url + // ignore: cast_nullable_to_non_nullable + : url as Uri, + title: title == const $CopyWithPlaceholder() + ? _value.title + // ignore: cast_nullable_to_non_nullable + : title as String?, + favicon: favicon == const $CopyWithPlaceholder() + ? _value.favicon + // ignore: cast_nullable_to_non_nullable + : favicon as BrowserIcon?, + feeds: feeds == const $CopyWithPlaceholder() + ? _value.feeds + // ignore: cast_nullable_to_non_nullable + : feeds as Set?, ); } } diff --git a/app/lib/domain/services/app_initialization.g.dart b/app/lib/domain/services/app_initialization.g.dart index 57972cd7..558293e8 100644 --- a/app/lib/domain/services/app_initialization.g.dart +++ b/app/lib/domain/services/app_initialization.g.dart @@ -11,19 +11,19 @@ String _$appInitializationServiceHash() => /// See also [AppInitializationService]. @ProviderFor(AppInitializationService) -final appInitializationServiceProvider = NotifierProvider< - AppInitializationService, - Result<({bool initialized, String? stage, List errors})> ->.internal( - AppInitializationService.new, - name: r'appInitializationServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') +final appInitializationServiceProvider = + NotifierProvider< + AppInitializationService, + Result<({bool initialized, String? stage, List errors})> + >.internal( + AppInitializationService.new, + name: r'appInitializationServiceProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') ? null : _$appInitializationServiceHash, - dependencies: null, - allTransitiveDependencies: null, -); + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$AppInitializationService = Notifier< diff --git a/app/lib/domain/services/generic_website.dart b/app/lib/domain/services/generic_website.dart index 678e7144..402b4982 100644 --- a/app/lib/domain/services/generic_website.dart +++ b/app/lib/domain/services/generic_website.dart @@ -37,8 +37,10 @@ const _typeMap = { Iterable sizesToList(String? sizes) sync* { if (sizes != null) { - final splitted = - sizes.split(' ').where((size) => size.contains('x')).toList(); + final splitted = sizes + .split(' ') + .where((size) => size.contains('x')) + .toList(); for (final size in splitted) { final dimensions = size.split('x'); @@ -87,10 +89,9 @@ class GenericWebsiteService extends _$GenericWebsiteService { url: resource['url'] as String, type: resource['type'] as IconType, mimeType: resource['mimeType'] as String?, - sizes: - (resource['sizes'] as List>) - .map((s) => ResourceSize(height: s[0], width: s[1])) - .toList(), + sizes: (resource['sizes'] as List>) + .map((s) => ResourceSize(height: s[0], width: s[1])) + .toList(), maskable: resource['maskable'] as bool, ); } @@ -211,8 +212,10 @@ class GenericWebsiteService extends _$GenericWebsiteService { final title = document.querySelector('title')?.text; final resources = _extractIcons(baseUri, document); - final feeds = - await FeedFinder(url: baseUri, document: document).parse(); + final feeds = await FeedFinder( + url: baseUri, + document: document, + ).parse(); return { 'title': title, @@ -235,10 +238,9 @@ class GenericWebsiteService extends _$GenericWebsiteService { ); } - final resources = - (result['resources']! as List>) - .map(_deserializeResource) - .toList(); + final resources = (result['resources']! as List>) + .map(_deserializeResource) + .toList(); final favicon = await getCachedIcon(url) ?? diff --git a/app/lib/domain/services/generic_website.g.dart b/app/lib/domain/services/generic_website.g.dart index 89ae6936..91e9ea70 100644 --- a/app/lib/domain/services/generic_website.g.dart +++ b/app/lib/domain/services/generic_website.g.dart @@ -15,10 +15,9 @@ final genericWebsiteServiceProvider = NotifierProvider.internal( GenericWebsiteService.new, name: r'genericWebsiteServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$genericWebsiteServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$genericWebsiteServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/about/data/repositories/package_info_repository.g.dart b/app/lib/features/about/data/repositories/package_info_repository.g.dart index c9b08f86..37c37ee0 100644 --- a/app/lib/features/about/data/repositories/package_info_repository.g.dart +++ b/app/lib/features/about/data/repositories/package_info_repository.g.dart @@ -13,8 +13,9 @@ String _$packageInfoHash() => r'cc57db7b4684ab0d5df0f050b8ea045a3658e89a'; final packageInfoProvider = FutureProvider.internal( packageInfo, name: r'packageInfoProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$packageInfoHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$packageInfoHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/app_widget/domain/services/home_widget.g.dart b/app/lib/features/app_widget/domain/services/home_widget.g.dart index 6382062a..04e124e3 100644 --- a/app/lib/features/app_widget/domain/services/home_widget.g.dart +++ b/app/lib/features/app_widget/domain/services/home_widget.g.dart @@ -13,10 +13,9 @@ String _$widgetPinnableHash() => r'f91041f0f051ad0f00dd765cafea5571ca8c8088'; final widgetPinnableProvider = FutureProvider.internal( widgetPinnable, name: r'widgetPinnableProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$widgetPinnableHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$widgetPinnableHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ final appWidgetLaunchStreamProvider = AutoDisposeProvider>>.internal( appWidgetLaunchStream, name: r'appWidgetLaunchStreamProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$appWidgetLaunchStreamHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$appWidgetLaunchStreamHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/bangs/data/database/daos/bang.dart b/app/lib/features/bangs/data/database/daos/bang.dart index 13bee3e5..ae90ffa1 100644 --- a/app/lib/features/bangs/data/database/daos/bang.dart +++ b/app/lib/features/bangs/data/database/daos/bang.dart @@ -22,7 +22,10 @@ class BangDao extends DatabaseAccessor with _$BangDaoMixin { SingleSelectable getBangCount({Iterable? groups}) { return db.bang.count( - where: groups.mapNotNull((groups) => (t) => t.group.isInValues(groups)), + where: groups.mapNotNull( + (groups) => + (t) => t.group.isInValues(groups), + ), ); } diff --git a/app/lib/features/bangs/data/database/daos/sync.dart b/app/lib/features/bangs/data/database/daos/sync.dart index fa8a5ee0..31545872 100644 --- a/app/lib/features/bangs/data/database/daos/sync.dart +++ b/app/lib/features/bangs/data/database/daos/sync.dart @@ -10,10 +10,9 @@ class SyncDao extends DatabaseAccessor with _$SyncDaoMixin { SyncDao(super.db); SingleOrNullSelectable getLastSyncOfGroup(BangGroup group) { - final query = - selectOnly(db.bangSync) - ..addColumns([db.bangSync.lastSync]) - ..where(db.bangSync.group.equalsValue(group)); + final query = selectOnly(db.bangSync) + ..addColumns([db.bangSync.lastSync]) + ..where(db.bangSync.group.equalsValue(group)); return query.map((row) => row.read(db.bangSync.lastSync)); } diff --git a/app/lib/features/bangs/data/database/database.g.dart b/app/lib/features/bangs/data/database/database.g.dart index 2f516bb3..a07460ec 100644 --- a/app/lib/features/bangs/data/database/database.g.dart +++ b/app/lib/features/bangs/data/database/database.g.dart @@ -96,26 +96,22 @@ class BangTable extends Table with TableInfo { Bang map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return Bang( - websiteName: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}website_name'], - )!, - domain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}domain'], - )!, - trigger: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}trigger'], - )!, - urlTemplate: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}url_template'], - )!, + websiteName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}website_name'], + )!, + domain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}domain'], + )!, + trigger: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}trigger'], + )!, + urlTemplate: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}url_template'], + )!, group: BangTable.$convertergroup.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.int, @@ -331,11 +327,10 @@ class BangSync extends Table with TableInfo { data['${effectivePrefix}group'], )!, ), - lastSync: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}last_sync'], - )!, + lastSync: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_sync'], + )!, ); } @@ -512,21 +507,18 @@ class BangFrequency extends Table BangFrequencyData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BangFrequencyData( - trigger: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}trigger'], - )!, - frequency: - attachedDatabase.typeMapping.read( - DriftSqlType.int, - data['${effectivePrefix}frequency'], - )!, - lastUsed: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}last_used'], - )!, + trigger: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}trigger'], + )!, + frequency: attachedDatabase.typeMapping.read( + DriftSqlType.int, + data['${effectivePrefix}frequency'], + )!, + lastUsed: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}last_used'], + )!, ); } @@ -736,21 +728,18 @@ class BangHistory extends Table with TableInfo { BangHistoryData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BangHistoryData( - searchQuery: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}search_query'], - )!, - trigger: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}trigger'], - )!, - searchDate: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}search_date'], - )!, + searchQuery: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}search_query'], + )!, + trigger: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}trigger'], + )!, + searchDate: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}search_date'], + )!, ); } @@ -813,11 +802,13 @@ class BangHistoryData extends DataClass implements Insertable { ); BangHistoryData copyWithCompanion(BangHistoryCompanion data) { return BangHistoryData( - searchQuery: - data.searchQuery.present ? data.searchQuery.value : this.searchQuery, + searchQuery: data.searchQuery.present + ? data.searchQuery.value + : this.searchQuery, trigger: data.trigger.present ? data.trigger.value : this.trigger, - searchDate: - data.searchDate.present ? data.searchDate.value : this.searchDate, + searchDate: data.searchDate.present + ? data.searchDate.value + : this.searchDate, ); } @@ -954,16 +945,14 @@ class BangFts extends Table BangFt map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BangFt( - trigger: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}trigger'], - )!, - websiteName: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}website_name'], - )!, + trigger: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}trigger'], + )!, + websiteName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}website_name'], + )!, ); } @@ -1017,8 +1006,9 @@ class BangFt extends DataClass implements Insertable { BangFt copyWithCompanion(BangFtsCompanion data) { return BangFt( trigger: data.trigger.present ? data.trigger.value : this.trigger, - websiteName: - data.websiteName.present ? data.websiteName.value : this.websiteName, + websiteName: data.websiteName.present + ? data.websiteName.value + : this.websiteName, ); } @@ -1140,26 +1130,22 @@ class BangDataView extends ViewInfo BangData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return BangData( - websiteName: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}website_name'], - )!, - domain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}domain'], - )!, - trigger: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}trigger'], - )!, - urlTemplate: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}url_template'], - )!, + websiteName: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}website_name'], + )!, + domain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}domain'], + )!, + trigger: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}trigger'], + )!, + urlTemplate: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}url_template'], + )!, category: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}category'], @@ -1735,12 +1721,12 @@ class $BangTableTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $BangTableFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $BangTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $BangTableAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $BangTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $BangTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $BangTableAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value trigger = const Value.absent(), @@ -1785,73 +1771,66 @@ class $BangTableTableManager format: format, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $BangTableReferences(db, table, e), + withReferenceMapper: (p0) => p0 + .map( + (e) => (e.readTable(table), $BangTableReferences(db, table, e)), + ) + .toList(), + prefetchHooksCallback: + ({bangFrequencyRefs = false, bangHistoryRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (bangFrequencyRefs) db.bangFrequency, + if (bangHistoryRefs) db.bangHistory, + ], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (bangFrequencyRefs) + await $_getPrefetchedData< + Bang, + BangTable, + BangFrequencyData + >( + currentTable: table, + referencedTable: $BangTableReferences + ._bangFrequencyRefsTable(db), + managerFromTypedResult: (p0) => $BangTableReferences( + db, + table, + p0, + ).bangFrequencyRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.trigger == item.trigger, + ), + typedResults: items, ), - ) - .toList(), - prefetchHooksCallback: ({ - bangFrequencyRefs = false, - bangHistoryRefs = false, - }) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [ - if (bangFrequencyRefs) db.bangFrequency, - if (bangHistoryRefs) db.bangHistory, - ], - addJoins: null, - getPrefetchedDataCallback: (items) async { - return [ - if (bangFrequencyRefs) - await $_getPrefetchedData< - Bang, - BangTable, - BangFrequencyData - >( - currentTable: table, - referencedTable: $BangTableReferences - ._bangFrequencyRefsTable(db), - managerFromTypedResult: - (p0) => - $BangTableReferences( - db, - table, - p0, - ).bangFrequencyRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( - (e) => e.trigger == item.trigger, - ), - typedResults: items, - ), - if (bangHistoryRefs) - await $_getPrefetchedData( - currentTable: table, - referencedTable: $BangTableReferences - ._bangHistoryRefsTable(db), - managerFromTypedResult: - (p0) => - $BangTableReferences( - db, - table, - p0, - ).bangHistoryRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( - (e) => e.trigger == item.trigger, - ), - typedResults: items, - ), - ]; + if (bangHistoryRefs) + await $_getPrefetchedData< + Bang, + BangTable, + BangHistoryData + >( + currentTable: table, + referencedTable: $BangTableReferences + ._bangHistoryRefsTable(db), + managerFromTypedResult: (p0) => $BangTableReferences( + db, + table, + p0, + ).bangHistoryRefs, + referencedItemsForCurrentItem: + (item, referencedItems) => referencedItems.where( + (e) => e.trigger == item.trigger, + ), + typedResults: items, + ), + ]; + }, + ); }, - ); - }, ), ); } @@ -1958,12 +1937,12 @@ class $BangSyncTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $BangSyncFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $BangSyncOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $BangSyncAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $BangSyncFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $BangSyncOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $BangSyncAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value group = const Value.absent(), @@ -1974,16 +1953,9 @@ class $BangSyncTableManager Value group = const Value.absent(), required DateTime lastSync, }) => BangSyncCompanion.insert(group: group, lastSync: lastSync), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); @@ -2186,12 +2158,12 @@ class $BangFrequencyTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $BangFrequencyFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $BangFrequencyOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $BangFrequencyAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $BangFrequencyFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $BangFrequencyOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $BangFrequencyAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value trigger = const Value.absent(), @@ -2216,52 +2188,50 @@ class $BangFrequencyTableManager lastUsed: lastUsed, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $BangFrequencyReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $BangFrequencyReferences(db, table, e), + ), + ) + .toList(), prefetchHooksCallback: ({trigger = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [], - addJoins: < - T extends TableManagerState< - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic - > - >(state) { - if (trigger) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.trigger, - referencedTable: $BangFrequencyReferences - ._triggerTable(db), - referencedColumn: - $BangFrequencyReferences + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (trigger) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.trigger, + referencedTable: $BangFrequencyReferences + ._triggerTable(db), + referencedColumn: $BangFrequencyReferences ._triggerTable(db) .trigger, - ) - as T; - } + ) + as T; + } - return state; - }, + return state; + }, getPrefetchedDataCallback: (items) async { return []; }, @@ -2471,12 +2441,12 @@ class $BangHistoryTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $BangHistoryFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $BangHistoryOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $BangHistoryAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $BangHistoryFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $BangHistoryOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $BangHistoryAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value searchQuery = const Value.absent(), @@ -2501,52 +2471,48 @@ class $BangHistoryTableManager searchDate: searchDate, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $BangHistoryReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map( + (e) => + (e.readTable(table), $BangHistoryReferences(db, table, e)), + ) + .toList(), prefetchHooksCallback: ({trigger = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [], - addJoins: < - T extends TableManagerState< - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic - > - >(state) { - if (trigger) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.trigger, - referencedTable: $BangHistoryReferences - ._triggerTable(db), - referencedColumn: - $BangHistoryReferences + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (trigger) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.trigger, + referencedTable: $BangHistoryReferences + ._triggerTable(db), + referencedColumn: $BangHistoryReferences ._triggerTable(db) .trigger, - ) - as T; - } + ) + as T; + } - return state; - }, + return state; + }, getPrefetchedDataCallback: (items) async { return []; }, @@ -2658,12 +2624,12 @@ class $BangFtsTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $BangFtsFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $BangFtsOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $BangFtsAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $BangFtsFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $BangFtsOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $BangFtsAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value trigger = const Value.absent(), @@ -2684,16 +2650,9 @@ class $BangFtsTableManager websiteName: websiteName, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); diff --git a/app/lib/features/bangs/data/models/bang.dart b/app/lib/features/bangs/data/models/bang.dart index 470b0522..defa0324 100644 --- a/app/lib/features/bangs/data/models/bang.dart +++ b/app/lib/features/bangs/data/models/bang.dart @@ -65,20 +65,16 @@ class Bang with FastEquatable implements Insertable { return (format == null || format!.contains(BangFormat.urlEncodePlaceholder) == true) ? (format == null || - format?.contains(BangFormat.urlEncodeSpaceToPlus) == true) - ? Uri.encodeQueryComponent(input) - : Uri.encodeComponent(input) + format?.contains(BangFormat.urlEncodeSpaceToPlus) == true) + ? Uri.encodeQueryComponent(input) + : Uri.encodeComponent(input) : input; } Uri getTemplateUrl(String? query) { - final url = - (query != null) - ? urlTemplate.replaceAll( - _templateQueryPlaceholder, - formatQuery(query), - ) - : urlTemplate; + final url = (query != null) + ? urlTemplate.replaceAll(_templateQueryPlaceholder, formatQuery(query)) + : urlTemplate; var template = Uri.parse(url); if (!template.hasScheme || template.origin.isEmpty) { diff --git a/app/lib/features/bangs/data/models/bang.g.dart b/app/lib/features/bangs/data/models/bang.g.dart index 3b8c0e7e..e423d21b 100644 --- a/app/lib/features/bangs/data/models/bang.g.dart +++ b/app/lib/features/bangs/data/models/bang.g.dart @@ -89,46 +89,38 @@ class _$BangCWProxyImpl implements _$BangCWProxy { Object? format = const $CopyWithPlaceholder(), }) { return Bang( - websiteName: - websiteName == const $CopyWithPlaceholder() - ? _value.websiteName - // ignore: cast_nullable_to_non_nullable - : websiteName as String, - domain: - domain == const $CopyWithPlaceholder() - ? _value.domain - // ignore: cast_nullable_to_non_nullable - : domain as String, - trigger: - trigger == const $CopyWithPlaceholder() - ? _value.trigger - // ignore: cast_nullable_to_non_nullable - : trigger as String, - urlTemplate: - urlTemplate == const $CopyWithPlaceholder() - ? _value.urlTemplate - // ignore: cast_nullable_to_non_nullable - : urlTemplate as String, - group: - group == const $CopyWithPlaceholder() - ? _value.group - // ignore: cast_nullable_to_non_nullable - : group as BangGroup?, - category: - category == const $CopyWithPlaceholder() - ? _value.category - // ignore: cast_nullable_to_non_nullable - : category as String?, - subCategory: - subCategory == const $CopyWithPlaceholder() - ? _value.subCategory - // ignore: cast_nullable_to_non_nullable - : subCategory as String?, - format: - format == const $CopyWithPlaceholder() - ? _value.format - // ignore: cast_nullable_to_non_nullable - : format as Set?, + websiteName: websiteName == const $CopyWithPlaceholder() + ? _value.websiteName + // ignore: cast_nullable_to_non_nullable + : websiteName as String, + domain: domain == const $CopyWithPlaceholder() + ? _value.domain + // ignore: cast_nullable_to_non_nullable + : domain as String, + trigger: trigger == const $CopyWithPlaceholder() + ? _value.trigger + // ignore: cast_nullable_to_non_nullable + : trigger as String, + urlTemplate: urlTemplate == const $CopyWithPlaceholder() + ? _value.urlTemplate + // ignore: cast_nullable_to_non_nullable + : urlTemplate as String, + group: group == const $CopyWithPlaceholder() + ? _value.group + // ignore: cast_nullable_to_non_nullable + : group as BangGroup?, + category: category == const $CopyWithPlaceholder() + ? _value.category + // ignore: cast_nullable_to_non_nullable + : category as String?, + subCategory: subCategory == const $CopyWithPlaceholder() + ? _value.subCategory + // ignore: cast_nullable_to_non_nullable + : subCategory as String?, + format: format == const $CopyWithPlaceholder() + ? _value.format + // ignore: cast_nullable_to_non_nullable + : format as Set?, ); } } @@ -150,10 +142,9 @@ Bang _$BangFromJson(Map json) => Bang( urlTemplate: json['u'] as String, category: json['c'] as String?, subCategory: json['sc'] as String?, - format: - (json['fmt'] as List?) - ?.map((e) => $enumDecode(_$BangFormatEnumMap, e)) - .toSet(), + format: (json['fmt'] as List?) + ?.map((e) => $enumDecode(_$BangFormatEnumMap, e)) + .toSet(), ); Map _$BangToJson(Bang instance) => { diff --git a/app/lib/features/bangs/data/models/bang_data.g.dart b/app/lib/features/bangs/data/models/bang_data.g.dart index cdd80e84..92106af5 100644 --- a/app/lib/features/bangs/data/models/bang_data.g.dart +++ b/app/lib/features/bangs/data/models/bang_data.g.dart @@ -103,56 +103,46 @@ class _$BangDataCWProxyImpl implements _$BangDataCWProxy { Object? icon = const $CopyWithPlaceholder(), }) { return BangData( - websiteName: - websiteName == const $CopyWithPlaceholder() - ? _value.websiteName - // ignore: cast_nullable_to_non_nullable - : websiteName as String, - domain: - domain == const $CopyWithPlaceholder() - ? _value.domain - // ignore: cast_nullable_to_non_nullable - : domain as String, - trigger: - trigger == const $CopyWithPlaceholder() - ? _value.trigger - // ignore: cast_nullable_to_non_nullable - : trigger as String, - urlTemplate: - urlTemplate == const $CopyWithPlaceholder() - ? _value.urlTemplate - // ignore: cast_nullable_to_non_nullable - : urlTemplate as String, - category: - category == const $CopyWithPlaceholder() - ? _value.category - // ignore: cast_nullable_to_non_nullable - : category as String?, - subCategory: - subCategory == const $CopyWithPlaceholder() - ? _value.subCategory - // ignore: cast_nullable_to_non_nullable - : subCategory as String?, - format: - format == const $CopyWithPlaceholder() - ? _value.format - // ignore: cast_nullable_to_non_nullable - : format as Set?, - frequency: - frequency == const $CopyWithPlaceholder() - ? _value.frequency - // ignore: cast_nullable_to_non_nullable - : frequency as int?, - lastUsed: - lastUsed == const $CopyWithPlaceholder() - ? _value.lastUsed - // ignore: cast_nullable_to_non_nullable - : lastUsed as DateTime?, - icon: - icon == const $CopyWithPlaceholder() - ? _value.icon - // ignore: cast_nullable_to_non_nullable - : icon as BrowserIcon?, + websiteName: websiteName == const $CopyWithPlaceholder() + ? _value.websiteName + // ignore: cast_nullable_to_non_nullable + : websiteName as String, + domain: domain == const $CopyWithPlaceholder() + ? _value.domain + // ignore: cast_nullable_to_non_nullable + : domain as String, + trigger: trigger == const $CopyWithPlaceholder() + ? _value.trigger + // ignore: cast_nullable_to_non_nullable + : trigger as String, + urlTemplate: urlTemplate == const $CopyWithPlaceholder() + ? _value.urlTemplate + // ignore: cast_nullable_to_non_nullable + : urlTemplate as String, + category: category == const $CopyWithPlaceholder() + ? _value.category + // ignore: cast_nullable_to_non_nullable + : category as String?, + subCategory: subCategory == const $CopyWithPlaceholder() + ? _value.subCategory + // ignore: cast_nullable_to_non_nullable + : subCategory as String?, + format: format == const $CopyWithPlaceholder() + ? _value.format + // ignore: cast_nullable_to_non_nullable + : format as Set?, + frequency: frequency == const $CopyWithPlaceholder() + ? _value.frequency + // ignore: cast_nullable_to_non_nullable + : frequency as int?, + lastUsed: lastUsed == const $CopyWithPlaceholder() + ? _value.lastUsed + // ignore: cast_nullable_to_non_nullable + : lastUsed as DateTime?, + icon: icon == const $CopyWithPlaceholder() + ? _value.icon + // ignore: cast_nullable_to_non_nullable + : icon as BrowserIcon?, ); } } diff --git a/app/lib/features/bangs/data/providers.g.dart b/app/lib/features/bangs/data/providers.g.dart index c007ae1c..4c401644 100644 --- a/app/lib/features/bangs/data/providers.g.dart +++ b/app/lib/features/bangs/data/providers.g.dart @@ -13,8 +13,9 @@ String _$bangDatabaseHash() => r'e31cf4b499300aff65174a16fb74c7dd8ec3d6f0'; final bangDatabaseProvider = Provider.internal( bangDatabase, name: r'bangDatabaseProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$bangDatabaseHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangDatabaseHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/bangs/data/services/data_source.dart b/app/lib/features/bangs/data/services/data_source.dart index ed1fcacc..8a958a34 100644 --- a/app/lib/features/bangs/data/services/data_source.dart +++ b/app/lib/features/bangs/data/services/data_source.dart @@ -30,16 +30,15 @@ class BangDataSourceService extends _$BangDataSourceService { client.close(); } }, [url.toString()]).then( - (json) => - json.map((e) { - var bang = Bang.fromJson(e as Map); + (json) => json.map((e) { + var bang = Bang.fromJson(e as Map); - if (group != null) { - bang = bang.copyWith.group(group); - } + if (group != null) { + bang = bang.copyWith.group(group); + } - return bang; - }).toList(), + return bang; + }).toList(), ); }, exceptionHandler: handleHttpError); } diff --git a/app/lib/features/bangs/data/services/data_source.g.dart b/app/lib/features/bangs/data/services/data_source.g.dart index 1ccf94d8..7c8220f2 100644 --- a/app/lib/features/bangs/data/services/data_source.g.dart +++ b/app/lib/features/bangs/data/services/data_source.g.dart @@ -15,10 +15,9 @@ final bangDataSourceServiceProvider = AutoDisposeNotifierProvider.internal( BangDataSourceService.new, name: r'bangDataSourceServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangDataSourceServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangDataSourceServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/bangs/domain/providers/bangs.g.dart b/app/lib/features/bangs/domain/providers/bangs.g.dart index bf829157..5fb3347a 100644 --- a/app/lib/features/bangs/domain/providers/bangs.g.dart +++ b/app/lib/features/bangs/domain/providers/bangs.g.dart @@ -14,10 +14,9 @@ String _$defaultSearchBangDataHash() => final defaultSearchBangDataProvider = StreamProvider.internal( defaultSearchBangData, name: r'defaultSearchBangDataProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$defaultSearchBangDataHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$defaultSearchBangDataHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ final bangCategoriesProvider = AutoDisposeStreamProvider>>.internal( bangCategories, name: r'bangCategoriesProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangCategoriesHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangCategoriesHash, dependencies: null, allTransitiveDependencies: null, ); @@ -135,10 +133,9 @@ class BangListProvider extends AutoDisposeStreamProvider> { ), from: bangListProvider, name: r'bangListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangListHash, dependencies: BangListFamily._dependencies, allTransitiveDependencies: BangListFamily._allTransitiveDependencies, groups: groups, @@ -253,10 +250,9 @@ final frequentBangListProvider = AutoDisposeStreamProvider>.internal( frequentBangList, name: r'frequentBangListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$frequentBangListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$frequentBangListHash, dependencies: null, allTransitiveDependencies: null, ); @@ -272,10 +268,9 @@ final searchHistoryProvider = AutoDisposeStreamProvider>.internal( searchHistory, name: r'searchHistoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$searchHistoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$searchHistoryHash, dependencies: null, allTransitiveDependencies: null, ); @@ -330,10 +325,9 @@ class LastSyncOfGroupProvider extends AutoDisposeStreamProvider { (ref) => lastSyncOfGroup(ref as LastSyncOfGroupRef, group), from: lastSyncOfGroupProvider, name: r'lastSyncOfGroupProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$lastSyncOfGroupHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$lastSyncOfGroupHash, dependencies: LastSyncOfGroupFamily._dependencies, allTransitiveDependencies: LastSyncOfGroupFamily._allTransitiveDependencies, @@ -451,10 +445,9 @@ class BangCountOfGroupProvider extends AutoDisposeStreamProvider { (ref) => bangCountOfGroup(ref as BangCountOfGroupRef, group), from: bangCountOfGroupProvider, name: r'bangCountOfGroupProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangCountOfGroupHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangCountOfGroupHash, dependencies: BangCountOfGroupFamily._dependencies, allTransitiveDependencies: BangCountOfGroupFamily._allTransitiveDependencies, diff --git a/app/lib/features/bangs/domain/providers/search.g.dart b/app/lib/features/bangs/domain/providers/search.g.dart index 0f7fe5de..1556c548 100644 --- a/app/lib/features/bangs/domain/providers/search.g.dart +++ b/app/lib/features/bangs/domain/providers/search.g.dart @@ -14,10 +14,9 @@ final bangSearchProvider = AutoDisposeStreamNotifierProvider>.internal( BangSearch.new, name: r'bangSearchProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangSearchHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangSearchHash, dependencies: null, allTransitiveDependencies: null, ); @@ -27,17 +26,19 @@ String _$seamlessBangHash() => r'8bd7a2cbe4c302ae08f85167290666a7437f8b9b'; /// See also [SeamlessBang]. @ProviderFor(SeamlessBang) -final seamlessBangProvider = AutoDisposeNotifierProvider< - SeamlessBang, - AsyncValue> ->.internal( - SeamlessBang.new, - name: r'seamlessBangProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$seamlessBangHash, - dependencies: null, - allTransitiveDependencies: null, -); +final seamlessBangProvider = + AutoDisposeNotifierProvider< + SeamlessBang, + AsyncValue> + >.internal( + SeamlessBang.new, + name: r'seamlessBangProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$seamlessBangHash, + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$SeamlessBang = AutoDisposeNotifier>>; // ignore_for_file: type=lint diff --git a/app/lib/features/bangs/domain/repositories/data.g.dart b/app/lib/features/bangs/domain/repositories/data.g.dart index 7b34d275..9fbbca6b 100644 --- a/app/lib/features/bangs/domain/repositories/data.g.dart +++ b/app/lib/features/bangs/domain/repositories/data.g.dart @@ -15,10 +15,9 @@ final bangDataRepositoryProvider = NotifierProvider.internal( BangDataRepository.new, name: r'bangDataRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangDataRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangDataRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/bangs/domain/repositories/sync.dart b/app/lib/features/bangs/domain/repositories/sync.dart index 34392220..4c9b0538 100644 --- a/app/lib/features/bangs/domain/repositories/sync.dart +++ b/app/lib/features/bangs/domain/repositories/sync.dart @@ -19,8 +19,9 @@ class BangSyncRepository extends _$BangSyncRepository { required Duration? syncInterval, }) async { if (syncInterval != null) { - final lastSync = - await db.syncDao.getLastSyncOfGroup(group).getSingleOrNull(); + final lastSync = await db.syncDao + .getLastSyncOfGroup(group) + .getSingleOrNull(); if (lastSync != null && DateTime.now().difference(lastSync) < syncInterval) { diff --git a/app/lib/features/bangs/domain/repositories/sync.g.dart b/app/lib/features/bangs/domain/repositories/sync.g.dart index ce271fb7..a01afbee 100644 --- a/app/lib/features/bangs/domain/repositories/sync.g.dart +++ b/app/lib/features/bangs/domain/repositories/sync.g.dart @@ -15,10 +15,9 @@ final bangSyncRepositoryProvider = NotifierProvider.internal( BangSyncRepository.new, name: r'bangSyncRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bangSyncRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bangSyncRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/bangs/presentation/screens/categories.dart b/app/lib/features/bangs/presentation/screens/categories.dart index 70984aac..74d8b593 100644 --- a/app/lib/features/bangs/presentation/screens/categories.dart +++ b/app/lib/features/bangs/presentation/screens/categories.dart @@ -54,40 +54,35 @@ class BangCategoriesScreen extends HookConsumerWidget { expanded.value = {...expanded.value}..remove(key); } }, - children: - categories.entries - .map( - (category) => ExpansionPanel( - canTapOnHeader: true, - isExpanded: expanded.value.contains( - category.key, - ), - headerBuilder: - (context, isExpanded) => - ListTile(title: Text(category.key)), - body: Padding( - padding: const EdgeInsets.only(left: 16.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: - category.value - .map( - (subCategory) => ListTile( - title: Text(subCategory), - onTap: () async { - await BangSubCategoryRoute( - category: category.key, - subCategory: subCategory, - ).push(context); - }, - ), - ) - .toList(), - ), - ), + children: categories.entries + .map( + (category) => ExpansionPanel( + canTapOnHeader: true, + isExpanded: expanded.value.contains(category.key), + headerBuilder: (context, isExpanded) => + ListTile(title: Text(category.key)), + body: Padding( + padding: const EdgeInsets.only(left: 16.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: category.value + .map( + (subCategory) => ListTile( + title: Text(subCategory), + onTap: () async { + await BangSubCategoryRoute( + category: category.key, + subCategory: subCategory, + ).push(context); + }, + ), + ) + .toList(), ), - ) - .toList(), + ), + ), + ) + .toList(), ); }, ), @@ -95,13 +90,12 @@ class BangCategoriesScreen extends HookConsumerWidget { }, ); }, - error: - (error, stackTrace) => Center( - child: FailureWidget( - title: 'Failed to load Bang Categories', - exception: error, - ), - ), + error: (error, stackTrace) => Center( + child: FailureWidget( + title: 'Failed to load Bang Categories', + exception: error, + ), + ), loading: () => const Center(child: CircularProgressIndicator()), ), ); diff --git a/app/lib/features/bangs/presentation/screens/list.dart b/app/lib/features/bangs/presentation/screens/list.dart index 318ac511..eb6cfff1 100644 --- a/app/lib/features/bangs/presentation/screens/list.dart +++ b/app/lib/features/bangs/presentation/screens/list.dart @@ -47,19 +47,17 @@ class BangListScreen extends HookConsumerWidget { }, ); }, - error: - (error, stackTrace) => SliverToBoxAdapter( - child: Center( - child: FailureWidget( - title: 'Failed to load Bangs', - exception: error, - ), - ), - ), - loading: - () => const SliverToBoxAdapter( - child: Center(child: CircularProgressIndicator()), + error: (error, stackTrace) => SliverToBoxAdapter( + child: Center( + child: FailureWidget( + title: 'Failed to load Bangs', + exception: error, ), + ), + ), + loading: () => const SliverToBoxAdapter( + child: Center(child: CircularProgressIndicator()), + ), ), ], ), diff --git a/app/lib/features/bangs/presentation/screens/search.dart b/app/lib/features/bangs/presentation/screens/search.dart index 69a6d63d..141c5a02 100644 --- a/app/lib/features/bangs/presentation/screens/search.dart +++ b/app/lib/features/bangs/presentation/screens/search.dart @@ -60,32 +60,27 @@ class BangSearchScreen extends HookConsumerWidget { ), body: resultsAsync.when( skipLoadingOnReload: true, - data: - (bangs) => FadingScroll( - fadingSize: 25, - builder: (context, controller) { - return ListView.builder( - controller: controller, - itemCount: bangs.length, - itemBuilder: (context, index) { - final bang = bangs[index]; - return BangDetails( - bang, - onTap: () { - context.pop(bang.trigger); - }, - ); + data: (bangs) => FadingScroll( + fadingSize: 25, + builder: (context, controller) { + return ListView.builder( + controller: controller, + itemCount: bangs.length, + itemBuilder: (context, index) { + final bang = bangs[index]; + return BangDetails( + bang, + onTap: () { + context.pop(bang.trigger); }, ); }, - ), - error: - (error, stackTrace) => Center( - child: FailureWidget( - title: 'Bang Search failed', - exception: error, - ), - ), + ); + }, + ), + error: (error, stackTrace) => Center( + child: FailureWidget(title: 'Bang Search failed', exception: error), + ), loading: () => const SizedBox.shrink(), ), ); diff --git a/app/lib/features/bangs/presentation/widgets/site_search.dart b/app/lib/features/bangs/presentation/widgets/site_search.dart index cb82f598..109a8c17 100644 --- a/app/lib/features/bangs/presentation/widgets/site_search.dart +++ b/app/lib/features/bangs/presentation/widgets/site_search.dart @@ -83,8 +83,8 @@ class SiteSearch extends HookConsumerWidget { width: double.maxFinite, child: SelectableChips( itemId: (bang) => bang.trigger, - itemAvatar: - (bang) => UrlIcon([bang.getTemplateUrl('')], iconSize: 20), + itemAvatar: (bang) => + UrlIcon([bang.getTemplateUrl('')], iconSize: 20), itemLabel: (bang) => Text(bang.websiteName), availableItems: availableBangs, selectedItem: selectedBang, diff --git a/app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart b/app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart index 035e1230..42f5e36a 100644 --- a/app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart +++ b/app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart @@ -15,10 +15,9 @@ final bottomSheetControllerProvider = AutoDisposeNotifierProvider.internal( BottomSheetController.new, name: r'bottomSheetControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bottomSheetControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bottomSheetControllerHash, dependencies: null, allTransitiveDependencies: null, ); @@ -32,10 +31,9 @@ final bottomSheetExtendProvider = StreamNotifierProvider.internal( BottomSheetExtend.new, name: r'bottomSheetExtendProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$bottomSheetExtendHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$bottomSheetExtendHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/controllers/overlay.g.dart b/app/lib/features/geckoview/domain/controllers/overlay.g.dart index cf396674..05814e73 100644 --- a/app/lib/features/geckoview/domain/controllers/overlay.g.dart +++ b/app/lib/features/geckoview/domain/controllers/overlay.g.dart @@ -14,10 +14,9 @@ final overlayControllerProvider = AutoDisposeNotifierProvider.internal( OverlayController.new, name: r'overlayControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$overlayControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$overlayControllerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/entities/states/tab.g.dart b/app/lib/features/geckoview/domain/entities/states/tab.g.dart index cf7800c2..1dc25302 100644 --- a/app/lib/features/geckoview/domain/entities/states/tab.g.dart +++ b/app/lib/features/geckoview/domain/entities/states/tab.g.dart @@ -129,71 +129,58 @@ class _$TabStateCWProxyImpl implements _$TabStateCWProxy { }) { return TabState( id: _value.id, - contextId: - contextId == const $CopyWithPlaceholder() - ? _value.contextId - // ignore: cast_nullable_to_non_nullable - : contextId as String?, - url: - url == const $CopyWithPlaceholder() - ? _value.url - // ignore: cast_nullable_to_non_nullable - : url as Uri, - title: - title == const $CopyWithPlaceholder() - ? _value.title - // ignore: cast_nullable_to_non_nullable - : title as String, - icon: - icon == const $CopyWithPlaceholder() - ? _value.icon - // ignore: cast_nullable_to_non_nullable - : icon as EquatableImage?, - thumbnail: - thumbnail == const $CopyWithPlaceholder() - ? _value.thumbnail - // ignore: cast_nullable_to_non_nullable - : thumbnail as EquatableImage?, - progress: - progress == const $CopyWithPlaceholder() - ? _value.progress - // ignore: cast_nullable_to_non_nullable - : progress as int, - isPrivate: - isPrivate == const $CopyWithPlaceholder() - ? _value.isPrivate - // ignore: cast_nullable_to_non_nullable - : isPrivate as bool, - isFullScreen: - isFullScreen == const $CopyWithPlaceholder() - ? _value.isFullScreen - // ignore: cast_nullable_to_non_nullable - : isFullScreen as bool, - isLoading: - isLoading == const $CopyWithPlaceholder() - ? _value.isLoading - // ignore: cast_nullable_to_non_nullable - : isLoading as bool, - securityInfoState: - securityInfoState == const $CopyWithPlaceholder() - ? _value.securityInfoState - // ignore: cast_nullable_to_non_nullable - : securityInfoState as SecurityState, - historyState: - historyState == const $CopyWithPlaceholder() - ? _value.historyState - // ignore: cast_nullable_to_non_nullable - : historyState as HistoryState, - readerableState: - readerableState == const $CopyWithPlaceholder() - ? _value.readerableState - // ignore: cast_nullable_to_non_nullable - : readerableState as ReaderableState, - findResultState: - findResultState == const $CopyWithPlaceholder() - ? _value.findResultState - // ignore: cast_nullable_to_non_nullable - : findResultState as FindResultState, + contextId: contextId == const $CopyWithPlaceholder() + ? _value.contextId + // ignore: cast_nullable_to_non_nullable + : contextId as String?, + url: url == const $CopyWithPlaceholder() + ? _value.url + // ignore: cast_nullable_to_non_nullable + : url as Uri, + title: title == const $CopyWithPlaceholder() + ? _value.title + // ignore: cast_nullable_to_non_nullable + : title as String, + icon: icon == const $CopyWithPlaceholder() + ? _value.icon + // ignore: cast_nullable_to_non_nullable + : icon as EquatableImage?, + thumbnail: thumbnail == const $CopyWithPlaceholder() + ? _value.thumbnail + // ignore: cast_nullable_to_non_nullable + : thumbnail as EquatableImage?, + progress: progress == const $CopyWithPlaceholder() + ? _value.progress + // ignore: cast_nullable_to_non_nullable + : progress as int, + isPrivate: isPrivate == const $CopyWithPlaceholder() + ? _value.isPrivate + // ignore: cast_nullable_to_non_nullable + : isPrivate as bool, + isFullScreen: isFullScreen == const $CopyWithPlaceholder() + ? _value.isFullScreen + // ignore: cast_nullable_to_non_nullable + : isFullScreen as bool, + isLoading: isLoading == const $CopyWithPlaceholder() + ? _value.isLoading + // ignore: cast_nullable_to_non_nullable + : isLoading as bool, + securityInfoState: securityInfoState == const $CopyWithPlaceholder() + ? _value.securityInfoState + // ignore: cast_nullable_to_non_nullable + : securityInfoState as SecurityState, + historyState: historyState == const $CopyWithPlaceholder() + ? _value.historyState + // ignore: cast_nullable_to_non_nullable + : historyState as HistoryState, + readerableState: readerableState == const $CopyWithPlaceholder() + ? _value.readerableState + // ignore: cast_nullable_to_non_nullable + : readerableState as ReaderableState, + findResultState: findResultState == const $CopyWithPlaceholder() + ? _value.findResultState + // ignore: cast_nullable_to_non_nullable + : findResultState as FindResultState, ); } } diff --git a/app/lib/features/geckoview/domain/entities/states/web_extension.g.dart b/app/lib/features/geckoview/domain/entities/states/web_extension.g.dart index 62425f71..add69f90 100644 --- a/app/lib/features/geckoview/domain/entities/states/web_extension.g.dart +++ b/app/lib/features/geckoview/domain/entities/states/web_extension.g.dart @@ -85,41 +85,34 @@ class _$WebExtensionStateCWProxyImpl implements _$WebExtensionStateCWProxy { Object? icon = const $CopyWithPlaceholder(), }) { return WebExtensionState( - extensionId: - extensionId == const $CopyWithPlaceholder() - ? _value.extensionId - // ignore: cast_nullable_to_non_nullable - : extensionId as String, - enabled: - enabled == const $CopyWithPlaceholder() - ? _value.enabled - // ignore: cast_nullable_to_non_nullable - : enabled as bool, - title: - title == const $CopyWithPlaceholder() - ? _value.title - // ignore: cast_nullable_to_non_nullable - : title as String?, - badgeText: - badgeText == const $CopyWithPlaceholder() - ? _value.badgeText - // ignore: cast_nullable_to_non_nullable - : badgeText as String?, - badgeTextColor: - badgeTextColor == const $CopyWithPlaceholder() - ? _value.badgeTextColor - // ignore: cast_nullable_to_non_nullable - : badgeTextColor as Color?, - badgeBackgroundColor: - badgeBackgroundColor == const $CopyWithPlaceholder() - ? _value.badgeBackgroundColor - // ignore: cast_nullable_to_non_nullable - : badgeBackgroundColor as Color?, - icon: - icon == const $CopyWithPlaceholder() - ? _value.icon - // ignore: cast_nullable_to_non_nullable - : icon as EquatableImage?, + extensionId: extensionId == const $CopyWithPlaceholder() + ? _value.extensionId + // ignore: cast_nullable_to_non_nullable + : extensionId as String, + enabled: enabled == const $CopyWithPlaceholder() + ? _value.enabled + // ignore: cast_nullable_to_non_nullable + : enabled as bool, + title: title == const $CopyWithPlaceholder() + ? _value.title + // ignore: cast_nullable_to_non_nullable + : title as String?, + badgeText: badgeText == const $CopyWithPlaceholder() + ? _value.badgeText + // ignore: cast_nullable_to_non_nullable + : badgeText as String?, + badgeTextColor: badgeTextColor == const $CopyWithPlaceholder() + ? _value.badgeTextColor + // ignore: cast_nullable_to_non_nullable + : badgeTextColor as Color?, + badgeBackgroundColor: badgeBackgroundColor == const $CopyWithPlaceholder() + ? _value.badgeBackgroundColor + // ignore: cast_nullable_to_non_nullable + : badgeBackgroundColor as Color?, + icon: icon == const $CopyWithPlaceholder() + ? _value.icon + // ignore: cast_nullable_to_non_nullable + : icon as EquatableImage?, ); } } diff --git a/app/lib/features/geckoview/domain/providers.g.dart b/app/lib/features/geckoview/domain/providers.g.dart index 0334deb8..681c9b76 100644 --- a/app/lib/features/geckoview/domain/providers.g.dart +++ b/app/lib/features/geckoview/domain/providers.g.dart @@ -15,10 +15,9 @@ final selectionActionServiceProvider = Provider.internal( selectionActionService, name: r'selectionActionServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectionActionServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectionActionServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,8 +32,9 @@ String _$eventServiceHash() => r'166b01f636fbdd4355dbc55a18ca4f83e0006de8'; final eventServiceProvider = Provider.internal( eventService, name: r'eventServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$eventServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$eventServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -49,8 +49,9 @@ String _$addonServiceHash() => r'c7aca09b99c3810908176f3464f5f90a185aa5e7'; final addonServiceProvider = Provider.internal( addonService, name: r'addonServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$addonServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$addonServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -65,10 +66,9 @@ String _$tabContentServiceHash() => r'd9a991add907ecc138c62790883e59d8e9aa9266'; final tabContentServiceProvider = Provider.internal( tabContentService, name: r'tabContentServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabContentServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabContentServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -85,10 +85,9 @@ final engineSuggestionsServiceProvider = Provider.internal( engineSuggestionsService, name: r'engineSuggestionsServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$engineSuggestionsServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$engineSuggestionsServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -104,10 +103,9 @@ final engineReadyStateProvider = NotifierProvider.internal( EngineReadyState.new, name: r'engineReadyStateProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$engineReadyStateHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$engineReadyStateHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/providers/browser_extension.g.dart b/app/lib/features/geckoview/domain/providers/browser_extension.g.dart index 1d1f1f67..c0384913 100644 --- a/app/lib/features/geckoview/domain/providers/browser_extension.g.dart +++ b/app/lib/features/geckoview/domain/providers/browser_extension.g.dart @@ -15,10 +15,9 @@ final browserExtensionServiceProvider = Provider.internal( browserExtensionService, name: r'browserExtensionServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$browserExtensionServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$browserExtensionServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ String _$feedRequestedHash() => r'4f179d0878072a77a87422ff6afdac53a3d57c04'; final feedRequestedProvider = AutoDisposeStreamProvider.internal( feedRequested, name: r'feedRequestedProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$feedRequestedHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedRequestedHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/providers/selected_tab.g.dart b/app/lib/features/geckoview/domain/providers/selected_tab.g.dart index dd083f3b..73714fc7 100644 --- a/app/lib/features/geckoview/domain/providers/selected_tab.g.dart +++ b/app/lib/features/geckoview/domain/providers/selected_tab.g.dart @@ -13,8 +13,9 @@ String _$selectedTabHash() => r'12b670dd76c3416e8d62bafd63bf69a83a603e3a'; final selectedTabProvider = NotifierProvider.internal( SelectedTab.new, name: r'selectedTabProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$selectedTabHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedTabHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/providers/tab_list.g.dart b/app/lib/features/geckoview/domain/providers/tab_list.g.dart index 866dc819..78b33134 100644 --- a/app/lib/features/geckoview/domain/providers/tab_list.g.dart +++ b/app/lib/features/geckoview/domain/providers/tab_list.g.dart @@ -14,8 +14,9 @@ final tabListProvider = NotifierProvider>>.internal( TabList.new, name: r'tabListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$tabListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabListHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/providers/tab_session.dart b/app/lib/features/geckoview/domain/providers/tab_session.dart index 75249229..ed3cb421 100644 --- a/app/lib/features/geckoview/domain/providers/tab_session.dart +++ b/app/lib/features/geckoview/domain/providers/tab_session.dart @@ -48,10 +48,9 @@ class TabSession extends _$TabSession { @override void build({required String? tabId}) { - _sessionService = - (tabId != null) - ? GeckoSessionService(tabId: tabId) - : GeckoSessionService.forActiveTab(); + _sessionService = (tabId != null) + ? GeckoSessionService(tabId: tabId) + : GeckoSessionService.forActiveTab(); } } diff --git a/app/lib/features/geckoview/domain/providers/tab_session.g.dart b/app/lib/features/geckoview/domain/providers/tab_session.g.dart index 7322e3ed..1a3d51f3 100644 --- a/app/lib/features/geckoview/domain/providers/tab_session.g.dart +++ b/app/lib/features/geckoview/domain/providers/tab_session.g.dart @@ -15,10 +15,9 @@ final selectedTabSessionNotifierProvider = AutoDisposeProvider>.internal( selectedTabSessionNotifier, name: r'selectedTabSessionNotifierProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedTabSessionNotifierHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedTabSessionNotifierHash, dependencies: null, allTransitiveDependencies: null, ); @@ -100,10 +99,9 @@ class TabSessionProvider () => TabSession()..tabId = tabId, from: tabSessionProvider, name: r'tabSessionProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabSessionHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabSessionHash, dependencies: TabSessionFamily._dependencies, allTransitiveDependencies: TabSessionFamily._allTransitiveDependencies, tabId: tabId, diff --git a/app/lib/features/geckoview/domain/providers/tab_state.dart b/app/lib/features/geckoview/domain/providers/tab_state.dart index 94a14473..c1586df2 100644 --- a/app/lib/features/geckoview/domain/providers/tab_state.dart +++ b/app/lib/features/geckoview/domain/providers/tab_state.dart @@ -26,10 +26,9 @@ class TabStates extends _$TabStates { ..[contentState.id] = current.copyWith( contextId: contentState.contextId, url: Uri.parse(contentState.url), - title: - (contentState.title.isNotEmpty) - ? contentState.title - : current.title, + title: (contentState.title.isNotEmpty) + ? contentState.title + : current.title, progress: contentState.progress, isPrivate: contentState.isPrivate, isFullScreen: contentState.isFullScreen, @@ -76,15 +75,12 @@ class TabStates extends _$TabStates { state = {...state} ..[tabId] = current.copyWith.historyState( HistoryState( - items: - history.items.nonNulls - .map( - (item) => HistoryItem( - url: Uri.parse(item.url), - title: item.title, - ), - ) - .toList(), + items: history.items.nonNulls + .map( + (item) => + HistoryItem(url: Uri.parse(item.url), title: item.title), + ) + .toList(), currentIndex: history.currentIndex, canGoBack: history.canGoBack, canGoForward: history.canGoForward, diff --git a/app/lib/features/geckoview/domain/providers/tab_state.g.dart b/app/lib/features/geckoview/domain/providers/tab_state.g.dart index 3a1721ba..edf3b713 100644 --- a/app/lib/features/geckoview/domain/providers/tab_state.g.dart +++ b/app/lib/features/geckoview/domain/providers/tab_state.g.dart @@ -71,10 +71,9 @@ class TabStateProvider extends AutoDisposeProvider { (ref) => tabState(ref as TabStateRef, tabId), from: tabStateProvider, name: r'tabStateProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabStateHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabStateHash, dependencies: TabStateFamily._dependencies, allTransitiveDependencies: TabStateFamily._allTransitiveDependencies, tabId: tabId, @@ -149,10 +148,9 @@ String _$selectedTabStateHash() => r'dbd36af7af286bd9d079f30e8e11bbda23bf7728'; final selectedTabStateProvider = AutoDisposeProvider.internal( selectedTabState, name: r'selectedTabStateProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedTabStateHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedTabStateHash, dependencies: null, allTransitiveDependencies: null, ); @@ -168,10 +166,9 @@ final tabStatesProvider = NotifierProvider>.internal( TabStates.new, name: r'tabStatesProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabStatesHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabStatesHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart b/app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart index d9893c47..a7a3e276 100644 --- a/app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart +++ b/app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart @@ -86,10 +86,9 @@ class WebExtensionsStateProvider () => WebExtensionsState()..actionType = actionType, from: webExtensionsStateProvider, name: r'webExtensionsStateProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$webExtensionsStateHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$webExtensionsStateHash, dependencies: WebExtensionsStateFamily._dependencies, allTransitiveDependencies: WebExtensionsStateFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/domain/repositories/tab.dart b/app/lib/features/geckoview/domain/repositories/tab.dart index 54fdf18d..092922d5 100644 --- a/app/lib/features/geckoview/domain/repositories/tab.dart +++ b/app/lib/features/geckoview/domain/repositories/tab.dart @@ -49,8 +49,9 @@ class TabRepository extends _$TabRepository { HistoryMetadataKey? historyMetadata, Map? additionalHeaders, }) async { - final selectedContainer = - await ref.read(selectedContainerProvider.notifier).fetchData(); + final selectedContainer = await ref + .read(selectedContainerProvider.notifier) + .fetchData(); return ref.read(tabDatabaseProvider).tabDao.upsertContainerTabTransactional( () { @@ -124,8 +125,8 @@ class TabRepository extends _$TabRepository { } if (containerData.metadata.useProxy) { - final proxyPluginHealthy = - await GeckoContainerProxyService().healthcheck(); + final proxyPluginHealthy = await GeckoContainerProxyService() + .healthcheck(); if (!proxyPluginHealthy) { logger.w( @@ -170,10 +171,9 @@ class TabRepository extends _$TabRepository { } //We only take containers without authentication! - final availableContainers = - await ref - .read(containerRepositoryProvider.notifier) - .getAllContainersWithCount(); + final availableContainers = await ref + .read(containerRepositoryProvider.notifier) + .getAllContainersWithCount(); final nextAvailableContainerUnauthenticated = availableContainers .firstWhereOrNull( diff --git a/app/lib/features/geckoview/domain/repositories/tab.g.dart b/app/lib/features/geckoview/domain/repositories/tab.g.dart index 102582d6..6cbcd7de 100644 --- a/app/lib/features/geckoview/domain/repositories/tab.g.dart +++ b/app/lib/features/geckoview/domain/repositories/tab.g.dart @@ -13,10 +13,9 @@ String _$tabRepositoryHash() => r'9b7ef03bec41f149b3cb456b73d7ee0e1b2804df'; final tabRepositoryProvider = NotifierProvider.internal( TabRepository.new, name: r'tabRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/domain/providers.dart b/app/lib/features/geckoview/features/browser/domain/providers.dart index 77761c32..7866c14f 100644 --- a/app/lib/features/geckoview/features/browser/domain/providers.dart +++ b/app/lib/features/geckoview/features/browser/domain/providers.dart @@ -92,16 +92,14 @@ EquatableValue> seamlessFilteredTabIds( TabSearchPartition searchPartition, ContainerFilter containerFilter, ) { - final tabSearchResults = - ref - .watch( - tabSearchRepositoryProvider(searchPartition).select( - (value) => EquatableValue( - value.valueOrNull?.map((tab) => tab.id).toList(), - ), - ), - ) - .value; + final tabSearchResults = ref + .watch( + tabSearchRepositoryProvider(searchPartition).select( + (value) => + EquatableValue(value.valueOrNull?.map((tab) => tab.id).toList()), + ), + ) + .value; final availableTabs = ref.watch(availableTabIdsProvider(containerFilter)); @@ -120,14 +118,13 @@ EquatableValue> seamlessFilteredTabPreviews( TabSearchPartition searchPartition, ContainerFilter containerFilter, ) { - final tabSearchResults = - ref - .watch( - tabSearchRepositoryProvider( - searchPartition, - ).select((value) => EquatableValue(value.valueOrNull)), - ) - .value; + final tabSearchResults = ref + .watch( + tabSearchRepositoryProvider( + searchPartition, + ).select((value) => EquatableValue(value.valueOrNull)), + ) + .value; final availableTabStates = ref.watch( availableTabStatesProvider(containerFilter), diff --git a/app/lib/features/geckoview/features/browser/domain/providers.g.dart b/app/lib/features/geckoview/features/browser/domain/providers.g.dart index 162d0bd4..f95c6b6e 100644 --- a/app/lib/features/geckoview/features/browser/domain/providers.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/providers.g.dart @@ -74,10 +74,9 @@ class AvailableTabIdsProvider (ref) => availableTabIds(ref as AvailableTabIdsRef, containerFilter), from: availableTabIdsProvider, name: r'availableTabIdsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$availableTabIdsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$availableTabIdsHash, dependencies: AvailableTabIdsFamily._dependencies, allTransitiveDependencies: AvailableTabIdsFamily._allTransitiveDependencies, @@ -202,10 +201,9 @@ class AvailableTabStatesProvider availableTabStates(ref as AvailableTabStatesRef, containerFilter), from: availableTabStatesProvider, name: r'availableTabStatesProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$availableTabStatesHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$availableTabStatesHash, dependencies: AvailableTabStatesFamily._dependencies, allTransitiveDependencies: AvailableTabStatesFamily._allTransitiveDependencies, @@ -342,10 +340,9 @@ class SeamlessFilteredTabIdsProvider ), from: seamlessFilteredTabIdsProvider, name: r'seamlessFilteredTabIdsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$seamlessFilteredTabIdsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$seamlessFilteredTabIdsHash, dependencies: SeamlessFilteredTabIdsFamily._dependencies, allTransitiveDependencies: SeamlessFilteredTabIdsFamily._allTransitiveDependencies, @@ -494,10 +491,9 @@ class SeamlessFilteredTabPreviewsProvider ), from: seamlessFilteredTabPreviewsProvider, name: r'seamlessFilteredTabPreviewsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$seamlessFilteredTabPreviewsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$seamlessFilteredTabPreviewsHash, dependencies: SeamlessFilteredTabPreviewsFamily._dependencies, allTransitiveDependencies: SeamlessFilteredTabPreviewsFamily._allTransitiveDependencies, @@ -641,10 +637,9 @@ class SelectedBangTriggerProvider () => SelectedBangTrigger()..domain = domain, from: selectedBangTriggerProvider, name: r'selectedBangTriggerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedBangTriggerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedBangTriggerHash, dependencies: SelectedBangTriggerFamily._dependencies, allTransitiveDependencies: SelectedBangTriggerFamily._allTransitiveDependencies, @@ -773,10 +768,9 @@ class SelectedBangDataProvider () => SelectedBangData()..domain = domain, from: selectedBangDataProvider, name: r'selectedBangDataProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedBangDataHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedBangDataHash, dependencies: SelectedBangDataFamily._dependencies, allTransitiveDependencies: SelectedBangDataFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/browser/domain/providers/intent.g.dart b/app/lib/features/geckoview/features/browser/domain/providers/intent.g.dart index 7ba4c61c..e27e8ba2 100644 --- a/app/lib/features/geckoview/features/browser/domain/providers/intent.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/providers/intent.g.dart @@ -11,19 +11,19 @@ String _$engineBoundIntentStreamHash() => /// See also [EngineBoundIntentStream]. @ProviderFor(EngineBoundIntentStream) -final engineBoundIntentStreamProvider = AutoDisposeStreamNotifierProvider< - EngineBoundIntentStream, - SharedContent ->.internal( - EngineBoundIntentStream.new, - name: r'engineBoundIntentStreamProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') +final engineBoundIntentStreamProvider = + AutoDisposeStreamNotifierProvider< + EngineBoundIntentStream, + SharedContent + >.internal( + EngineBoundIntentStream.new, + name: r'engineBoundIntentStreamProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') ? null : _$engineBoundIntentStreamHash, - dependencies: null, - allTransitiveDependencies: null, -); + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$EngineBoundIntentStream = AutoDisposeStreamNotifier; // ignore_for_file: type=lint diff --git a/app/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart b/app/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart index b72ac7d2..7ae4f55d 100644 --- a/app/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart @@ -15,10 +15,9 @@ final browserViewLifecycleProvider = NotifierProvider.internal( BrowserViewLifecycle.new, name: r'browserViewLifecycleProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$browserViewLifecycleHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$browserViewLifecycleHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart b/app/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart index efdd138e..b26a23cb 100644 --- a/app/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart @@ -15,10 +15,9 @@ final browserAddonServiceProvider = AutoDisposeNotifierProvider.internal( BrowserAddonService.new, name: r'browserAddonServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$browserAddonServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$browserAddonServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart b/app/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart index 3addd72b..c71537d6 100644 --- a/app/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart @@ -15,10 +15,9 @@ final browserDataServiceProvider = NotifierProvider.internal( BrowserDataService.new, name: r'browserDataServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$browserDataServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$browserDataServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart b/app/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart index 44ff7d95..c57dc170 100644 --- a/app/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart @@ -15,10 +15,9 @@ final engineSettingsReplicationServiceProvider = NotifierProvider.internal( EngineSettingsReplicationService.new, name: r'engineSettingsReplicationServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$engineSettingsReplicationServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$engineSettingsReplicationServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart b/app/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart index 4a328b21..7d0d4ede 100644 --- a/app/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart +++ b/app/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart @@ -15,10 +15,9 @@ final proxySettingsReplicationProvider = NotifierProvider.internal( ProxySettingsReplication.new, name: r'proxySettingsReplicationProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$proxySettingsReplicationHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$proxySettingsReplicationHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart index 230ee7d8..47263fad 100644 --- a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart +++ b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart @@ -89,23 +89,21 @@ class WebPageDialog extends HookConsumerWidget { searchInNewTab: false, ); }, - error: - (error, stackTrace) => FailureWidget( - title: 'Could not load bangs', - exception: error, - ), - loading: - () => SiteSearch( - domain: url.host, - availableBangs: const [ - // BangData( - // websiteName: 'websiteName', - // domain: 'domain', - // trigger: 'trigger', - // urlTemplate: 'urlTemplate', - // ), - ], - ), + error: (error, stackTrace) => FailureWidget( + title: 'Could not load bangs', + exception: error, + ), + loading: () => SiteSearch( + domain: url.host, + availableBangs: const [ + // BangData( + // websiteName: 'websiteName', + // domain: 'domain', + // trigger: 'trigger', + // urlTemplate: 'urlTemplate', + // ), + ], + ), ), ), if (availableBangsAsync.isLoading || @@ -200,10 +198,9 @@ class WebPageDialog extends HookConsumerWidget { leading: const Icon(Icons.mobile_screen_share), title: const Text('Share screenshot'), onTap: () async { - final screenshot = - await ref - .read(selectedTabSessionNotifierProvider) - .requestScreenshot(); + final screenshot = await ref + .read(selectedTabSessionNotifierProvider) + .requestScreenshot(); if (screenshot != null) { ui.decodeImageFromList(screenshot, ( diff --git a/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart b/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart index 83a24eb9..90276923 100644 --- a/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart +++ b/app/lib/features/geckoview/features/browser/presentation/screens/browser.dart @@ -111,14 +111,13 @@ class BrowserScreen extends HookConsumerWidget { return displayedOverlay!; }, child: Listener( - onPointerDown: - (displayedSheet != null) - ? (_) { - ref - .read(bottomSheetControllerProvider.notifier) - .dismiss(); - } - : null, + onPointerDown: (displayedSheet != null) + ? (_) { + ref + .read(bottomSheetControllerProvider.notifier) + .dismiss(); + } + : null, child: BackButtonListener( onBackButtonPressed: () async { final tabState = ref.read(selectedTabStateProvider); @@ -220,36 +219,35 @@ class BrowserScreen extends HookConsumerWidget { }, ), floatingActionButton: ReaderAppearanceButton(), - bottomSheet: - (displayedSheet != null) - ? NotificationListener( - onNotification: (notification) { - if (notification.extent <= 0.1) { - ref - .read(bottomSheetControllerProvider.notifier) - .dismiss(); - return true; - } else { - ref - .read(bottomSheetExtendProvider.notifier) - .add(notification.extent); - } + bottomSheet: (displayedSheet != null) + ? NotificationListener( + onNotification: (notification) { + if (notification.extent <= 0.1) { + ref + .read(bottomSheetControllerProvider.notifier) + .dismiss(); + return true; + } else { + ref + .read(bottomSheetExtendProvider.notifier) + .add(notification.extent); + } - return false; - }, - child: switch (displayedSheet) { - ViewTabsSheet() => _ViewTabsSheet( - key: ValueKey(displayedSheet), - maxChildSize: MediaQuery.of(context).relativeSafeArea(), - ), - final TabQaChatSheet parameter => _QaSheet( - key: ValueKey(displayedSheet), - maxChildSize: MediaQuery.of(context).relativeSafeArea(), - chatId: parameter.chatId, - ), - }, - ) - : null, + return false; + }, + child: switch (displayedSheet) { + ViewTabsSheet() => _ViewTabsSheet( + key: ValueKey(displayedSheet), + maxChildSize: MediaQuery.of(context).relativeSafeArea(), + ), + final TabQaChatSheet parameter => _QaSheet( + key: ValueKey(displayedSheet), + maxChildSize: MediaQuery.of(context).relativeSafeArea(), + chatId: parameter.chatId, + ), + }, + ) + : null, ), ), ); @@ -304,10 +302,10 @@ class _BrowserView extends StatelessWidget { (state) => EdgeInsets.only( bottom: (state?.isLoading == true && - state?.progress != null && - state!.progress < 100) - ? 4.0 - : 0.0, + state?.progress != null && + state!.progress < 100) + ? 4.0 + : 0.0, ), ), ); diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart index ff55aa82..bda51328 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/bottom_app_bar.dart @@ -86,14 +86,12 @@ class BrowserBottomAppBar extends HookConsumerWidget { child: AppBar( automaticallyImplyLeading: false, titleSpacing: 8.0, - backgroundColor: - (isPrivateTab && displayedSheet is! ViewTabsSheet) - ? const Color(0x648000D7) - : null, - title: - (selectedTabId != null && displayedSheet is! ViewTabsSheet) - ? const AppBarTitle() - : null, + backgroundColor: (isPrivateTab && displayedSheet is! ViewTabsSheet) + ? const Color(0x648000D7) + : null, + title: (selectedTabId != null && displayedSheet is! ViewTabsSheet) + ? const AppBarTitle() + : null, actions: [ if (selectedTabId != null && displayedSheet is! ViewTabsSheet) ReaderButton(), @@ -349,54 +347,50 @@ class BrowserBottomAppBar extends HookConsumerWidget { return Row( children: [ Expanded( - child: - (history?.canGoBack == true || isLoading) - ? IconButton( - onPressed: () async { - final controller = ref.read( - tabSessionProvider( - tabId: selectedTabId, - ).notifier, - ); + child: (history?.canGoBack == true || isLoading) + ? IconButton( + onPressed: () async { + final controller = ref.read( + tabSessionProvider( + tabId: selectedTabId, + ).notifier, + ); - if (isLoading) { - await controller.stopLoading(); - } else { - await controller.goBack(); - } + if (isLoading) { + await controller.stopLoading(); + } else { + await controller.goBack(); + } - trippleDotMenuController.close(); - }, - icon: const Icon(Icons.arrow_back), - ) - : IconButton( - onPressed: () async { - await ref - .read( - tabRepositoryProvider.notifier, - ) - .closeTab(selectedTabId); - trippleDotMenuController.close(); - }, - icon: const Icon(Icons.close), - ), + trippleDotMenuController.close(); + }, + icon: const Icon(Icons.arrow_back), + ) + : IconButton( + onPressed: () async { + await ref + .read(tabRepositoryProvider.notifier) + .closeTab(selectedTabId); + trippleDotMenuController.close(); + }, + icon: const Icon(Icons.close), + ), ), const SizedBox(height: 48, child: VerticalDivider()), Expanded( child: IconButton( - onPressed: - (history?.canGoForward == true) - ? () async { - final controller = ref.read( - tabSessionProvider( - tabId: selectedTabId, - ).notifier, - ); + onPressed: (history?.canGoForward == true) + ? () async { + final controller = ref.read( + tabSessionProvider( + tabId: selectedTabId, + ).notifier, + ); - await controller.goForward(); - trippleDotMenuController.close(); - } - : null, + await controller.goForward(); + trippleDotMenuController.close(); + } + : null, icon: const Icon(Icons.arrow_forward), ), ), diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/tab_preview.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/tab_preview.dart index 2da9f2c1..a8d062b7 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/tab_preview.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/tab_preview.dart @@ -43,10 +43,9 @@ class TabPreview extends HookWidget { borderRadius: const BorderRadius.all(Radius.circular(16.0)), ), child: Material( - color: - tab.isPrivate - ? const Color(0xFF25003E) - : colorScheme.surfaceContainerHighest, + color: tab.isPrivate + ? const Color(0xFF25003E) + : colorScheme.surfaceContainerHighest, borderRadius: const BorderRadius.all(Radius.circular(14.0)), child: InkWell( borderRadius: const BorderRadius.all(Radius.circular(14.0)), @@ -63,10 +62,9 @@ class TabPreview extends HookWidget { overflow: TextOverflow.ellipsis, tab.title, maxLines: 2, - style: - tab.isPrivate - ? const TextStyle(color: Colors.white) - : null, + style: tab.isPrivate + ? const TextStyle(color: Colors.white) + : null, ), ), ), diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart index 1f6cf686..36eec540 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/tabs_action_button.dart @@ -34,10 +34,9 @@ class TabsActionButton extends HookConsumerWidget { decoration: BoxDecoration( border: Border.all( width: 2.0, - color: - isActive - ? theme.colorScheme.primary - : DefaultTextStyle.of(context).style.color!, + color: isActive + ? theme.colorScheme.primary + : DefaultTextStyle.of(context).style.color!, ), borderRadius: BorderRadius.circular(5.0), ), diff --git a/app/lib/features/geckoview/features/find_in_page/domain/entities/find_in_page_state.g.dart b/app/lib/features/geckoview/features/find_in_page/domain/entities/find_in_page_state.g.dart index 20cbcd0c..1106dc8f 100644 --- a/app/lib/features/geckoview/features/find_in_page/domain/entities/find_in_page_state.g.dart +++ b/app/lib/features/geckoview/features/find_in_page/domain/entities/find_in_page_state.g.dart @@ -45,16 +45,14 @@ class _$FindInPageStateCWProxyImpl implements _$FindInPageStateCWProxy { Object? lastSearchText = const $CopyWithPlaceholder(), }) { return FindInPageState( - visible: - visible == const $CopyWithPlaceholder() - ? _value.visible - // ignore: cast_nullable_to_non_nullable - : visible as bool, - lastSearchText: - lastSearchText == const $CopyWithPlaceholder() - ? _value.lastSearchText - // ignore: cast_nullable_to_non_nullable - : lastSearchText as String?, + visible: visible == const $CopyWithPlaceholder() + ? _value.visible + // ignore: cast_nullable_to_non_nullable + : visible as bool, + lastSearchText: lastSearchText == const $CopyWithPlaceholder() + ? _value.lastSearchText + // ignore: cast_nullable_to_non_nullable + : lastSearchText as String?, ); } } diff --git a/app/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart b/app/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart index 1303846e..7be05a8d 100644 --- a/app/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart +++ b/app/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart @@ -81,10 +81,9 @@ class FindInPageRepositoryProvider () => FindInPageRepository()..tabId = tabId, from: findInPageRepositoryProvider, name: r'findInPageRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$findInPageRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$findInPageRepositoryHash, dependencies: FindInPageRepositoryFamily._dependencies, allTransitiveDependencies: FindInPageRepositoryFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart b/app/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart index 063c720c..b2cc8e74 100644 --- a/app/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart +++ b/app/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart @@ -15,10 +15,9 @@ final findInPageControllerProvider = AutoDisposeNotifierProvider.internal( FindInPageController.new, name: r'findInPageControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$findInPageControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$findInPageControllerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/preferences/data/models/preference_setting.g.dart b/app/lib/features/geckoview/features/preferences/data/models/preference_setting.g.dart index 4b55c34f..ef29fe49 100644 --- a/app/lib/features/geckoview/features/preferences/data/models/preference_setting.g.dart +++ b/app/lib/features/geckoview/features/preferences/data/models/preference_setting.g.dart @@ -50,16 +50,14 @@ class _$PreferenceSettingGroupCWProxyImpl Object? settings = const $CopyWithPlaceholder(), }) { return PreferenceSettingGroup( - description: - description == const $CopyWithPlaceholder() - ? _value.description - // ignore: cast_nullable_to_non_nullable - : description as String?, - settings: - settings == const $CopyWithPlaceholder() - ? _value.settings - // ignore: cast_nullable_to_non_nullable - : settings as Map, + description: description == const $CopyWithPlaceholder() + ? _value.description + // ignore: cast_nullable_to_non_nullable + : description as String?, + settings: settings == const $CopyWithPlaceholder() + ? _value.settings + // ignore: cast_nullable_to_non_nullable + : settings as Map, ); } } @@ -144,36 +142,30 @@ class _$PreferenceSettingCWProxyImpl implements _$PreferenceSettingCWProxy { Object? shouldBeDefault = const $CopyWithPlaceholder(), }) { return PreferenceSetting( - value: - value == const $CopyWithPlaceholder() - ? _value.value - // ignore: cast_nullable_to_non_nullable - : value as Object, - title: - title == const $CopyWithPlaceholder() - ? _value.title - // ignore: cast_nullable_to_non_nullable - : title as String?, - description: - description == const $CopyWithPlaceholder() - ? _value.description - // ignore: cast_nullable_to_non_nullable - : description as String?, - actualValue: - actualValue == const $CopyWithPlaceholder() - ? _value.actualValue - // ignore: cast_nullable_to_non_nullable - : actualValue as Object?, - requireUserOptIn: - requireUserOptIn == const $CopyWithPlaceholder() - ? _value.requireUserOptIn - // ignore: cast_nullable_to_non_nullable - : requireUserOptIn as bool, - shouldBeDefault: - shouldBeDefault == const $CopyWithPlaceholder() - ? _value.shouldBeDefault - // ignore: cast_nullable_to_non_nullable - : shouldBeDefault as bool, + value: value == const $CopyWithPlaceholder() + ? _value.value + // ignore: cast_nullable_to_non_nullable + : value as Object, + title: title == const $CopyWithPlaceholder() + ? _value.title + // ignore: cast_nullable_to_non_nullable + : title as String?, + description: description == const $CopyWithPlaceholder() + ? _value.description + // ignore: cast_nullable_to_non_nullable + : description as String?, + actualValue: actualValue == const $CopyWithPlaceholder() + ? _value.actualValue + // ignore: cast_nullable_to_non_nullable + : actualValue as Object?, + requireUserOptIn: requireUserOptIn == const $CopyWithPlaceholder() + ? _value.requireUserOptIn + // ignore: cast_nullable_to_non_nullable + : requireUserOptIn as bool, + shouldBeDefault: shouldBeDefault == const $CopyWithPlaceholder() + ? _value.shouldBeDefault + // ignore: cast_nullable_to_non_nullable + : shouldBeDefault as bool, ); } } diff --git a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart index 79271568..e3a1a414 100644 --- a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart +++ b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.dart @@ -107,11 +107,10 @@ class UnifiedPreferenceSettingsRepository _preferenceSettingGroupsProvider(partition).future, ); - final prefs = - _statelessGroups!.values - .map((group) => group.settings.keys) - .flattened - .toList(); + final prefs = _statelessGroups!.values + .map((group) => group.settings.keys) + .flattened + .toList(); await ref.read(_preferenceRepositoryProvider.notifier).resetPrefs(prefs); } diff --git a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart index 8d05205a..6ceef00b 100644 --- a/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart +++ b/app/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart @@ -15,10 +15,9 @@ final _preferenceSettingContentProvider = FutureProvider>.internal( _preferenceSettingContent, name: r'_preferenceSettingContentProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$preferenceSettingContentHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$preferenceSettingContentHash, dependencies: null, allTransitiveDependencies: null, ); @@ -99,10 +98,9 @@ class _PreferenceSettingGroupsProvider ), from: _preferenceSettingGroupsProvider, name: r'_preferenceSettingGroupsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$preferenceSettingGroupsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$preferenceSettingGroupsHash, dependencies: _PreferenceSettingGroupsFamily._dependencies, allTransitiveDependencies: _PreferenceSettingGroupsFamily._allTransitiveDependencies, @@ -238,10 +236,9 @@ class _PreferenceSettingGroupProvider ), from: _preferenceSettingGroupProvider, name: r'_preferenceSettingGroupProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$preferenceSettingGroupHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$preferenceSettingGroupHash, dependencies: _PreferenceSettingGroupFamily._dependencies, allTransitiveDependencies: _PreferenceSettingGroupFamily._allTransitiveDependencies, @@ -334,19 +331,19 @@ String _$preferenceRepositoryHash() => /// See also [_PreferenceRepository]. @ProviderFor(_PreferenceRepository) -final _preferenceRepositoryProvider = AutoDisposeNotifierProvider< - _PreferenceRepository, - Raw>> ->.internal( - _PreferenceRepository.new, - name: r'_preferenceRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') +final _preferenceRepositoryProvider = + AutoDisposeNotifierProvider< + _PreferenceRepository, + Raw>> + >.internal( + _PreferenceRepository.new, + name: r'_preferenceRepositoryProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') ? null : _$preferenceRepositoryHash, - dependencies: null, - allTransitiveDependencies: null, -); + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$PreferenceRepository = AutoDisposeNotifier>>>; @@ -418,14 +415,12 @@ class UnifiedPreferenceSettingsRepositoryProvider () => UnifiedPreferenceSettingsRepository()..partition = partition, from: unifiedPreferenceSettingsRepositoryProvider, name: r'unifiedPreferenceSettingsRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$unifiedPreferenceSettingsRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$unifiedPreferenceSettingsRepositoryHash, dependencies: UnifiedPreferenceSettingsRepositoryFamily._dependencies, - allTransitiveDependencies: - UnifiedPreferenceSettingsRepositoryFamily - ._allTransitiveDependencies, + allTransitiveDependencies: UnifiedPreferenceSettingsRepositoryFamily + ._allTransitiveDependencies, partition: partition, ); @@ -580,16 +575,14 @@ class PreferenceSettingsGroupRepositoryProvider PreferencePartition partition, String groupName, ) : this._internal( - () => - PreferenceSettingsGroupRepository() - ..partition = partition - ..groupName = groupName, + () => PreferenceSettingsGroupRepository() + ..partition = partition + ..groupName = groupName, from: preferenceSettingsGroupRepositoryProvider, name: r'preferenceSettingsGroupRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$preferenceSettingsGroupRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$preferenceSettingsGroupRepositoryHash, dependencies: PreferenceSettingsGroupRepositoryFamily._dependencies, allTransitiveDependencies: PreferenceSettingsGroupRepositoryFamily._allTransitiveDependencies, @@ -623,10 +616,9 @@ class PreferenceSettingsGroupRepositoryProvider return ProviderOverride( origin: this, override: PreferenceSettingsGroupRepositoryProvider._internal( - () => - create() - ..partition = partition - ..groupName = groupName, + () => create() + ..partition = partition + ..groupName = groupName, from: from, name: null, dependencies: null, diff --git a/app/lib/features/geckoview/features/readerview/domain/providers/readerable.g.dart b/app/lib/features/geckoview/features/readerview/domain/providers/readerable.g.dart index d499b42d..3bc02107 100644 --- a/app/lib/features/geckoview/features/readerview/domain/providers/readerable.g.dart +++ b/app/lib/features/geckoview/features/readerview/domain/providers/readerable.g.dart @@ -13,10 +13,9 @@ String _$readerableServiceHash() => r'03182c8afc41f5184322a3206473cbfa96df5819'; final readerableServiceProvider = Provider.internal( readerableService, name: r'readerableServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$readerableServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$readerableServiceHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ final appearanceButtonVisibilityProvider = AutoDisposeStreamProvider.internal( appearanceButtonVisibility, name: r'appearanceButtonVisibilityProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$appearanceButtonVisibilityHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$appearanceButtonVisibilityHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart b/app/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart index 4929d9a3..f7cf926f 100644 --- a/app/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart +++ b/app/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart @@ -15,10 +15,9 @@ final readerableScreenControllerProvider = AsyncNotifierProvider.internal( ReaderableScreenController.new, name: r'readerableScreenControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$readerableScreenControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$readerableScreenControllerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/readerview/presentation/widgets/reader_button.dart b/app/lib/features/geckoview/features/readerview/presentation/widgets/reader_button.dart index 06fb2cd3..758971d2 100644 --- a/app/lib/features/geckoview/features/readerview/presentation/widgets/reader_button.dart +++ b/app/lib/features/geckoview/features/readerview/presentation/widgets/reader_button.dart @@ -32,16 +32,12 @@ class ReaderButton extends HookConsumerWidget { ), ); - final icon = - readerabilityState.active - ? Icon( - MdiIcons.bookOpen, - color: Theme.of(context).colorScheme.primary, - ) - : Icon( - MdiIcons.bookOpenOutline, - color: Theme.of(context).colorScheme.onSurface, - ); + final icon = readerabilityState.active + ? Icon(MdiIcons.bookOpen, color: Theme.of(context).colorScheme.primary) + : Icon( + MdiIcons.bookOpenOutline, + color: Theme.of(context).colorScheme.onSurface, + ); return Visibility( visible: @@ -50,46 +46,40 @@ class ReaderButton extends HookConsumerWidget { (enforceReadability && enableReadability), child: readerChanging.when( skipLoadingOnReload: true, - data: - (_) => InkWell( - onTap: - readerChanging.isLoading - ? null - : () async { - await ref - .read(readerableScreenControllerProvider.notifier) - .toggleReaderView(!readerabilityState.active); - }, - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 15.0, - horizontal: 8.0, - ), - child: icon, - ), + data: (_) => InkWell( + onTap: readerChanging.isLoading + ? null + : () async { + await ref + .read(readerableScreenControllerProvider.notifier) + .toggleReaderView(!readerabilityState.active); + }, + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 15.0, + horizontal: 8.0, ), + child: icon, + ), + ), error: (error, stackTrace) => SizedBox.shrink(), - loading: - () => AnimateGradientShader( - duration: const Duration(milliseconds: 500), - primaryEnd: Alignment.bottomLeft, - secondaryEnd: Alignment.topRight, - primaryColors: [ - colorScheme.primary, - colorScheme.primaryContainer, - ], - secondaryColors: [ - colorScheme.secondary, - colorScheme.secondaryContainer, - ], - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 15.0, - horizontal: 8.0, - ), - child: icon, - ), + loading: () => AnimateGradientShader( + duration: const Duration(milliseconds: 500), + primaryEnd: Alignment.bottomLeft, + secondaryEnd: Alignment.topRight, + primaryColors: [colorScheme.primary, colorScheme.primaryContainer], + secondaryColors: [ + colorScheme.secondary, + colorScheme.secondaryContainer, + ], + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 15.0, + horizontal: 8.0, ), + child: icon, + ), + ), ), ); } diff --git a/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.dart b/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.dart index afe17e8c..d8cb7f4b 100644 --- a/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.dart +++ b/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.dart @@ -37,18 +37,17 @@ AsyncValue> engineHistorySuggestions(Ref ref) { return ref.watch( engineSuggestionsProvider.select( (suggestions) => suggestions.whenData( - (suggestions) => - suggestions - .where( - (suggestion) => - suggestion.type == GeckoSuggestionType.history && - (suggestion.title.isNotEmpty) && - (suggestion.description.mapNotNull( - (url) => Uri.tryParse(url), - ) != - null), - ) - .toList(), + (suggestions) => suggestions + .where( + (suggestion) => + suggestion.type == GeckoSuggestionType.history && + (suggestion.title.isNotEmpty) && + (suggestion.description.mapNotNull( + (url) => Uri.tryParse(url), + ) != + null), + ) + .toList(), ), ), ); diff --git a/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart b/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart index 76c83e60..7fdc5ff0 100644 --- a/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart +++ b/app/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart @@ -15,10 +15,9 @@ final engineHistorySuggestionsProvider = AutoDisposeProvider>>.internal( engineHistorySuggestions, name: r'engineHistorySuggestionsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$engineHistorySuggestionsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$engineHistorySuggestionsHash, dependencies: null, allTransitiveDependencies: null, ); @@ -31,19 +30,19 @@ String _$engineSuggestionsHash() => r'ba2c2d7f0a5e99fd9e639acd020b8cf3016c6126'; /// See also [EngineSuggestions]. @ProviderFor(EngineSuggestions) -final engineSuggestionsProvider = AutoDisposeStreamNotifierProvider< - EngineSuggestions, - List ->.internal( - EngineSuggestions.new, - name: r'engineSuggestionsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') +final engineSuggestionsProvider = + AutoDisposeStreamNotifierProvider< + EngineSuggestions, + List + >.internal( + EngineSuggestions.new, + name: r'engineSuggestionsProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') ? null : _$engineSuggestionsHash, - dependencies: null, - allTransitiveDependencies: null, -); + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$EngineSuggestions = AutoDisposeStreamNotifier>; // ignore_for_file: type=lint diff --git a/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.dart b/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.dart index 434e730b..4d88bfe3 100644 --- a/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.dart +++ b/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.dart @@ -22,12 +22,9 @@ class SearchSuggestions extends _$SearchSuggestions { final defaultProvider = ref.watch(defaultSearchSuggestionsProvider); final resolvedProvider = suggestionsProvider ?? defaultProvider; - _addQueryBinding = - ref - .watch( - searchSuggestionsRepositoryProvider(resolvedProvider).notifier, - ) - .addQuery; + _addQueryBinding = ref + .watch(searchSuggestionsRepositoryProvider(resolvedProvider).notifier) + .addQuery; return ref.watch(searchSuggestionsRepositoryProvider(resolvedProvider)); } diff --git a/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart b/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart index cf3ee47b..63bb0507 100644 --- a/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart +++ b/app/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart @@ -15,10 +15,9 @@ final defaultSearchSuggestionsProvider = Provider.internal( defaultSearchSuggestions, name: r'defaultSearchSuggestionsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$defaultSearchSuggestionsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$defaultSearchSuggestionsHash, dependencies: null, allTransitiveDependencies: null, ); @@ -104,10 +103,9 @@ class SearchSuggestionsProvider () => SearchSuggestions()..suggestionsProvider = suggestionsProvider, from: searchSuggestionsProvider, name: r'searchSuggestionsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$searchSuggestionsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$searchSuggestionsHash, dependencies: SearchSuggestionsFamily._dependencies, allTransitiveDependencies: SearchSuggestionsFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart b/app/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart index 67c8d9d7..e8c9c0e4 100644 --- a/app/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart +++ b/app/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart @@ -94,10 +94,9 @@ class SearchSuggestionsRepositoryProvider ..suggestionsProvider = suggestionsProvider, from: searchSuggestionsRepositoryProvider, name: r'searchSuggestionsRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$searchSuggestionsRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$searchSuggestionsRepositoryHash, dependencies: SearchSuggestionsRepositoryFamily._dependencies, allTransitiveDependencies: SearchSuggestionsRepositoryFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart b/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart index c58a3b99..97c97902 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart @@ -32,21 +32,20 @@ class BangChips extends HookConsumerWidget { ) { return showDialog( context: context, - builder: - (context) => AlertDialog( - title: Text('Reset usage frequency of $triggerName?'), - content: const Text('This will remove the Bang from quick select.'), - actions: [ - TextButton( - onPressed: () => Navigator.pop(context, false), - child: const Text('Cancel'), - ), - TextButton( - onPressed: () => Navigator.pop(context, true), - child: const Text('Reset'), - ), - ], + builder: (context) => AlertDialog( + title: Text('Reset usage frequency of $triggerName?'), + content: const Text('This will remove the Bang from quick select.'), + actions: [ + TextButton( + onPressed: () => Navigator.pop(context, false), + child: const Text('Cancel'), ), + TextButton( + onPressed: () => Navigator.pop(context, true), + child: const Text('Reset'), + ), + ], + ), ); } @@ -71,9 +70,8 @@ class BangChips extends HookConsumerWidget { Expanded( child: SelectableChips( itemId: (bang) => bang.trigger, - itemAvatar: - (bang) => - UrlIcon([bang.getTemplateUrl('')], iconSize: 20), + itemAvatar: (bang) => + UrlIcon([bang.getTemplateUrl('')], iconSize: 20), itemLabel: (bang) => Text(bang.websiteName), availableItems: availableBangs, selectedItem: activeBang, @@ -100,10 +98,9 @@ class BangChips extends HookConsumerWidget { final searchText = searchTextController?.text.trim(); final trigger = await BangSearchRoute( - searchText: - (searchText.isEmpty) - ? BangSearchRoute.emptySearchText - : searchText!, + searchText: (searchText.isEmpty) + ? BangSearchRoute.emptySearchText + : searchText!, ).push(context); if (trigger != null) { diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart index e261ac1a..4e806027 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart @@ -77,31 +77,29 @@ class SearchField extends HookConsumerWidget { autofocus: autofocus, decoration: InputDecoration( border: InputBorder.none, - prefixIcon: - (showBangIcon && activeBang != null) - ? Padding( - padding: const EdgeInsetsDirectional.all(12.0), - child: UrlIcon([ - activeBang!.getTemplateUrl(''), - ], iconSize: 24.0), - ) - : null, + prefixIcon: (showBangIcon && activeBang != null) + ? Padding( + padding: const EdgeInsetsDirectional.all(12.0), + child: UrlIcon([ + activeBang!.getTemplateUrl(''), + ], iconSize: 24.0), + ) + : null, label: label ?? const Text('Search'), // hintText: 'Ask anything...', floatingLabelBehavior: FloatingLabelBehavior.always, - suffixIcon: - hasText - ? IconButton( - onPressed: () { - textEditingController.clear(); - }, - icon: const Icon(Icons.clear), - ) - : SpeechToTextButton( - onTextReceived: (data) { - textEditingController.text = data.toString(); - }, - ), + suffixIcon: hasText + ? IconButton( + onPressed: () { + textEditingController.clear(); + }, + icon: const Icon(Icons.clear), + ) + : SpeechToTextButton( + onTextReceived: (data) { + textEditingController.text = data.toString(); + }, + ), ), onTapOutside: (event) { safeFocusNode.unfocus(); diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart index 77b63d2d..7532a8ad 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/feed_search.dart @@ -64,112 +64,104 @@ class FeedSearch extends HookConsumerWidget { SliverSkeletonizer( enabled: articlesAsync.isLoading, child: articlesAsync.when( - data: - (articles) => SliverList.builder( - itemCount: articles.length, - itemBuilder: (context, index) { - final article = articles[index]; + data: (articles) => SliverList.builder( + itemCount: articles.length, + itemBuilder: (context, index) { + final article = articles[index]; - final titleHighlight = switch (article) { - final FeedArticleQueryResult result => - result.titleHighlight.whenNotEmpty, - _ => null, - }; + final titleHighlight = switch (article) { + final FeedArticleQueryResult result => + result.titleHighlight.whenNotEmpty, + _ => null, + }; - final searchSnippet = switch (article) { - final FeedArticleQueryResult result => - result.summarySnippet.whenNotEmpty ?? - result.contentSnippet.whenNotEmpty, - _ => null, - }; + final searchSnippet = switch (article) { + final FeedArticleQueryResult result => + result.summarySnippet.whenNotEmpty ?? + result.contentSnippet.whenNotEmpty, + _ => null, + }; - final articleDate = article.updated ?? article.created; + final articleDate = article.updated ?? article.created; - return ListTile( - leading: RepaintBoundary( - child: UrlIcon([ - article.icon ?? - article.links - ?.getRelation(FeedLinkRelation.alternate) - ?.uri ?? - article.siteLink ?? - article.feedId.base, - ], iconSize: 24.0), - ), - title: - (titleHighlight.isNotEmpty) - ? MarkdownBody( - data: titleHighlight!, - styleSheet: MarkdownStyleSheet( - p: Theme.of( + return ListTile( + leading: RepaintBoundary( + child: UrlIcon([ + article.icon ?? + article.links + ?.getRelation(FeedLinkRelation.alternate) + ?.uri ?? + article.siteLink ?? + article.feedId.base, + ], iconSize: 24.0), + ), + title: (titleHighlight.isNotEmpty) + ? MarkdownBody( + data: titleHighlight!, + styleSheet: MarkdownStyleSheet( + p: Theme.of(context).textTheme.titleMedium + ?.copyWith( + color: Theme.of( context, - ).textTheme.titleMedium?.copyWith( - color: - Theme.of(context).colorScheme.onSurface, - ), + ).colorScheme.onSurface, ), - ) - : Text( - article.displayTitle, - style: theme.textTheme.titleMedium, - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (searchSnippet.isNotEmpty) - MarkdownBody( - data: searchSnippet!, - styleSheet: MarkdownStyleSheet( - p: Theme.of( - context, - ).textTheme.bodyMedium?.copyWith( - color: - Theme.of( - context, - ).colorScheme.onSurfaceVariant, - ), - a: Theme.of( - context, - ).textTheme.bodyMedium?.copyWith( - color: - Theme.of( - context, - ).colorScheme.onSurfaceVariant, - decoration: TextDecoration.none, - ), - ), - ) - else - (article.summaryPlain != null) - ? Text( - article.summaryPlain!, - style: theme.textTheme.bodySmall, - maxLines: 3, - overflow: TextOverflow.ellipsis, - ) - : const SizedBox.shrink(), - if (articleDate != null) - Align( - alignment: Alignment.topRight, - child: Text( - ref - .read(formatProvider.notifier) - .fullDateTimeWithTimezone(articleDate), - style: theme.textTheme.bodySmall?.copyWith( - fontStyle: FontStyle.italic, - ), - ), + ), + ) + : Text( + article.displayTitle, + style: theme.textTheme.titleMedium, + ), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (searchSnippet.isNotEmpty) + MarkdownBody( + data: searchSnippet!, + styleSheet: MarkdownStyleSheet( + p: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of( + context, + ).colorScheme.onSurfaceVariant, ), - ], - ), - onTap: () { - FeedArticleRoute( - articleId: article.id, - ).pushReplacement(context); - }, - ); + a: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of( + context, + ).colorScheme.onSurfaceVariant, + decoration: TextDecoration.none, + ), + ), + ) + else + (article.summaryPlain != null) + ? Text( + article.summaryPlain!, + style: theme.textTheme.bodySmall, + maxLines: 3, + overflow: TextOverflow.ellipsis, + ) + : const SizedBox.shrink(), + if (articleDate != null) + Align( + alignment: Alignment.topRight, + child: Text( + ref + .read(formatProvider.notifier) + .fullDateTimeWithTimezone(articleDate), + style: theme.textTheme.bodySmall?.copyWith( + fontStyle: FontStyle.italic, + ), + ), + ), + ], + ), + onTap: () { + FeedArticleRoute( + articleId: article.id, + ).pushReplacement(context); }, - ), + ); + }, + ), error: (error, stackTrace) { return SliverToBoxAdapter( child: FailureWidget( @@ -178,13 +170,12 @@ class FeedSearch extends HookConsumerWidget { ), ); }, - loading: - () => SliverList.builder( - itemCount: articlesAsync.valueOrNull?.length ?? 3, - itemBuilder: (context, index) { - return const ListTile(title: Bone.text()); - }, - ), + loading: () => SliverList.builder( + itemCount: articlesAsync.valueOrNull?.length ?? 3, + itemBuilder: (context, index) { + return const ListTile(title: Bone.text()); + }, + ), ), ), ], diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/history_suggestions.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/history_suggestions.dart index bb9fe9cf..a13e74d1 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/history_suggestions.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/history_suggestions.dart @@ -122,13 +122,12 @@ class HistorySuggestions extends HookConsumerWidget { ), ); }, - loading: - () => SliverList.builder( - itemCount: historySuggestionsAsync.valueOrNull?.length ?? 3, - itemBuilder: (context, index) { - return const ListTile(title: Bone.text()); - }, - ), + loading: () => SliverList.builder( + itemCount: historySuggestionsAsync.valueOrNull?.length ?? 3, + itemBuilder: (context, index) { + return const ListTile(title: Bone.text()); + }, + ), ), ), ], diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart index fb9e94d6..97953086 100644 --- a/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart +++ b/app/lib/features/geckoview/features/search/presentation/widgets/search_modules/tab_search.dart @@ -33,19 +33,16 @@ class TabSearch extends HookConsumerWidget { ), ); - final tabs = - ref - .watch( - seamlessFilteredTabPreviewsProvider( - TabSearchPartition.search, - (selectedContainer.value != null) - ? ContainerFilterById( - containerId: selectedContainer.value!.id, - ) - : ContainerFilterDisabled(), - ), - ) - .value; + final tabs = ref + .watch( + seamlessFilteredTabPreviewsProvider( + TabSearchPartition.search, + (selectedContainer.value != null) + ? ContainerFilterById(containerId: selectedContainer.value!.id) + : ContainerFilterDisabled(), + ), + ) + .value; useListenableCallback(searchTextListenable, () async { await ref @@ -118,30 +115,26 @@ class TabSearch extends HookConsumerWidget { ), ), ), - subtitle: - (bodyHasMatch || urlHasMatch) - ? MarkdownBody( - data: - bodyHasMatch - ? result.content! - : result.highlightedUrl!, - styleSheet: MarkdownStyleSheet( - p: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: - Theme.of(context).colorScheme.onSurfaceVariant, - ), - a: Theme.of(context).textTheme.bodyMedium?.copyWith( - color: - Theme.of(context).colorScheme.onSurfaceVariant, - decoration: TextDecoration.none, - ), + subtitle: (bodyHasMatch || urlHasMatch) + ? MarkdownBody( + data: bodyHasMatch + ? result.content! + : result.highlightedUrl!, + styleSheet: MarkdownStyleSheet( + p: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + ), + a: Theme.of(context).textTheme.bodyMedium?.copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + decoration: TextDecoration.none, ), - ) - : Text( - result.url.toString(), - maxLines: 2, - overflow: TextOverflow.ellipsis, ), + ) + : Text( + result.url.toString(), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), onTap: () async { await ref .read(tabRepositoryProvider.notifier) diff --git a/app/lib/features/geckoview/features/tabs/data/database/daos/container.dart b/app/lib/features/geckoview/features/tabs/data/database/daos/container.dart index 2f647e45..725bbf12 100644 --- a/app/lib/features/geckoview/features/tabs/data/database/daos/container.dart +++ b/app/lib/features/geckoview/features/tabs/data/database/daos/container.dart @@ -42,10 +42,9 @@ class ContainerDao extends DatabaseAccessor } Selectable getDistinctColors() { - final query = - db.selectOnly(db.container, distinct: true) - ..addColumns([db.container.color]) - ..where(db.container.color.isNotNull()); + final query = db.selectOnly(db.container, distinct: true) + ..addColumns([db.container.color]) + ..where(db.container.color.isNotNull()); return query.map( (row) => row.readWithConverter(db.container.color)!, @@ -53,29 +52,26 @@ class ContainerDao extends DatabaseAccessor } Selectable getContainerTabIds(String? containerId) { - final query = - selectOnly(db.tab) - ..addColumns([db.tab.id]) - ..where( - (containerId != null) - ? db.tab.containerId.equals(containerId) - : db.tab.containerId.isNull(), - ) - ..orderBy([OrderingTerm.asc(db.tab.orderKey)]); + final query = selectOnly(db.tab) + ..addColumns([db.tab.id]) + ..where( + (containerId != null) + ? db.tab.containerId.equals(containerId) + : db.tab.containerId.isNull(), + ) + ..orderBy([OrderingTerm.asc(db.tab.orderKey)]); return query.map((row) => row.read(db.tab.id)!); } Selectable getContainerTabsData(String? containerId) { - final query = - db.tab.select() - ..where( - (t) => - (containerId != null) - ? t.containerId.equals(containerId) - : t.containerId.isNull(), - ) - ..orderBy([(t) => OrderingTerm.asc(t.orderKey)]); + final query = db.tab.select() + ..where( + (t) => (containerId != null) + ? t.containerId.equals(containerId) + : t.containerId.isNull(), + ) + ..orderBy([(t) => OrderingTerm.asc(t.orderKey)]); return query; } diff --git a/app/lib/features/geckoview/features/tabs/data/database/daos/tab.dart b/app/lib/features/geckoview/features/tabs/data/database/daos/tab.dart index f3cc2bbf..7f7850c5 100644 --- a/app/lib/features/geckoview/features/tabs/data/database/daos/tab.dart +++ b/app/lib/features/geckoview/features/tabs/data/database/daos/tab.dart @@ -21,19 +21,17 @@ class TabDao extends DatabaseAccessor with _$TabDaoMixin { db.tab.select()..where((t) => t.id.equals(id)); Selectable getAllTabIds() { - final query = - selectOnly(db.tab) - ..addColumns([db.tab.id]) - ..orderBy([OrderingTerm.asc(db.tab.orderKey)]); + final query = selectOnly(db.tab) + ..addColumns([db.tab.id]) + ..orderBy([OrderingTerm.asc(db.tab.orderKey)]); return query.map((row) => row.read(db.tab.id)!); } SingleOrNullSelectable getTabContainerId(String tabId) { - final query = - selectOnly(db.tab) - ..addColumns([db.tab.containerId]) - ..where(db.tab.id.equals(tabId)); + final query = selectOnly(db.tab) + ..addColumns([db.tab.containerId]) + ..where(db.tab.id.equals(tabId)); return query.map((row) => row.read(db.tab.containerId)); } @@ -154,14 +152,12 @@ class TabDao extends DatabaseAccessor with _$TabDaoMixin { batch.update( db.tab, TabCompanion( - url: - (previousState?.url != state.url) - ? Value(state.url) - : const Value.absent(), - title: - (previousState?.title != state.title) - ? Value(state.title) - : const Value.absent(), + url: (previousState?.url != state.url) + ? Value(state.url) + : const Value.absent(), + title: (previousState?.title != state.title) + ? Value(state.title) + : const Value.absent(), ), where: (t) => t.id.equals(state.id), ); @@ -174,8 +170,9 @@ class TabDao extends DatabaseAccessor with _$TabDaoMixin { return db.transaction(() async { await (db.tab.delete()..where((t) => t.id.isNotIn(retainTabIds))).go(); - var currentOrderKey = - await db.containerDao.generateLeadingOrderKey(null).getSingle(); + var currentOrderKey = await db.containerDao + .generateLeadingOrderKey(null) + .getSingle(); await db.tab.insertAll( retainTabIds.map((id) { diff --git a/app/lib/features/geckoview/features/tabs/data/database/database.g.dart b/app/lib/features/geckoview/features/tabs/data/database/database.g.dart index 25106ec7..276b4957 100644 --- a/app/lib/features/geckoview/features/tabs/data/database/database.g.dart +++ b/app/lib/features/geckoview/features/tabs/data/database/database.g.dart @@ -55,11 +55,10 @@ class Container extends Table with TableInfo { ContainerData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ContainerData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, name: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}name'], @@ -306,20 +305,18 @@ class Tab extends Table with TableInfo { TabData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TabData( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, containerId: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}container_id'], ), - orderKey: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}order_key'], - )!, + orderKey: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}order_key'], + )!, url: Tab.$converterurln.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.string, @@ -350,11 +347,10 @@ class Tab extends Table with TableInfo { DriftSqlType.string, data['${effectivePrefix}full_content_plain'], ), - timestamp: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}timestamp'], - )!, + timestamp: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}timestamp'], + )!, ); } @@ -499,56 +495,47 @@ class TabData extends DataClass implements Insertable { orderKey: orderKey ?? this.orderKey, url: url.present ? url.value : this.url, title: title.present ? title.value : this.title, - isProbablyReaderable: - isProbablyReaderable.present - ? isProbablyReaderable.value - : this.isProbablyReaderable, - extractedContentMarkdown: - extractedContentMarkdown.present - ? extractedContentMarkdown.value - : this.extractedContentMarkdown, - extractedContentPlain: - extractedContentPlain.present - ? extractedContentPlain.value - : this.extractedContentPlain, - fullContentMarkdown: - fullContentMarkdown.present - ? fullContentMarkdown.value - : this.fullContentMarkdown, - fullContentPlain: - fullContentPlain.present - ? fullContentPlain.value - : this.fullContentPlain, + isProbablyReaderable: isProbablyReaderable.present + ? isProbablyReaderable.value + : this.isProbablyReaderable, + extractedContentMarkdown: extractedContentMarkdown.present + ? extractedContentMarkdown.value + : this.extractedContentMarkdown, + extractedContentPlain: extractedContentPlain.present + ? extractedContentPlain.value + : this.extractedContentPlain, + fullContentMarkdown: fullContentMarkdown.present + ? fullContentMarkdown.value + : this.fullContentMarkdown, + fullContentPlain: fullContentPlain.present + ? fullContentPlain.value + : this.fullContentPlain, timestamp: timestamp ?? this.timestamp, ); TabData copyWithCompanion(TabCompanion data) { return TabData( id: data.id.present ? data.id.value : this.id, - containerId: - data.containerId.present ? data.containerId.value : this.containerId, + containerId: data.containerId.present + ? data.containerId.value + : this.containerId, orderKey: data.orderKey.present ? data.orderKey.value : this.orderKey, url: data.url.present ? data.url.value : this.url, title: data.title.present ? data.title.value : this.title, - isProbablyReaderable: - data.isProbablyReaderable.present - ? data.isProbablyReaderable.value - : this.isProbablyReaderable, - extractedContentMarkdown: - data.extractedContentMarkdown.present - ? data.extractedContentMarkdown.value - : this.extractedContentMarkdown, - extractedContentPlain: - data.extractedContentPlain.present - ? data.extractedContentPlain.value - : this.extractedContentPlain, - fullContentMarkdown: - data.fullContentMarkdown.present - ? data.fullContentMarkdown.value - : this.fullContentMarkdown, - fullContentPlain: - data.fullContentPlain.present - ? data.fullContentPlain.value - : this.fullContentPlain, + isProbablyReaderable: data.isProbablyReaderable.present + ? data.isProbablyReaderable.value + : this.isProbablyReaderable, + extractedContentMarkdown: data.extractedContentMarkdown.present + ? data.extractedContentMarkdown.value + : this.extractedContentMarkdown, + extractedContentPlain: data.extractedContentPlain.present + ? data.extractedContentPlain.value + : this.extractedContentPlain, + fullContentMarkdown: data.fullContentMarkdown.present + ? data.fullContentMarkdown.value + : this.fullContentMarkdown, + fullContentPlain: data.fullContentPlain.present + ? data.fullContentPlain.value + : this.fullContentPlain, timestamp: data.timestamp.present ? data.timestamp.value : this.timestamp, ); } @@ -838,26 +825,22 @@ class TabFts extends Table TabFt map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return TabFt( - title: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}title'], - )!, - url: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}url'], - )!, - extractedContentPlain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}extracted_content_plain'], - )!, - fullContentPlain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}full_content_plain'], - )!, + title: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}title'], + )!, + url: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}url'], + )!, + extractedContentPlain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}extracted_content_plain'], + )!, + fullContentPlain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}full_content_plain'], + )!, ); } @@ -936,14 +919,12 @@ class TabFt extends DataClass implements Insertable { return TabFt( title: data.title.present ? data.title.value : this.title, url: data.url.present ? data.url.value : this.url, - extractedContentPlain: - data.extractedContentPlain.present - ? data.extractedContentPlain.value - : this.extractedContentPlain, - fullContentPlain: - data.fullContentPlain.present - ? data.fullContentPlain.value - : this.fullContentPlain, + extractedContentPlain: data.extractedContentPlain.present + ? data.extractedContentPlain.value + : this.extractedContentPlain, + fullContentPlain: data.fullContentPlain.present + ? data.fullContentPlain.value + : this.fullContentPlain, ); } @@ -1431,12 +1412,12 @@ class $ContainerTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $ContainerFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $ContainerOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $ContainerAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $ContainerFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $ContainerOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $ContainerAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), @@ -1465,16 +1446,11 @@ class $ContainerTableManager metadata: metadata, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $ContainerReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map( + (e) => (e.readTable(table), $ContainerReferences(db, table, e)), + ) + .toList(), prefetchHooksCallback: ({tabRefs = false}) { return PrefetchHooks( db: db, @@ -1490,10 +1466,10 @@ class $ContainerTableManager >( currentTable: table, referencedTable: $ContainerReferences._tabRefsTable(db), - managerFromTypedResult: - (p0) => $ContainerReferences(db, table, p0).tabRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( + managerFromTypedResult: (p0) => + $ContainerReferences(db, table, p0).tabRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where( (e) => e.containerId == item.id, ), typedResults: items, @@ -1829,12 +1805,12 @@ class $TabTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $TabFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $TabOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $TabAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $TabFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $TabOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $TabAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), @@ -1891,51 +1867,45 @@ class $TabTableManager timestamp: timestamp, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $TabReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), $TabReferences(db, table, e))) + .toList(), prefetchHooksCallback: ({containerId = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [], - addJoins: < - T extends TableManagerState< - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic - > - >(state) { - if (containerId) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.containerId, - referencedTable: $TabReferences._containerIdTable( - db, - ), - referencedColumn: - $TabReferences._containerIdTable(db).id, - ) - as T; - } + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (containerId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.containerId, + referencedTable: $TabReferences + ._containerIdTable(db), + referencedColumn: $TabReferences + ._containerIdTable(db) + .id, + ) + as T; + } - return state; - }, + return state; + }, getPrefetchedDataCallback: (items) async { return []; }, @@ -2079,12 +2049,12 @@ class $TabFtsTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $TabFtsFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $TabFtsOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $TabFtsAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $TabFtsFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $TabFtsOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $TabFtsAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value title = const Value.absent(), @@ -2113,16 +2083,9 @@ class $TabFtsTableManager fullContentPlain: fullContentPlain, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); diff --git a/app/lib/features/geckoview/features/tabs/data/models/container_data.g.dart b/app/lib/features/geckoview/features/tabs/data/models/container_data.g.dart index 8cc9eea2..deffca1e 100644 --- a/app/lib/features/geckoview/features/tabs/data/models/container_data.g.dart +++ b/app/lib/features/geckoview/features/tabs/data/models/container_data.g.dart @@ -60,19 +60,17 @@ class _$ContainerAuthSettingsCWProxyImpl return ContainerAuthSettings( authenticationRequired: authenticationRequired == const $CopyWithPlaceholder() - ? _value.authenticationRequired - // ignore: cast_nullable_to_non_nullable - : authenticationRequired as bool, - lockOnAppBackground: - lockOnAppBackground == const $CopyWithPlaceholder() - ? _value.lockOnAppBackground - // ignore: cast_nullable_to_non_nullable - : lockOnAppBackground as bool, - lockTimeout: - lockTimeout == const $CopyWithPlaceholder() - ? _value.lockTimeout - // ignore: cast_nullable_to_non_nullable - : lockTimeout as Duration?, + ? _value.authenticationRequired + // ignore: cast_nullable_to_non_nullable + : authenticationRequired as bool, + lockOnAppBackground: lockOnAppBackground == const $CopyWithPlaceholder() + ? _value.lockOnAppBackground + // ignore: cast_nullable_to_non_nullable + : lockOnAppBackground as bool, + lockTimeout: lockTimeout == const $CopyWithPlaceholder() + ? _value.lockTimeout + // ignore: cast_nullable_to_non_nullable + : lockTimeout as Duration?, ); } } @@ -141,26 +139,22 @@ class _$ContainerMetadataCWProxyImpl implements _$ContainerMetadataCWProxy { Object? useProxy = const $CopyWithPlaceholder(), }) { return ContainerMetadata( - iconData: - iconData == const $CopyWithPlaceholder() - ? _value.iconData - // ignore: cast_nullable_to_non_nullable - : iconData as IconData?, - contextualIdentity: - contextualIdentity == const $CopyWithPlaceholder() - ? _value.contextualIdentity - // ignore: cast_nullable_to_non_nullable - : contextualIdentity as String?, - authSettings: - authSettings == const $CopyWithPlaceholder() - ? _value.authSettings - // ignore: cast_nullable_to_non_nullable - : authSettings as ContainerAuthSettings, - useProxy: - useProxy == const $CopyWithPlaceholder() - ? _value.useProxy - // ignore: cast_nullable_to_non_nullable - : useProxy as bool, + iconData: iconData == const $CopyWithPlaceholder() + ? _value.iconData + // ignore: cast_nullable_to_non_nullable + : iconData as IconData?, + contextualIdentity: contextualIdentity == const $CopyWithPlaceholder() + ? _value.contextualIdentity + // ignore: cast_nullable_to_non_nullable + : contextualIdentity as String?, + authSettings: authSettings == const $CopyWithPlaceholder() + ? _value.authSettings + // ignore: cast_nullable_to_non_nullable + : authSettings as ContainerAuthSettings, + useProxy: useProxy == const $CopyWithPlaceholder() + ? _value.useProxy + // ignore: cast_nullable_to_non_nullable + : useProxy as bool, ); } } @@ -228,26 +222,22 @@ class _$ContainerDataCWProxyImpl implements _$ContainerDataCWProxy { Object? metadata = const $CopyWithPlaceholder(), }) { return ContainerData( - id: - id == const $CopyWithPlaceholder() - ? _value.id - // ignore: cast_nullable_to_non_nullable - : id as String, - name: - name == const $CopyWithPlaceholder() - ? _value.name - // ignore: cast_nullable_to_non_nullable - : name as String?, - color: - color == const $CopyWithPlaceholder() - ? _value.color - // ignore: cast_nullable_to_non_nullable - : color as Color, - metadata: - metadata == const $CopyWithPlaceholder() - ? _value.metadata - // ignore: cast_nullable_to_non_nullable - : metadata as ContainerMetadata?, + id: id == const $CopyWithPlaceholder() + ? _value.id + // ignore: cast_nullable_to_non_nullable + : id as String, + name: name == const $CopyWithPlaceholder() + ? _value.name + // ignore: cast_nullable_to_non_nullable + : name as String?, + color: color == const $CopyWithPlaceholder() + ? _value.color + // ignore: cast_nullable_to_non_nullable + : color as Color, + metadata: metadata == const $CopyWithPlaceholder() + ? _value.metadata + // ignore: cast_nullable_to_non_nullable + : metadata as ContainerMetadata?, ); } } @@ -267,10 +257,9 @@ ContainerAuthSettings _$ContainerAuthSettingsFromJson( ) => ContainerAuthSettings( authenticationRequired: json['authenticationRequired'] as bool, lockOnAppBackground: json['lockOnAppBackground'] as bool, - lockTimeout: - json['lockTimeout'] == null - ? null - : Duration(microseconds: (json['lockTimeout'] as num).toInt()), + lockTimeout: json['lockTimeout'] == null + ? null + : Duration(microseconds: (json['lockTimeout'] as num).toInt()), ); Map _$ContainerAuthSettingsToJson( @@ -288,12 +277,11 @@ ContainerMetadata _$ContainerMetadataFromJson(Map json) => const IconDataJsonConverter().fromJson, ), contextualIdentity: json['contextualIdentity'] as String?, - authSettings: - json['authSettings'] == null - ? null - : ContainerAuthSettings.fromJson( - json['authSettings'] as Map, - ), + authSettings: json['authSettings'] == null + ? null + : ContainerAuthSettings.fromJson( + json['authSettings'] as Map, + ), useProxy: json['useProxy'] as bool? ?? false, ); diff --git a/app/lib/features/geckoview/features/tabs/data/providers.g.dart b/app/lib/features/geckoview/features/tabs/data/providers.g.dart index 04313759..332ce76f 100644 --- a/app/lib/features/geckoview/features/tabs/data/providers.g.dart +++ b/app/lib/features/geckoview/features/tabs/data/providers.g.dart @@ -13,8 +13,9 @@ String _$tabDatabaseHash() => r'422bd4789296dc271fabbd5906f2e2ab16bccaa3'; final tabDatabaseProvider = Provider.internal( tabDatabase, name: r'tabDatabaseProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$tabDatabaseHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabDatabaseHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/tabs/domain/providers.dart b/app/lib/features/geckoview/features/tabs/domain/providers.dart index 6cb07b3a..877f5ed5 100644 --- a/app/lib/features/geckoview/features/tabs/domain/providers.dart +++ b/app/lib/features/geckoview/features/tabs/domain/providers.dart @@ -26,12 +26,11 @@ AsyncValue> matchSortedContainersWithCount( } return value.whenData( - (cb) => - TokenizedFilter.sort( - items: cb, - toString: (item) => item.name, - query: searchText!, - ).filtered, + (cb) => TokenizedFilter.sort( + items: cb, + toString: (item) => item.name, + query: searchText!, + ).filtered, ); }), ); diff --git a/app/lib/features/geckoview/features/tabs/domain/providers.g.dart b/app/lib/features/geckoview/features/tabs/domain/providers.g.dart index fd84330e..96b34ddf 100644 --- a/app/lib/features/geckoview/features/tabs/domain/providers.g.dart +++ b/app/lib/features/geckoview/features/tabs/domain/providers.g.dart @@ -15,10 +15,9 @@ final containersWithCountProvider = AutoDisposeStreamProvider>.internal( containersWithCount, name: r'containersWithCountProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$containersWithCountHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$containersWithCountHash, dependencies: null, allTransitiveDependencies: null, ); @@ -101,10 +100,9 @@ class MatchSortedContainersWithCountProvider ), from: matchSortedContainersWithCountProvider, name: r'matchSortedContainersWithCountProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$matchSortedContainersWithCountHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$matchSortedContainersWithCountHash, dependencies: MatchSortedContainersWithCountFamily._dependencies, allTransitiveDependencies: MatchSortedContainersWithCountFamily._allTransitiveDependencies, @@ -229,10 +227,9 @@ class ContainerTabIdsProvider extends AutoDisposeStreamProvider> { (ref) => containerTabIds(ref as ContainerTabIdsRef, containerFilter), from: containerTabIdsProvider, name: r'containerTabIdsProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$containerTabIdsHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$containerTabIdsHash, dependencies: ContainerTabIdsFamily._dependencies, allTransitiveDependencies: ContainerTabIdsFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart index 4da93b08..3e4b575d 100644 --- a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart +++ b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.dart @@ -52,8 +52,8 @@ class SelectedContainer extends _$SelectedContainer { if (passAuth) { if (container.metadata.useProxy) { - final proxyPluginHealthy = - await GeckoContainerProxyService().healthcheck(); + final proxyPluginHealthy = await GeckoContainerProxyService() + .healthcheck(); if (proxyPluginHealthy) { state = id; diff --git a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart index 31bc0fd0..fa3c7c7a 100644 --- a/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart +++ b/app/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart @@ -15,10 +15,9 @@ final selectedContainerDataProvider = AutoDisposeStreamProvider.internal( selectedContainerData, name: r'selectedContainerDataProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedContainerDataHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedContainerDataHash, dependencies: null, allTransitiveDependencies: null, ); @@ -34,10 +33,9 @@ final selectedContainerProvider = NotifierProvider.internal( SelectedContainer.new, name: r'selectedContainerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$selectedContainerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$selectedContainerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart b/app/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart index 5cbcbc0e..8c2b982f 100644 --- a/app/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart +++ b/app/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart @@ -15,10 +15,9 @@ final containerRepositoryProvider = NotifierProvider.internal( ContainerRepository.new, name: r'containerRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$containerRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$containerRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/tabs/domain/repositories/tab.dart b/app/lib/features/geckoview/features/tabs/domain/repositories/tab.dart index c57ec469..9e099cef 100644 --- a/app/lib/features/geckoview/features/tabs/domain/repositories/tab.dart +++ b/app/lib/features/geckoview/features/tabs/domain/repositories/tab.dart @@ -21,12 +21,11 @@ class TabDataRepository extends _$TabDataRepository { } Future closeAllTabsByContainer(String? containerId) async { - final tabIds = - await ref - .read(tabDatabaseProvider) - .containerDao - .getContainerTabIds(containerId) - .get(); + final tabIds = await ref + .read(tabDatabaseProvider) + .containerDao + .getContainerTabIds(containerId) + .get(); if (tabIds.isNotEmpty) { await ref.read(tabRepositoryProvider.notifier).closeTabs(tabIds); @@ -34,18 +33,16 @@ class TabDataRepository extends _$TabDataRepository { } Future closeAllTabsByHost(String? containerId, String host) async { - final tabs = - await ref - .read(tabDatabaseProvider) - .containerDao - .getContainerTabsData(containerId) - .get(); + final tabs = await ref + .read(tabDatabaseProvider) + .containerDao + .getContainerTabsData(containerId) + .get(); - final filtered = - tabs - .where((tab) => tab.url?.host == host) - .map((tab) => tab.id) - .toList(); + final filtered = tabs + .where((tab) => tab.url?.host == host) + .map((tab) => tab.id) + .toList(); if (filtered.isNotEmpty) { await ref.read(tabRepositoryProvider.notifier).closeTabs(filtered); diff --git a/app/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart b/app/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart index ac626651..7de2c49b 100644 --- a/app/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart +++ b/app/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart @@ -14,10 +14,9 @@ final tabDataRepositoryProvider = NotifierProvider.internal( TabDataRepository.new, name: r'tabDataRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabDataRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabDataRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.dart b/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.dart index 4ab34f2e..1b5ffc65 100644 --- a/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.dart +++ b/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.dart @@ -19,18 +19,17 @@ class TabSearchRepository extends _$TabSearchRepository { }) async { if (input.isNotEmpty) { state = await AsyncValue.guard( - () => - ref - .read(tabDatabaseProvider) - .tabDao - .queryTabs( - matchPrefix: matchPrefix, - matchSuffix: matchSuffix, - ellipsis: ellipsis, - snippetLength: snippetLength, - searchString: input, - ) - .get(), + () => ref + .read(tabDatabaseProvider) + .tabDao + .queryTabs( + matchPrefix: matchPrefix, + matchSuffix: matchSuffix, + ellipsis: ellipsis, + snippetLength: snippetLength, + searchString: input, + ) + .get(), ); } else { state = const AsyncValue.data(null); diff --git a/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart b/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart index 6401e2d6..3a73c5e9 100644 --- a/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart +++ b/app/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart @@ -87,10 +87,9 @@ class TabSearchRepositoryProvider () => TabSearchRepository()..partition = partition, from: tabSearchRepositoryProvider, name: r'tabSearchRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$tabSearchRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$tabSearchRepositoryHash, dependencies: TabSearchRepositoryFamily._dependencies, allTransitiveDependencies: TabSearchRepositoryFamily._allTransitiveDependencies, diff --git a/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart b/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart index 61509930..a03cb797 100644 --- a/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart +++ b/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart @@ -149,9 +149,8 @@ class ContainerEditScreen extends HookConsumerWidget { onPressed: () async { final color = await showDialog( context: context, - builder: - (context) => - ColorPickerDialog(selectedColor.value), + builder: (context) => + ColorPickerDialog(selectedColor.value), ); if (color != null) { @@ -164,22 +163,20 @@ class ContainerEditScreen extends HookConsumerWidget { title: const Text('Cookie Isolation'), secondary: const Icon(MdiIcons.cookieLock), contentPadding: EdgeInsets.zero, - onChanged: - (_mode == _DialogMode.create) - ? (value) { - contextualIdentity.value = - value - ? initialContainer - .metadata - .contextualIdentity ?? - uuid.v4() - : null; + onChanged: (_mode == _DialogMode.create) + ? (value) { + contextualIdentity.value = value + ? initialContainer + .metadata + .contextualIdentity ?? + uuid.v4() + : null; - if (!value && useProxy.value) { - useProxy.value = false; - } + if (!value && useProxy.value) { + useProxy.value = false; } - : null, + } + : null, ), SwitchListTile.adaptive( value: useProxy.value, @@ -199,8 +196,8 @@ class ContainerEditScreen extends HookConsumerWidget { _DialogMode.edit => (contextualIdentity.value != null) ? (value) { - useProxy.value = value; - } + useProxy.value = value; + } : null, }, ), @@ -230,8 +227,9 @@ class ContainerEditScreen extends HookConsumerWidget { title: const Text('Timeout'), controlAffinity: ListTileControlAffinity.leading, onChanged: (value) { - final newValue = - value! ? _timeoutOptions[1].value : null; + final newValue = value! + ? _timeoutOptions[1].value + : null; authSettings.value = authSettings.value.copyWith .lockTimeout(newValue); diff --git a/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart b/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart index 35583dcf..ad5ed52b 100644 --- a/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart +++ b/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart @@ -28,127 +28,109 @@ class ContainerListScreen extends HookConsumerWidget { enabled: containersAsync.isLoading, child: containersAsync.when( skipLoadingOnReload: true, - data: - (containers) => FadingScroll( - fadingSize: 25, - builder: (context, controller) { - return ListView.builder( - controller: controller, - itemCount: containers.length, - itemBuilder: (context, index) { - final container = containers[index]; - return Slidable( - key: ValueKey(container.id), - startActionPane: ActionPane( - motion: const ScrollMotion(), - children: [ - if (container.id != selectedContainer) - SlidableAction( - onPressed: (context) async { - final result = await ref - .read( - selectedContainerProvider.notifier, - ) - .setContainerId(container.id); + data: (containers) => FadingScroll( + fadingSize: 25, + builder: (context, controller) { + return ListView.builder( + controller: controller, + itemCount: containers.length, + itemBuilder: (context, index) { + final container = containers[index]; + return Slidable( + key: ValueKey(container.id), + startActionPane: ActionPane( + motion: const ScrollMotion(), + children: [ + if (container.id != selectedContainer) + SlidableAction( + onPressed: (context) async { + final result = await ref + .read(selectedContainerProvider.notifier) + .setContainerId(container.id); - if (context.mounted && - result == - SetContainerResult - .successHasProxy) { - await ref - .read( - startProxyControllerProvider - .notifier, - ) - .maybeStartProxy(context); - } - }, - foregroundColor: - Theme.of( - context, - ).colorScheme.onPrimaryContainer, - backgroundColor: - Theme.of( - context, - ).colorScheme.primaryContainer, - icon: Icons.check, - label: 'Select', - ) - else - SlidableAction( - onPressed: (context) { - ref - .read( - selectedContainerProvider.notifier, - ) - .clearContainer(); - }, - foregroundColor: - Theme.of( - context, - ).colorScheme.onPrimaryContainer, - backgroundColor: - Theme.of( - context, - ).colorScheme.primaryContainer, - icon: Icons.close, - label: 'Unselect', - ), - ], - ), - endActionPane: ActionPane( - motion: const ScrollMotion(), - children: [ - SlidableAction( - onPressed: (context) async { + if (context.mounted && + result == + SetContainerResult.successHasProxy) { await ref .read( - containerRepositoryProvider.notifier, + startProxyControllerProvider.notifier, ) - .deleteContainer(container.id); - }, - backgroundColor: - Theme.of( - context, - ).colorScheme.errorContainer, - foregroundColor: - Theme.of( - context, - ).colorScheme.onErrorContainer, - icon: Icons.delete, - label: 'Delete', - ), - ], + .maybeStartProxy(context); + } + }, + foregroundColor: Theme.of( + context, + ).colorScheme.onPrimaryContainer, + backgroundColor: Theme.of( + context, + ).colorScheme.primaryContainer, + icon: Icons.check, + label: 'Select', + ) + else + SlidableAction( + onPressed: (context) { + ref + .read(selectedContainerProvider.notifier) + .clearContainer(); + }, + foregroundColor: Theme.of( + context, + ).colorScheme.onPrimaryContainer, + backgroundColor: Theme.of( + context, + ).colorScheme.primaryContainer, + icon: Icons.close, + label: 'Unselect', + ), + ], + ), + endActionPane: ActionPane( + motion: const ScrollMotion(), + children: [ + SlidableAction( + onPressed: (context) async { + await ref + .read(containerRepositoryProvider.notifier) + .deleteContainer(container.id); + }, + backgroundColor: Theme.of( + context, + ).colorScheme.errorContainer, + foregroundColor: Theme.of( + context, + ).colorScheme.onErrorContainer, + icon: Icons.delete, + label: 'Delete', ), - child: ContainerListTile( - container, - isSelected: container.id == selectedContainer, - ), - ); - }, + ], + ), + child: ContainerListTile( + container, + isSelected: container.id == selectedContainer, + ), ); }, - ), + ); + }, + ), error: (error, stackTrace) => SizedBox.shrink(), - loading: - () => ListView.builder( - itemCount: 3, - itemBuilder: - (context, index) => ContainerListTile( - ContainerData(id: 'null', color: Colors.transparent), - isSelected: false, - ), - ), + loading: () => ListView.builder( + itemCount: 3, + itemBuilder: (context, index) => ContainerListTile( + ContainerData(id: 'null', color: Colors.transparent), + isSelected: false, + ), + ), ), ); }, ), floatingActionButton: FloatingActionButton.extended( onPressed: () async { - final initialColor = - await ref - .read(containerRepositoryProvider.notifier) - .unusedRandomContainerColor(); + final initialColor = await ref + .read(containerRepositoryProvider.notifier) + .unusedRandomContainerColor(); if (context.mounted) { final result = await ContainerCreateRoute( diff --git a/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart b/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart index 37b3cb51..26ca2854 100644 --- a/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart +++ b/app/lib/features/geckoview/features/tabs/presentation/widgets/container_chips.dart @@ -68,17 +68,16 @@ class ContainerChips extends HookConsumerWidget { child: SelectableChips( deleteIcon: false, itemId: (container) => container.id, - itemAvatar: - (container) => Container( - width: 20.0, - height: 20.0, - decoration: BoxDecoration( - color: container.color, - shape: BoxShape.circle, - ), - ), - itemLabel: - (container) => Text(container.name ?? 'New Container'), + itemAvatar: (container) => Container( + width: 20.0, + height: 20.0, + decoration: BoxDecoration( + color: container.color, + shape: BoxShape.circle, + ), + ), + itemLabel: (container) => + Text(container.name ?? 'New Container'), itemBadgeCount: (container) => container.tabCount, itemWrap: (child, container) { return HookBuilder( @@ -150,17 +149,16 @@ class ContainerChips extends HookConsumerWidget { return OverlayPortal( controller: overlayController, - overlayChildBuilder: - (context) => Positioned( - top: position.dy, - left: position.dx, - child: IgnorePointer( - child: Transform.scale( - scale: 1.1, - child: child, - ), - ), + overlayChildBuilder: (context) => Positioned( + top: position.dy, + left: position.dx, + child: IgnorePointer( + child: Transform.scale( + scale: 1.1, + child: child, ), + ), + ), child: HookBuilder( builder: (context) { final dragTabId = useValueListenable( diff --git a/app/lib/features/geckoview/features/tabs/presentation/widgets/material_color_picker.dart b/app/lib/features/geckoview/features/tabs/presentation/widgets/material_color_picker.dart index 7c41654c..71b0d15d 100644 --- a/app/lib/features/geckoview/features/tabs/presentation/widgets/material_color_picker.dart +++ b/app/lib/features/geckoview/features/tabs/presentation/widgets/material_color_picker.dart @@ -54,43 +54,38 @@ class _MaterialPickerState extends State { clipBehavior: Clip.hardEdge, decoration: const BoxDecoration(), child: Container( - margin: - isPortrait - ? const EdgeInsets.only(right: 10) - : const EdgeInsets.only(bottom: 10), + margin: isPortrait + ? const EdgeInsets.only(right: 10) + : const EdgeInsets.only(bottom: 10), width: isPortrait ? 60 : null, height: isPortrait ? null : 60, decoration: BoxDecoration( color: Theme.of(context).cardColor, boxShadow: [ BoxShadow( - color: - (Theme.of(context).brightness == Brightness.light) - ? (Theme.of(context).brightness == Brightness.light) - ? Colors.grey[300]! - : Colors.black38 - : Colors.black38, + color: (Theme.of(context).brightness == Brightness.light) + ? (Theme.of(context).brightness == Brightness.light) + ? Colors.grey[300]! + : Colors.black38 + : Colors.black38, blurRadius: 10, ), ], - border: - isPortrait - ? Border( - right: BorderSide( - color: - (Theme.of(context).brightness == Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - ), - ) - : Border( - top: BorderSide( - color: - (Theme.of(context).brightness == Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - ), + border: isPortrait + ? Border( + right: BorderSide( + color: (Theme.of(context).brightness == Brightness.light) + ? Colors.grey[300]! + : Colors.black38, ), + ) + : Border( + top: BorderSide( + color: (Theme.of(context).brightness == Brightness.light) + ? Colors.grey[300]! + : Colors.black38, + ), + ), ), child: ScrollConfiguration( behavior: ScrollConfiguration.of( @@ -118,10 +113,9 @@ class _MaterialPickerState extends State { }, child: Container( color: const Color(0x00000000), - padding: - isPortrait - ? const EdgeInsets.fromLTRB(0, 7, 0, 7) - : const EdgeInsets.fromLTRB(7, 0, 7, 0), + padding: isPortrait + ? const EdgeInsets.fromLTRB(0, 7, 0, 7) + : const EdgeInsets.fromLTRB(7, 0, 7, 0), child: Align( child: AnimatedContainer( duration: const Duration(milliseconds: 300), @@ -130,38 +124,34 @@ class _MaterialPickerState extends State { decoration: BoxDecoration( color: colorType, shape: BoxShape.circle, - boxShadow: - _currentColorType == colors - ? [ - if (colorType == - Theme.of(context).cardColor) - BoxShadow( - color: - (Theme.of( - context, - ).brightness == - Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - blurRadius: 10, - ) - else - BoxShadow( - color: colorType, - blurRadius: 10, - ), - ] - : null, - border: - colorType == Theme.of(context).cardColor - ? Border.all( - color: - (Theme.of(context).brightness == - Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - ) - : null, + boxShadow: _currentColorType == colors + ? [ + if (colorType == + Theme.of(context).cardColor) + BoxShadow( + color: + (Theme.of(context).brightness == + Brightness.light) + ? Colors.grey[300]! + : Colors.black38, + blurRadius: 10, + ) + else + BoxShadow( + color: colorType, + blurRadius: 10, + ), + ] + : null, + border: colorType == Theme.of(context).cardColor + ? Border.all( + color: + (Theme.of(context).brightness == + Brightness.light) + ? Colors.grey[300]! + : Colors.black38, + ) + : null, ), ), ), @@ -208,66 +198,60 @@ class _MaterialPickerState extends State { }, child: Container( color: const Color(0x00000000), - margin: - isPortrait - ? const EdgeInsets.only(right: 10) - : const EdgeInsets.only(bottom: 10), - padding: - isPortrait - ? const EdgeInsets.fromLTRB(0, 7, 0, 7) - : const EdgeInsets.fromLTRB(7, 0, 7, 0), + margin: isPortrait + ? const EdgeInsets.only(right: 10) + : const EdgeInsets.only(bottom: 10), + padding: isPortrait + ? const EdgeInsets.fromLTRB(0, 7, 0, 7) + : const EdgeInsets.fromLTRB(7, 0, 7, 0), child: Align( child: AnimatedContainer( curve: Curves.fastOutSlowIn, duration: const Duration(milliseconds: 500), - width: - isPortrait - ? (_currentShading == color ? 250 : 230) - : (_currentShading == color ? 50 : 30), + width: isPortrait + ? (_currentShading == color ? 250 : 230) + : (_currentShading == color ? 50 : 30), height: isPortrait ? 50 : 220, decoration: BoxDecoration( color: color, - boxShadow: - _currentShading == color - ? [ - if ((color == Colors.white) || - (color == Colors.black)) - BoxShadow( - color: - (Theme.of(context).brightness == - Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - blurRadius: 10, - ) - else - BoxShadow(color: color, blurRadius: 10), - ] - : null, + boxShadow: _currentShading == color + ? [ + if ((color == Colors.white) || + (color == Colors.black)) + BoxShadow( + color: + (Theme.of(context).brightness == + Brightness.light) + ? Colors.grey[300]! + : Colors.black38, + blurRadius: 10, + ) + else + BoxShadow(color: color, blurRadius: 10), + ] + : null, border: (color == Colors.white) || - (color == Colors.black) - ? Border.all( - color: - (Theme.of(context).brightness == - Brightness.light) - ? Colors.grey[300]! - : Colors.black38, - ) - : null, + (color == Colors.black) + ? Border.all( + color: + (Theme.of(context).brightness == + Brightness.light) + ? Colors.grey[300]! + : Colors.black38, + ) + : null, ), - child: - widget.enableLabel - ? isPortrait - ? Row( + child: widget.enableLabel + ? isPortrait + ? Row( children: [ Text( ' ${colors.values.first}', style: TextStyle( - color: - useWhiteForeground(color) - ? Colors.white - : Colors.black, + color: useWhiteForeground(color) + ? Colors.white + : Colors.black, ), ), Expanded( @@ -278,8 +262,8 @@ class _MaterialPickerState extends State { style: TextStyle( color: useWhiteForeground(color) - ? Colors.white - : Colors.black, + ? Colors.white + : Colors.black, fontWeight: FontWeight.bold, ), ), @@ -287,12 +271,13 @@ class _MaterialPickerState extends State { ), ], ) - : AnimatedOpacity( + : AnimatedOpacity( duration: const Duration( milliseconds: 300, ), - opacity: - _currentShading == color ? 1 : 0, + opacity: _currentShading == color + ? 1 + : 0, child: Container( padding: const EdgeInsets.only( top: 16, @@ -301,10 +286,9 @@ class _MaterialPickerState extends State { child: Text( colors.values.first, style: TextStyle( - color: - useWhiteForeground(color) - ? Colors.white - : Colors.black, + color: useWhiteForeground(color) + ? Colors.white + : Colors.black, fontWeight: FontWeight.bold, fontSize: 14, ), @@ -312,7 +296,7 @@ class _MaterialPickerState extends State { ), ), ) - : const SizedBox(), + : const SizedBox(), ), ), ), diff --git a/app/lib/features/geckoview/features/tabs/utils/color_palette.dart b/app/lib/features/geckoview/features/tabs/utils/color_palette.dart index f04a4ddd..9acd5221 100644 --- a/app/lib/features/geckoview/features/tabs/utils/color_palette.dart +++ b/app/lib/features/geckoview/features/tabs/utils/color_palette.dart @@ -17,12 +17,11 @@ bool useWhiteForeground(Color backgroundColor, {double bias = 0.0}) { // return 1.05 / (color.computeLuminance() + 0.05) > 4.5; // New: - final v = - sqrt( - pow(backgroundColor.r, 2) * 0.299 + - pow(backgroundColor.g, 2) * 0.587 + - pow(backgroundColor.b, 2) * 0.114, - ).round(); + final v = sqrt( + pow(backgroundColor.r, 2) * 0.299 + + pow(backgroundColor.g, 2) * 0.587 + + pow(backgroundColor.b, 2) * 0.114, + ).round(); return v < (130 + bias); } diff --git a/app/lib/features/search/domain/autosuggest/kagi.g.dart b/app/lib/features/search/domain/autosuggest/kagi.g.dart index 04a9d846..4d3cfb10 100644 --- a/app/lib/features/search/domain/autosuggest/kagi.g.dart +++ b/app/lib/features/search/domain/autosuggest/kagi.g.dart @@ -15,10 +15,9 @@ final kagiAutosuggestServiceProvider = NotifierProvider.internal( KagiAutosuggestService.new, name: r'kagiAutosuggestServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$kagiAutosuggestServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$kagiAutosuggestServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/search/domain/fts_tokenizer.dart b/app/lib/features/search/domain/fts_tokenizer.dart index 2bd565df..74e379c8 100644 --- a/app/lib/features/search/domain/fts_tokenizer.dart +++ b/app/lib/features/search/domain/fts_tokenizer.dart @@ -37,29 +37,27 @@ sealed class FtsQueryBuilder { }) { final matches = _tokenizePattern.allMatches(input); - final barewords = - matches - .map((match) { - if (match.group(1) != null) { - return EnclosedBareword(match.group(1)!); - } else if (_barewordPattern.hasMatch(match.group(2)!)) { - return SimpleBareword(match.group(2)!); - } else { - return EnclosedBareword(match.group(2)!); - } - }) - .where((token) => token.word.isNotEmpty) - .whereNot(_isReservedBareword) - .toList(); + final barewords = matches + .map((match) { + if (match.group(1) != null) { + return EnclosedBareword(match.group(1)!); + } else if (_barewordPattern.hasMatch(match.group(2)!)) { + return SimpleBareword(match.group(2)!); + } else { + return EnclosedBareword(match.group(2)!); + } + }) + .where((token) => token.word.isNotEmpty) + .whereNot(_isReservedBareword) + .toList(); //Merge short tokens _mergeShortBarewords(barewords, minTokenLength); - _tokens = - barewords - .where((bareword) => bareword.word.length >= minTokenLength) - .take(tokenLimit) - .toList(); + _tokens = barewords + .where((bareword) => bareword.word.length >= minTokenLength) + .take(tokenLimit) + .toList(); } static void _mergeShortBarewords( diff --git a/app/lib/features/search/domain/unix_tokenizer.dart b/app/lib/features/search/domain/unix_tokenizer.dart index 9ac7037a..e745ece8 100644 --- a/app/lib/features/search/domain/unix_tokenizer.dart +++ b/app/lib/features/search/domain/unix_tokenizer.dart @@ -33,17 +33,16 @@ sealed class UnixTokenizer { }) { final matches = _tokenizePattern.allMatches(input); - final barewords = - matches - .map((match) { - if (match.group(1) != null) { - return EnclosedBareword(match.group(1)!); - } else { - return SimpleBareword(match.group(2)!); - } - }) - .where((token) => token.word.isNotEmpty) - .toList(); + final barewords = matches + .map((match) { + if (match.group(1) != null) { + return EnclosedBareword(match.group(1)!); + } else { + return SimpleBareword(match.group(2)!); + } + }) + .where((token) => token.word.isNotEmpty) + .toList(); //Merge short tokens _mergeShortBarewords(barewords, minTokenLength); diff --git a/app/lib/features/search/util/tokenized_filter.dart b/app/lib/features/search/util/tokenized_filter.dart index 063736ee..fc81839f 100644 --- a/app/lib/features/search/util/tokenized_filter.dart +++ b/app/lib/features/search/util/tokenized_filter.dart @@ -80,17 +80,16 @@ class TokenizedFilter { }) { final queryTokens = _tokenize(query); - final scoredItems = - items.map((item) { - final itemString = toString(item); - if (itemString == null || itemString.isEmpty) { - return (item, 0.0); - } + final scoredItems = items.map((item) { + final itemString = toString(item); + if (itemString == null || itemString.isEmpty) { + return (item, 0.0); + } - final itemTokens = _tokenize(itemString); - final score = _calculateScore(queryTokens, itemTokens); - return (item, score); - }).toList(); + final itemTokens = _tokenize(itemString); + final score = _calculateScore(queryTokens, itemTokens); + return (item, score); + }).toList(); // Sort by score in descending order scoredItems.sort((a, b) => b.$2.compareTo(a.$2)); @@ -108,16 +107,15 @@ class TokenizedFilter { }) { final queryTokens = _tokenize(query); - final filtered = - items.where((item) { - final itemString = toString(item); - if (itemString == null || itemString.isEmpty) { - return false; - } + final filtered = items.where((item) { + final itemString = toString(item); + if (itemString == null || itemString.isEmpty) { + return false; + } - final itemTokens = _tokenize(itemString); - return _matchTokens(queryTokens, itemTokens); - }).toList(); + final itemTokens = _tokenize(itemString); + return _matchTokens(queryTokens, itemTokens); + }).toList(); return TokenizedFilter._(items, filtered); } diff --git a/app/lib/features/settings/presentation/controllers/save_settings.g.dart b/app/lib/features/settings/presentation/controllers/save_settings.g.dart index 03c1a7a2..36418339 100644 --- a/app/lib/features/settings/presentation/controllers/save_settings.g.dart +++ b/app/lib/features/settings/presentation/controllers/save_settings.g.dart @@ -15,10 +15,9 @@ final saveGeneralSettingsControllerProvider = AsyncNotifierProvider.internal( SaveGeneralSettingsController.new, name: r'saveGeneralSettingsControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$saveGeneralSettingsControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$saveGeneralSettingsControllerHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ final saveEngineSettingsControllerProvider = AsyncNotifierProvider.internal( SaveEngineSettingsController.new, name: r'saveEngineSettingsControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$saveEngineSettingsControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$saveEngineSettingsControllerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/settings/presentation/screens/general_settings.dart b/app/lib/features/settings/presentation/screens/general_settings.dart index 3c55b687..7a709a31 100644 --- a/app/lib/features/settings/presentation/screens/general_settings.dart +++ b/app/lib/features/settings/presentation/screens/general_settings.dart @@ -118,19 +118,18 @@ class GeneralSettingsScreen extends HookConsumerWidget { value: generalSettings.enableReadability && generalSettings.enforceReadability, - onChanged: - generalSettings.enableReadability - ? (value) async { - await ref - .read( - saveGeneralSettingsControllerProvider.notifier, - ) - .save( - (currentSettings) => currentSettings.copyWith - .enforceReadability(value), - ); - } - : null, + onChanged: generalSettings.enableReadability + ? (value) async { + await ref + .read( + saveGeneralSettingsControllerProvider.notifier, + ) + .save( + (currentSettings) => currentSettings.copyWith + .enforceReadability(value), + ); + } + : null, ), Consumer( builder: (context, ref, child) { diff --git a/app/lib/features/settings/presentation/screens/web_engine_hardening.dart b/app/lib/features/settings/presentation/screens/web_engine_hardening.dart index 695e7816..63e49482 100644 --- a/app/lib/features/settings/presentation/screens/web_engine_hardening.dart +++ b/app/lib/features/settings/presentation/screens/web_engine_hardening.dart @@ -69,47 +69,44 @@ class WebEngineHardeningScreen extends HookConsumerWidget { ), Expanded( child: ListView( - children: - data.entries.map((group) { - return Row( - children: [ - Expanded( - child: ListTile( - title: Text(group.key), - subtitle: group.value.description.mapNotNull( - (description) => Text(description), - ), - leading: HardeningGroupIcon( - isActive: group.value.isActive, - isPartlyActive: group.value.isPartlyActive, - ), - trailing: const Icon(Icons.chevron_right), - onTap: () async { - await WebEngineHardeningGroupRoute( - group: group.key, - ).push(context); - }, - ), + children: data.entries.map((group) { + return Row( + children: [ + Expanded( + child: ListTile( + title: Text(group.key), + subtitle: group.value.description.mapNotNull( + (description) => Text(description), ), - ], - ); - }).toList(), + leading: HardeningGroupIcon( + isActive: group.value.isActive, + isPartlyActive: group.value.isPartlyActive, + ), + trailing: const Icon(Icons.chevron_right), + onTap: () async { + await WebEngineHardeningGroupRoute( + group: group.key, + ).push(context); + }, + ), + ), + ], + ); + }).toList(), ), ), ], ); }, - error: - (error, stackTrace) => FailureWidget( - title: 'Could not load preference settings', - exception: error, - onRetry: - () => ref.refresh( - unifiedPreferenceSettingsRepositoryProvider( - PreferencePartition.user, - ), - ), + error: (error, stackTrace) => FailureWidget( + title: 'Could not load preference settings', + exception: error, + onRetry: () => ref.refresh( + unifiedPreferenceSettingsRepositoryProvider( + PreferencePartition.user, ), + ), + ), loading: () => const SizedBox.shrink(), ), ); diff --git a/app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart b/app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart index 349049e1..28c8b398 100644 --- a/app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart +++ b/app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart @@ -70,84 +70,71 @@ class WebEngineHardeningGroupScreen extends HookConsumerWidget { ), Expanded( child: ListView( - children: - group.settings.entries.map((setting) { - return Row( - children: [ - if (!setting.value.shouldBeDefault || - !setting.value.isActive) - Expanded( - child: SwitchListTile( - value: setting.value.isActive, - title: Text( - setting.value.title ?? setting.key, - ), - subtitle: setting.value.description - .mapNotNull( - (description) => Text(description), - ), - secondary: HardeningGroupIcon( - isActive: setting.value.isActive, - ), - onChanged: (value) async { - final notifier = ref.read( - preferenceSettingsGroupRepositoryProvider( - PreferencePartition.user, - groupName, - ).notifier, - ); - - if (value) { - await notifier.apply( - filter: [setting.key], - ); - } else { - await notifier.reset( - filter: [setting.key], - ); - } - }, - ), - ) - else - Expanded( - child: ListTile( - title: Text( - setting.value.title ?? setting.key, - ), - subtitle: setting.value.description - .mapNotNull( - (description) => Text(description), - ), - leading: HardeningGroupIcon( - isActive: setting.value.isActive, - ), - trailing: const Padding( - padding: EdgeInsets.only(right: 18.0), - child: Icon(Icons.check), - ), - ), + children: group.settings.entries.map((setting) { + return Row( + children: [ + if (!setting.value.shouldBeDefault || + !setting.value.isActive) + Expanded( + child: SwitchListTile( + value: setting.value.isActive, + title: Text(setting.value.title ?? setting.key), + subtitle: setting.value.description.mapNotNull( + (description) => Text(description), ), - ], - ); - }).toList(), + secondary: HardeningGroupIcon( + isActive: setting.value.isActive, + ), + onChanged: (value) async { + final notifier = ref.read( + preferenceSettingsGroupRepositoryProvider( + PreferencePartition.user, + groupName, + ).notifier, + ); + + if (value) { + await notifier.apply(filter: [setting.key]); + } else { + await notifier.reset(filter: [setting.key]); + } + }, + ), + ) + else + Expanded( + child: ListTile( + title: Text(setting.value.title ?? setting.key), + subtitle: setting.value.description.mapNotNull( + (description) => Text(description), + ), + leading: HardeningGroupIcon( + isActive: setting.value.isActive, + ), + trailing: const Padding( + padding: EdgeInsets.only(right: 18.0), + child: Icon(Icons.check), + ), + ), + ), + ], + ); + }).toList(), ), ), ], ); }, - error: - (error, stackTrace) => FailureWidget( - title: 'Could not load preference settings', - exception: error, - onRetry: - () => ref.refresh( - preferenceSettingsGroupRepositoryProvider( - PreferencePartition.user, - groupName, - ), - ), + error: (error, stackTrace) => FailureWidget( + title: 'Could not load preference settings', + exception: error, + onRetry: () => ref.refresh( + preferenceSettingsGroupRepositoryProvider( + PreferencePartition.user, + groupName, ), + ), + ), loading: () => const SizedBox.shrink(), ), ); diff --git a/app/lib/features/settings/presentation/screens/web_engine_settings.dart b/app/lib/features/settings/presentation/screens/web_engine_settings.dart index a8de19ae..139f0aa1 100644 --- a/app/lib/features/settings/presentation/screens/web_engine_settings.dart +++ b/app/lib/features/settings/presentation/screens/web_engine_settings.dart @@ -46,12 +46,13 @@ class WebEngineSettingsScreen extends HookConsumerWidget { await ref .read(saveGeneralSettingsControllerProvider.notifier) .save( - (currentSettings) => - value - ? currentSettings.copyWith - .deleteBrowsingDataOnQuit({}) - : currentSettings.copyWith - .deleteBrowsingDataOnQuit(null), + (currentSettings) => value + ? currentSettings.copyWith.deleteBrowsingDataOnQuit( + {}, + ) + : currentSettings.copyWith.deleteBrowsingDataOnQuit( + null, + ), ); }, ), @@ -325,27 +326,26 @@ class WebEngineSettingsScreen extends HookConsumerWidget { if (context.mounted) { final restart = await showDialog( context: context, - builder: - (context) => AlertDialog( - title: const Text('User Agent Changed'), - content: const Text( - 'The app needs to restart for the new user agent to take effect', - ), - actions: [ - TextButton( - onPressed: () { - context.pop(false); - }, - child: const Text('Later'), - ), - TextButton( - onPressed: () { - context.pop(true); - }, - child: const Text('Restart Now'), - ), - ], + builder: (context) => AlertDialog( + title: const Text('User Agent Changed'), + content: const Text( + 'The app needs to restart for the new user agent to take effect', + ), + actions: [ + TextButton( + onPressed: () { + context.pop(false); + }, + child: const Text('Later'), ), + TextButton( + onPressed: () { + context.pop(true); + }, + child: const Text('Restart Now'), + ), + ], + ), ); if (restart == true) { diff --git a/app/lib/features/settings/presentation/widgets/custom_list_tile.dart b/app/lib/features/settings/presentation/widgets/custom_list_tile.dart index 38f46cca..e6d474cc 100644 --- a/app/lib/features/settings/presentation/widgets/custom_list_tile.dart +++ b/app/lib/features/settings/presentation/widgets/custom_list_tile.dart @@ -39,21 +39,19 @@ class CustomListTile extends StatelessWidget { children: [ Text( title, - style: - enabled - ? theme.textTheme.bodyLarge - : theme.textTheme.bodyLarge?.copyWith( - color: theme.disabledColor, - ), + style: enabled + ? theme.textTheme.bodyLarge + : theme.textTheme.bodyLarge?.copyWith( + color: theme.disabledColor, + ), ), Text( subtitle, - style: - enabled - ? subtitleTextTheme - : theme.textTheme.bodyMedium?.copyWith( - color: theme.disabledColor, - ), + style: enabled + ? subtitleTextTheme + : theme.textTheme.bodyMedium?.copyWith( + color: theme.disabledColor, + ), ), if (content != null) content!, ], diff --git a/app/lib/features/settings/presentation/widgets/default_search_selector.dart b/app/lib/features/settings/presentation/widgets/default_search_selector.dart index d801424d..ef03c3a7 100644 --- a/app/lib/features/settings/presentation/widgets/default_search_selector.dart +++ b/app/lib/features/settings/presentation/widgets/default_search_selector.dart @@ -34,9 +34,8 @@ class DefaultSearchSelector extends HookConsumerWidget { Expanded( child: SelectableChips( itemId: (bang) => bang.trigger, - itemAvatar: - (bang) => - UrlIcon([bang.getTemplateUrl('')], iconSize: 20), + itemAvatar: (bang) => + UrlIcon([bang.getTemplateUrl('')], iconSize: 20), itemLabel: (bang) => Text(bang.websiteName), availableItems: availableBangs, selectedItem: activeBang, diff --git a/app/lib/features/share_intent/domain/services/sharing_intent.g.dart b/app/lib/features/share_intent/domain/services/sharing_intent.g.dart index 3bc5351a..014c317f 100644 --- a/app/lib/features/share_intent/domain/services/sharing_intent.g.dart +++ b/app/lib/features/share_intent/domain/services/sharing_intent.g.dart @@ -15,10 +15,9 @@ final sharingIntentStreamProvider = Provider>>.internal( sharingIntentStream, name: r'sharingIntentStreamProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$sharingIntentStreamHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$sharingIntentStreamHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/tor/domain/services/tor_proxy.g.dart b/app/lib/features/tor/domain/services/tor_proxy.g.dart index 4d2c01a2..8b7a26f3 100644 --- a/app/lib/features/tor/domain/services/tor_proxy.g.dart +++ b/app/lib/features/tor/domain/services/tor_proxy.g.dart @@ -14,10 +14,9 @@ final torProxyServiceProvider = AsyncNotifierProvider.internal( TorProxyService.new, name: r'torProxyServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$torProxyServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$torProxyServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/tor/presentation/controllers/start_tor_proxy.dart b/app/lib/features/tor/presentation/controllers/start_tor_proxy.dart index 4d3d7374..d57119ca 100644 --- a/app/lib/features/tor/presentation/controllers/start_tor_proxy.dart +++ b/app/lib/features/tor/presentation/controllers/start_tor_proxy.dart @@ -12,8 +12,9 @@ class StartProxyController extends _$StartProxyController { // ignore: document_ignores is used for dialog // ignore: avoid_build_context_in_providers Future maybeStartProxy(BuildContext context) async { - final torProxyRunning = - await ref.read(torProxyServiceProvider.notifier).requestSync(); + final torProxyRunning = await ref + .read(torProxyServiceProvider.notifier) + .requestSync(); if (torProxyRunning == null) { if (context.mounted) { @@ -25,8 +26,9 @@ class StartProxyController extends _$StartProxyController { ); if (result == true) { - final connection = - ref.read(torProxyServiceProvider.notifier).connect(); + final connection = ref + .read(torProxyServiceProvider.notifier) + .connect(); ref .read(overlayControllerProvider.notifier) diff --git a/app/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart b/app/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart index aa4cb393..b19327e6 100644 --- a/app/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart +++ b/app/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart @@ -15,10 +15,9 @@ final startProxyControllerProvider = AutoDisposeNotifierProvider.internal( StartProxyController.new, name: r'startProxyControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$startProxyControllerHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$startProxyControllerHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/tor/presentation/screens/tor_proxy.dart b/app/lib/features/tor/presentation/screens/tor_proxy.dart index d3dba15a..120d14d5 100644 --- a/app/lib/features/tor/presentation/screens/tor_proxy.dart +++ b/app/lib/features/tor/presentation/screens/tor_proxy.dart @@ -62,20 +62,19 @@ class TorProxyScreen extends HookConsumerWidget { value: torProxyPort.valueOrNull != null, title: const Text('Tor Proxy'), secondary: const Icon(MdiIcons.power), - onChanged: - torProxyPort.isLoading - ? null - : (value) async { - if (value) { - await ref - .read(torProxyServiceProvider.notifier) - .connect(); - } else { - await ref - .read(torProxyServiceProvider.notifier) - .disconnect(); - } - }, + onChanged: torProxyPort.isLoading + ? null + : (value) async { + if (value) { + await ref + .read(torProxyServiceProvider.notifier) + .connect(); + } else { + await ref + .read(torProxyServiceProvider.notifier) + .disconnect(); + } + }, ), ), ], diff --git a/app/lib/features/user/data/database/daos/cache.dart b/app/lib/features/user/data/database/daos/cache.dart index d95f0e88..7c03f068 100644 --- a/app/lib/features/user/data/database/daos/cache.dart +++ b/app/lib/features/user/data/database/daos/cache.dart @@ -17,10 +17,9 @@ class CacheDao extends DatabaseAccessor with _$CacheDaoMixin { } SingleOrNullSelectable getCachedIcon(String origin) { - final query = - selectOnly(db.iconCache) - ..addColumns([db.iconCache.iconData]) - ..where(db.iconCache.origin.equals(origin)); + final query = selectOnly(db.iconCache) + ..addColumns([db.iconCache.iconData]) + ..where(db.iconCache.origin.equals(origin)); return query.map((row) => row.read(db.iconCache.iconData)); } diff --git a/app/lib/features/user/data/database/daos/setting.dart b/app/lib/features/user/data/database/daos/setting.dart index a1e7eb64..0e9ee9bd 100644 --- a/app/lib/features/user/data/database/daos/setting.dart +++ b/app/lib/features/user/data/database/daos/setting.dart @@ -30,9 +30,8 @@ class SettingDao extends DatabaseAccessor with _$SettingDaoMixin { Selectable> getAllSettingsOfPartitionKey( String? partitionKey, ) { - final query = - db.setting.select() - ..where((r) => r.partitionKey.equalsNullable(partitionKey)); + final query = db.setting.select() + ..where((r) => r.partitionKey.equalsNullable(partitionKey)); return query.map((row) => MapEntry(row.key, row.value)); } diff --git a/app/lib/features/user/data/database/database.g.dart b/app/lib/features/user/data/database/database.g.dart index 5a1506d2..7fa36ca1 100644 --- a/app/lib/features/user/data/database/database.g.dart +++ b/app/lib/features/user/data/database/database.g.dart @@ -45,11 +45,10 @@ class Setting extends Table with TableInfo { SettingData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return SettingData( - key: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}key'], - )!, + key: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}key'], + )!, partitionKey: attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}partition_key'], @@ -123,10 +122,9 @@ class SettingData extends DataClass implements Insertable { SettingData copyWithCompanion(SettingCompanion data) { return SettingData( key: data.key.present ? data.key.value : this.key, - partitionKey: - data.partitionKey.present - ? data.partitionKey.value - : this.partitionKey, + partitionKey: data.partitionKey.present + ? data.partitionKey.value + : this.partitionKey, value: data.value.present ? data.value.value : this.value, ); } @@ -269,21 +267,18 @@ class IconCache extends Table with TableInfo { IconCacheData map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return IconCacheData( - origin: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}origin'], - )!, - iconData: - attachedDatabase.typeMapping.read( - DriftSqlType.blob, - data['${effectivePrefix}icon_data'], - )!, - fetchDate: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}fetch_date'], - )!, + origin: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}origin'], + )!, + iconData: attachedDatabase.typeMapping.read( + DriftSqlType.blob, + data['${effectivePrefix}icon_data'], + )!, + fetchDate: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}fetch_date'], + )!, ); } @@ -577,12 +572,12 @@ class $SettingTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $SettingFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $SettingOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $SettingAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $SettingFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $SettingOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $SettingAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value key = const Value.absent(), @@ -607,16 +602,9 @@ class $SettingTableManager value: value, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); @@ -740,12 +728,12 @@ class $IconCacheTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $IconCacheFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $IconCacheOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $IconCacheAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $IconCacheFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $IconCacheOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $IconCacheAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value origin = const Value.absent(), @@ -770,16 +758,9 @@ class $IconCacheTableManager fetchDate: fetchDate, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); diff --git a/app/lib/features/user/data/models/engine_settings.g.dart b/app/lib/features/user/data/models/engine_settings.g.dart index 24ae1bce..62144558 100644 --- a/app/lib/features/user/data/models/engine_settings.g.dart +++ b/app/lib/features/user/data/models/engine_settings.g.dart @@ -147,64 +147,60 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy { Object? userAgent = 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?, + ? _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?, 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?, + ? _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?, cookieBannerHandlingMode: cookieBannerHandlingMode == const $CopyWithPlaceholder() - ? _value.cookieBannerHandlingMode - // ignore: cast_nullable_to_non_nullable - : cookieBannerHandlingMode as CookieBannerHandlingMode?, + ? _value.cookieBannerHandlingMode + // ignore: cast_nullable_to_non_nullable + : cookieBannerHandlingMode as CookieBannerHandlingMode?, cookieBannerHandlingModePrivateBrowsing: cookieBannerHandlingModePrivateBrowsing == - const $CopyWithPlaceholder() - ? _value.cookieBannerHandlingModePrivateBrowsing - // ignore: cast_nullable_to_non_nullable - : cookieBannerHandlingModePrivateBrowsing - as CookieBannerHandlingMode?, + const $CopyWithPlaceholder() + ? _value.cookieBannerHandlingModePrivateBrowsing + // ignore: cast_nullable_to_non_nullable + : cookieBannerHandlingModePrivateBrowsing + as CookieBannerHandlingMode?, cookieBannerHandlingGlobalRules: cookieBannerHandlingGlobalRules == const $CopyWithPlaceholder() - ? _value.cookieBannerHandlingGlobalRules - // ignore: cast_nullable_to_non_nullable - : cookieBannerHandlingGlobalRules as bool?, + ? _value.cookieBannerHandlingGlobalRules + // ignore: cast_nullable_to_non_nullable + : cookieBannerHandlingGlobalRules as bool?, cookieBannerHandlingGlobalRulesSubFrames: cookieBannerHandlingGlobalRulesSubFrames == - const $CopyWithPlaceholder() - ? _value.cookieBannerHandlingGlobalRulesSubFrames - // ignore: cast_nullable_to_non_nullable - : cookieBannerHandlingGlobalRulesSubFrames as bool?, + const $CopyWithPlaceholder() + ? _value.cookieBannerHandlingGlobalRulesSubFrames + // ignore: cast_nullable_to_non_nullable + : cookieBannerHandlingGlobalRulesSubFrames as bool?, webContentIsolationStrategy: webContentIsolationStrategy == const $CopyWithPlaceholder() - ? _value.webContentIsolationStrategy - // ignore: cast_nullable_to_non_nullable - : webContentIsolationStrategy as WebContentIsolationStrategy?, - userAgent: - userAgent == const $CopyWithPlaceholder() - ? _value.userAgent - // ignore: cast_nullable_to_non_nullable - : userAgent as String?, + ? _value.webContentIsolationStrategy + // ignore: cast_nullable_to_non_nullable + : webContentIsolationStrategy as WebContentIsolationStrategy?, + userAgent: userAgent == const $CopyWithPlaceholder() + ? _value.userAgent + // ignore: cast_nullable_to_non_nullable + : userAgent as String?, ); } } diff --git a/app/lib/features/user/data/models/general_settings.g.dart b/app/lib/features/user/data/models/general_settings.g.dart index c67a6f82..c4158b3e 100644 --- a/app/lib/features/user/data/models/general_settings.g.dart +++ b/app/lib/features/user/data/models/general_settings.g.dart @@ -75,31 +75,28 @@ class _$GeneralSettingsCWProxyImpl implements _$GeneralSettingsCWProxy { Object? defaultSearchProvider = 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, - enforceReadability: - enforceReadability == const $CopyWithPlaceholder() - ? _value.enforceReadability - // ignore: cast_nullable_to_non_nullable - : enforceReadability 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, + enforceReadability: enforceReadability == const $CopyWithPlaceholder() + ? _value.enforceReadability + // ignore: cast_nullable_to_non_nullable + : enforceReadability as bool, deleteBrowsingDataOnQuit: deleteBrowsingDataOnQuit == const $CopyWithPlaceholder() - ? _value.deleteBrowsingDataOnQuit - // ignore: cast_nullable_to_non_nullable - : deleteBrowsingDataOnQuit as Set?, + ? _value.deleteBrowsingDataOnQuit + // ignore: cast_nullable_to_non_nullable + : deleteBrowsingDataOnQuit as Set?, defaultSearchProvider: defaultSearchProvider == const $CopyWithPlaceholder() - ? _value.defaultSearchProvider - // ignore: cast_nullable_to_non_nullable - : defaultSearchProvider as String, + ? _value.defaultSearchProvider + // ignore: cast_nullable_to_non_nullable + : defaultSearchProvider as String, ); } } @@ -131,10 +128,9 @@ Map _$GeneralSettingsToJson(GeneralSettings instance) => 'themeMode': _$ThemeModeEnumMap[instance.themeMode]!, 'enableReadability': instance.enableReadability, 'enforceReadability': instance.enforceReadability, - 'deleteBrowsingDataOnQuit': - instance.deleteBrowsingDataOnQuit - ?.map((e) => _$DeleteBrowsingDataTypeEnumMap[e]!) - .toList(), + 'deleteBrowsingDataOnQuit': instance.deleteBrowsingDataOnQuit + ?.map((e) => _$DeleteBrowsingDataTypeEnumMap[e]!) + .toList(), 'defaultSearchProvider': instance.defaultSearchProvider, }; diff --git a/app/lib/features/user/data/providers.g.dart b/app/lib/features/user/data/providers.g.dart index 38535248..592fd910 100644 --- a/app/lib/features/user/data/providers.g.dart +++ b/app/lib/features/user/data/providers.g.dart @@ -13,8 +13,9 @@ String _$userDatabaseHash() => r'b925780435806f0241d7ddb635e301e9fc8baf6e'; final userDatabaseProvider = Provider.internal( userDatabase, name: r'userDatabaseProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$userDatabaseHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$userDatabaseHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/user/domain/providers.g.dart b/app/lib/features/user/domain/providers.g.dart index 9ba28c12..22ab44a7 100644 --- a/app/lib/features/user/domain/providers.g.dart +++ b/app/lib/features/user/domain/providers.g.dart @@ -13,10 +13,9 @@ String _$storedAuthDataHash() => r'5f7e3ef6233a2036f7ce3728131901a46b1e548e'; final _storedAuthDataProvider = AutoDisposeFutureProvider.internal( _storedAuthData, name: r'_storedAuthDataProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$storedAuthDataHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$storedAuthDataHash, dependencies: null, allTransitiveDependencies: null, ); @@ -33,10 +32,9 @@ final iconCacheSizeMegabytesProvider = AutoDisposeStreamProvider.internal( iconCacheSizeMegabytes, name: r'iconCacheSizeMegabytesProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$iconCacheSizeMegabytesHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$iconCacheSizeMegabytesHash, dependencies: null, allTransitiveDependencies: null, ); @@ -52,10 +50,9 @@ String _$incognitoModeEnabledHash() => final incognitoModeEnabledProvider = AutoDisposeProvider.internal( incognitoModeEnabled, name: r'incognitoModeEnabledProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$incognitoModeEnabledHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$incognitoModeEnabledHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/user/domain/repositories/cache.g.dart b/app/lib/features/user/domain/repositories/cache.g.dart index c8ea66e1..f793320b 100644 --- a/app/lib/features/user/domain/repositories/cache.g.dart +++ b/app/lib/features/user/domain/repositories/cache.g.dart @@ -14,10 +14,9 @@ final cacheRepositoryProvider = NotifierProvider.internal( CacheRepository.new, name: r'cacheRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$cacheRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$cacheRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/user/domain/repositories/engine_settings.g.dart b/app/lib/features/user/domain/repositories/engine_settings.g.dart index ff71782f..492bb0f7 100644 --- a/app/lib/features/user/domain/repositories/engine_settings.g.dart +++ b/app/lib/features/user/domain/repositories/engine_settings.g.dart @@ -15,10 +15,9 @@ final engineSettingsRepositoryProvider = NotifierProvider.internal( EngineSettingsRepository.new, name: r'engineSettingsRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$engineSettingsRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$engineSettingsRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/user/domain/repositories/general_settings.g.dart b/app/lib/features/user/domain/repositories/general_settings.g.dart index 5408ea51..81a77e4f 100644 --- a/app/lib/features/user/domain/repositories/general_settings.g.dart +++ b/app/lib/features/user/domain/repositories/general_settings.g.dart @@ -15,10 +15,9 @@ final generalSettingsRepositoryProvider = NotifierProvider.internal( GeneralSettingsRepository.new, name: r'generalSettingsRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$generalSettingsRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$generalSettingsRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/user/domain/services/local_authentication.g.dart b/app/lib/features/user/domain/services/local_authentication.g.dart index b8e35d1f..736584ba 100644 --- a/app/lib/features/user/domain/services/local_authentication.g.dart +++ b/app/lib/features/user/domain/services/local_authentication.g.dart @@ -15,10 +15,9 @@ final localAuthenticationServiceProvider = AsyncNotifierProvider.internal( LocalAuthenticationService.new, name: r'localAuthenticationServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$localAuthenticationServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$localAuthenticationServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/data/database/daos/article.dart b/app/lib/features/web_feed/data/database/daos/article.dart index 724b96e8..d6824a95 100644 --- a/app/lib/features/web_feed/data/database/daos/article.dart +++ b/app/lib/features/web_feed/data/database/daos/article.dart @@ -44,9 +44,8 @@ class ArticleDao extends DatabaseAccessor with _$ArticleDaoMixin { return db.transaction(() async { await Future.wait( articles.map((newArticle) { - final statement = - db.article.update() - ..where((article) => article.id.equals(newArticle.id)); + final statement = db.article.update() + ..where((article) => article.id.equals(newArticle.id)); return statement.write( ArticleCompanion( @@ -86,12 +85,11 @@ class ArticleDao extends DatabaseAccessor with _$ArticleDaoMixin { updated: Value(article.updated), ); }, - where: - (old) => - old.updated.isNotNull() & - old.updated.isSmallerThanValue( - article.updated ?? DateTime(0), - ), + where: (old) => + old.updated.isNotNull() & + old.updated.isSmallerThanValue( + article.updated ?? DateTime(0), + ), ), ), ) @@ -101,8 +99,8 @@ class ArticleDao extends DatabaseAccessor with _$ArticleDaoMixin { } Future updateArticleRead(String articleId, DateTime? read) { - final statement = - db.article.update()..where((article) => article.id.equals(articleId)); + final statement = db.article.update() + ..where((article) => article.id.equals(articleId)); return statement.write(ArticleCompanion(lastRead: Value(read))); } @@ -110,15 +108,14 @@ class ArticleDao extends DatabaseAccessor with _$ArticleDaoMixin { Selectable<(String, int)> getUnreadArticleCount() { final count = countAll(); - final countByFeed = - db.article.selectOnly() - ..addColumns([db.article.feedId, count]) - ..where( - db.article.lastRead.isNull() | - (db.article.updated.isNotNull() & - db.article.lastRead.isSmallerThan(db.article.lastRead)), - ) - ..groupBy([db.article.feedId]); + final countByFeed = db.article.selectOnly() + ..addColumns([db.article.feedId, count]) + ..where( + db.article.lastRead.isNull() | + (db.article.updated.isNotNull() & + db.article.lastRead.isSmallerThan(db.article.lastRead)), + ) + ..groupBy([db.article.feedId]); return countByFeed.map( (result) => (result.read(db.article.feedId)!, result.read(count)!), diff --git a/app/lib/features/web_feed/data/database/daos/feed.dart b/app/lib/features/web_feed/data/database/daos/feed.dart index 1b0db4ff..58f1e3b9 100644 --- a/app/lib/features/web_feed/data/database/daos/feed.dart +++ b/app/lib/features/web_feed/data/database/daos/feed.dart @@ -16,8 +16,8 @@ class FeedDao extends DatabaseAccessor with _$FeedDaoMixin { } Future updateFeedFetched(Uri feedId, DateTime fetched) { - final statement = - db.feed.update()..where((feed) => feed.url.equalsValue(feedId)); + final statement = db.feed.update() + ..where((feed) => feed.url.equalsValue(feedId)); return statement.write(FeedCompanion(lastFetched: Value(fetched))); } diff --git a/app/lib/features/web_feed/data/database/database.g.dart b/app/lib/features/web_feed/data/database/database.g.dart index c5ebda29..8f807347 100644 --- a/app/lib/features/web_feed/data/database/database.g.dart +++ b/app/lib/features/web_feed/data/database/database.g.dart @@ -273,14 +273,16 @@ class FeedData extends DataClass implements Insertable { return FeedData( url: data.url.present ? data.url.value : this.url, title: data.title.present ? data.title.value : this.title, - description: - data.description.present ? data.description.value : this.description, + description: data.description.present + ? data.description.value + : this.description, icon: data.icon.present ? data.icon.value : this.icon, siteLink: data.siteLink.present ? data.siteLink.value : this.siteLink, authors: data.authors.present ? data.authors.value : this.authors, tags: data.tags.present ? data.tags.value : this.tags, - lastFetched: - data.lastFetched.present ? data.lastFetched.value : this.lastFetched, + lastFetched: data.lastFetched.present + ? data.lastFetched.value + : this.lastFetched, ); } @@ -625,22 +627,20 @@ class Article extends Table with TableInfo { FeedArticle map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return FeedArticle( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, feedId: Article.$converterfeedId.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}feed_id'], )!, ), - fetched: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}fetched'], - )!, + fetched: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}fetched'], + )!, created: attachedDatabase.typeMapping.read( DriftSqlType.dateTime, data['${effectivePrefix}created'], @@ -992,22 +992,20 @@ class ArticleView extends ViewInfo FeedArticle map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return FeedArticle( - id: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, feedId: Article.$converterfeedId.fromSql( attachedDatabase.typeMapping.read( DriftSqlType.string, data['${effectivePrefix}feed_id'], )!, ), - fetched: - attachedDatabase.typeMapping.read( - DriftSqlType.dateTime, - data['${effectivePrefix}fetched'], - )!, + fetched: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}fetched'], + )!, created: attachedDatabase.typeMapping.read( DriftSqlType.dateTime, data['${effectivePrefix}created'], @@ -1251,21 +1249,18 @@ class ArticleFts extends Table ArticleFt map(Map data, {String? tablePrefix}) { final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; return ArticleFt( - title: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}title'], - )!, - summaryPlain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}summaryPlain'], - )!, - contentPlain: - attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}contentPlain'], - )!, + title: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}title'], + )!, + summaryPlain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}summaryPlain'], + )!, + contentPlain: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}contentPlain'], + )!, ); } @@ -1332,14 +1327,12 @@ class ArticleFt extends DataClass implements Insertable { ArticleFt copyWithCompanion(ArticleFtsCompanion data) { return ArticleFt( title: data.title.present ? data.title.value : this.title, - summaryPlain: - data.summaryPlain.present - ? data.summaryPlain.value - : this.summaryPlain, - contentPlain: - data.contentPlain.present - ? data.contentPlain.value - : this.contentPlain, + summaryPlain: data.summaryPlain.present + ? data.summaryPlain.value + : this.summaryPlain, + contentPlain: data.contentPlain.present + ? data.contentPlain.value + : this.contentPlain, ); } @@ -1886,12 +1879,12 @@ class $FeedTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $FeedFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $FeedOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $FeedAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $FeedFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $FeedOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $FeedAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value url = const Value.absent(), @@ -1936,16 +1929,9 @@ class $FeedTableManager lastFetched: lastFetched, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $FeedReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), $FeedReferences(db, table, e))) + .toList(), prefetchHooksCallback: ({articleRefs = false}) { return PrefetchHooks( db: db, @@ -1957,12 +1943,10 @@ class $FeedTableManager await $_getPrefetchedData( currentTable: table, referencedTable: $FeedReferences._articleRefsTable(db), - managerFromTypedResult: - (p0) => $FeedReferences(db, table, p0).articleRefs, - referencedItemsForCurrentItem: - (item, referencedItems) => referencedItems.where( - (e) => e.feedId == item.url, - ), + managerFromTypedResult: (p0) => + $FeedReferences(db, table, p0).articleRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.feedId == item.url), typedResults: items, ), ]; @@ -2380,12 +2364,12 @@ class $ArticleTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $ArticleFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $ArticleOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $ArticleAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $ArticleFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $ArticleOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $ArticleAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value id = const Value.absent(), @@ -2462,51 +2446,47 @@ class $ArticleTableManager contentPlain: contentPlain, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - $ArticleReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map( + (e) => (e.readTable(table), $ArticleReferences(db, table, e)), + ) + .toList(), prefetchHooksCallback: ({feedId = false}) { return PrefetchHooks( db: db, explicitlyWatchedTables: [], - addJoins: < - T extends TableManagerState< - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic - > - >(state) { - if (feedId) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.feedId, - referencedTable: $ArticleReferences._feedIdTable( - db, - ), - referencedColumn: - $ArticleReferences._feedIdTable(db).url, - ) - as T; - } + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (feedId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.feedId, + referencedTable: $ArticleReferences + ._feedIdTable(db), + referencedColumn: $ArticleReferences + ._feedIdTable(db) + .url, + ) + as T; + } - return state; - }, + return state; + }, getPrefetchedDataCallback: (items) async { return []; }, @@ -2636,12 +2616,12 @@ class $ArticleFtsTableManager TableManagerState( db: db, table: table, - createFilteringComposer: - () => $ArticleFtsFilterComposer($db: db, $table: table), - createOrderingComposer: - () => $ArticleFtsOrderingComposer($db: db, $table: table), - createComputedFieldComposer: - () => $ArticleFtsAnnotationComposer($db: db, $table: table), + createFilteringComposer: () => + $ArticleFtsFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $ArticleFtsOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $ArticleFtsAnnotationComposer($db: db, $table: table), updateCompanionCallback: ({ Value title = const Value.absent(), @@ -2666,16 +2646,9 @@ class $ArticleFtsTableManager contentPlain: contentPlain, rowid: rowid, ), - withReferenceMapper: - (p0) => - p0 - .map( - (e) => ( - e.readTable(table), - BaseReferences(db, table, e), - ), - ) - .toList(), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), prefetchHooksCallback: null, ), ); diff --git a/app/lib/features/web_feed/data/models/feed_article.g.dart b/app/lib/features/web_feed/data/models/feed_article.g.dart index 57508fd2..305330b2 100644 --- a/app/lib/features/web_feed/data/models/feed_article.g.dart +++ b/app/lib/features/web_feed/data/models/feed_article.g.dart @@ -165,96 +165,78 @@ class _$FeedArticleCWProxyImpl implements _$FeedArticleCWProxy { Object? siteLink = const $CopyWithPlaceholder(), }) { return FeedArticle( - id: - id == const $CopyWithPlaceholder() - ? _value.id - // ignore: cast_nullable_to_non_nullable - : id as String, - feedId: - feedId == const $CopyWithPlaceholder() - ? _value.feedId - // ignore: cast_nullable_to_non_nullable - : feedId as Uri, - fetched: - fetched == const $CopyWithPlaceholder() - ? _value.fetched - // ignore: cast_nullable_to_non_nullable - : fetched as DateTime, - created: - created == const $CopyWithPlaceholder() - ? _value.created - // ignore: cast_nullable_to_non_nullable - : created as DateTime?, - updated: - updated == const $CopyWithPlaceholder() - ? _value.updated - // ignore: cast_nullable_to_non_nullable - : updated as DateTime?, - lastRead: - lastRead == const $CopyWithPlaceholder() - ? _value.lastRead - // ignore: cast_nullable_to_non_nullable - : lastRead as DateTime?, - title: - title == const $CopyWithPlaceholder() - ? _value.title - // ignore: cast_nullable_to_non_nullable - : title as String?, - authors: - authors == const $CopyWithPlaceholder() - ? _value.authors - // ignore: cast_nullable_to_non_nullable - : authors as List?, - tags: - tags == const $CopyWithPlaceholder() - ? _value.tags - // ignore: cast_nullable_to_non_nullable - : tags as List?, - links: - links == const $CopyWithPlaceholder() - ? _value.links - // ignore: cast_nullable_to_non_nullable - : links as List?, - summaryHtml: - summaryHtml == const $CopyWithPlaceholder() - ? _value.summaryHtml - // ignore: cast_nullable_to_non_nullable - : summaryHtml as String?, - summaryMarkdown: - summaryMarkdown == const $CopyWithPlaceholder() - ? _value.summaryMarkdown - // ignore: cast_nullable_to_non_nullable - : summaryMarkdown as String?, - summaryPlain: - summaryPlain == const $CopyWithPlaceholder() - ? _value.summaryPlain - // ignore: cast_nullable_to_non_nullable - : summaryPlain as String?, - contentHtml: - contentHtml == const $CopyWithPlaceholder() - ? _value.contentHtml - // ignore: cast_nullable_to_non_nullable - : contentHtml as String?, - contentMarkdown: - contentMarkdown == const $CopyWithPlaceholder() - ? _value.contentMarkdown - // ignore: cast_nullable_to_non_nullable - : contentMarkdown as String?, - contentPlain: - contentPlain == const $CopyWithPlaceholder() - ? _value.contentPlain - // ignore: cast_nullable_to_non_nullable - : contentPlain as String?, - icon: - icon == const $CopyWithPlaceholder() - ? _value.icon - // ignore: cast_nullable_to_non_nullable - : icon as Uri?, - siteLink: - siteLink == const $CopyWithPlaceholder() - ? _value.siteLink - // ignore: cast_nullable_to_non_nullable - : siteLink as Uri?, + id: id == const $CopyWithPlaceholder() + ? _value.id + // ignore: cast_nullable_to_non_nullable + : id as String, + feedId: feedId == const $CopyWithPlaceholder() + ? _value.feedId + // ignore: cast_nullable_to_non_nullable + : feedId as Uri, + fetched: fetched == const $CopyWithPlaceholder() + ? _value.fetched + // ignore: cast_nullable_to_non_nullable + : fetched as DateTime, + created: created == const $CopyWithPlaceholder() + ? _value.created + // ignore: cast_nullable_to_non_nullable + : created as DateTime?, + updated: updated == const $CopyWithPlaceholder() + ? _value.updated + // ignore: cast_nullable_to_non_nullable + : updated as DateTime?, + lastRead: lastRead == const $CopyWithPlaceholder() + ? _value.lastRead + // ignore: cast_nullable_to_non_nullable + : lastRead as DateTime?, + title: title == const $CopyWithPlaceholder() + ? _value.title + // ignore: cast_nullable_to_non_nullable + : title as String?, + authors: authors == const $CopyWithPlaceholder() + ? _value.authors + // ignore: cast_nullable_to_non_nullable + : authors as List?, + tags: tags == const $CopyWithPlaceholder() + ? _value.tags + // ignore: cast_nullable_to_non_nullable + : tags as List?, + links: links == const $CopyWithPlaceholder() + ? _value.links + // ignore: cast_nullable_to_non_nullable + : links as List?, + summaryHtml: summaryHtml == const $CopyWithPlaceholder() + ? _value.summaryHtml + // ignore: cast_nullable_to_non_nullable + : summaryHtml as String?, + summaryMarkdown: summaryMarkdown == const $CopyWithPlaceholder() + ? _value.summaryMarkdown + // ignore: cast_nullable_to_non_nullable + : summaryMarkdown as String?, + summaryPlain: summaryPlain == const $CopyWithPlaceholder() + ? _value.summaryPlain + // ignore: cast_nullable_to_non_nullable + : summaryPlain as String?, + contentHtml: contentHtml == const $CopyWithPlaceholder() + ? _value.contentHtml + // ignore: cast_nullable_to_non_nullable + : contentHtml as String?, + contentMarkdown: contentMarkdown == const $CopyWithPlaceholder() + ? _value.contentMarkdown + // ignore: cast_nullable_to_non_nullable + : contentMarkdown as String?, + contentPlain: contentPlain == const $CopyWithPlaceholder() + ? _value.contentPlain + // ignore: cast_nullable_to_non_nullable + : contentPlain as String?, + icon: icon == const $CopyWithPlaceholder() + ? _value.icon + // ignore: cast_nullable_to_non_nullable + : icon as Uri?, + siteLink: siteLink == const $CopyWithPlaceholder() + ? _value.siteLink + // ignore: cast_nullable_to_non_nullable + : siteLink as Uri?, ); } } @@ -273,31 +255,25 @@ FeedArticle _$FeedArticleFromJson(Map json) => FeedArticle( id: json['id'] as String, feedId: Uri.parse(json['feedId'] as String), fetched: DateTime.parse(json['fetched'] as String), - created: - json['created'] == null - ? null - : DateTime.parse(json['created'] as String), - updated: - json['updated'] == null - ? null - : DateTime.parse(json['updated'] as String), - lastRead: - json['lastRead'] == null - ? null - : DateTime.parse(json['lastRead'] as String), + created: json['created'] == null + ? null + : DateTime.parse(json['created'] as String), + updated: json['updated'] == null + ? null + : DateTime.parse(json['updated'] as String), + lastRead: json['lastRead'] == null + ? null + : DateTime.parse(json['lastRead'] as String), title: json['title'] as String?, - authors: - (json['authors'] as List?) - ?.map((e) => FeedAuthor.fromJson(e as Map)) - .toList(), - tags: - (json['tags'] as List?) - ?.map((e) => FeedCategory.fromJson(e as Map)) - .toList(), - links: - (json['links'] as List?) - ?.map((e) => FeedLink.fromJson(e as Map)) - .toList(), + authors: (json['authors'] as List?) + ?.map((e) => FeedAuthor.fromJson(e as Map)) + .toList(), + tags: (json['tags'] as List?) + ?.map((e) => FeedCategory.fromJson(e as Map)) + .toList(), + links: (json['links'] as List?) + ?.map((e) => FeedLink.fromJson(e as Map)) + .toList(), summaryHtml: json['summaryHtml'] as String?, summaryMarkdown: json['summaryMarkdown'] as String?, summaryPlain: json['summaryPlain'] as String?, @@ -305,8 +281,9 @@ FeedArticle _$FeedArticleFromJson(Map json) => FeedArticle( contentMarkdown: json['contentMarkdown'] as String?, contentPlain: json['contentPlain'] as String?, icon: json['icon'] == null ? null : Uri.parse(json['icon'] as String), - siteLink: - json['siteLink'] == null ? null : Uri.parse(json['siteLink'] as String), + siteLink: json['siteLink'] == null + ? null + : Uri.parse(json['siteLink'] as String), ); Map _$FeedArticleToJson(FeedArticle instance) => diff --git a/app/lib/features/web_feed/data/models/feed_parse_result.g.dart b/app/lib/features/web_feed/data/models/feed_parse_result.g.dart index 13c142ab..07a8d1e1 100644 --- a/app/lib/features/web_feed/data/models/feed_parse_result.g.dart +++ b/app/lib/features/web_feed/data/models/feed_parse_result.g.dart @@ -11,10 +11,9 @@ FeedParseResult _$FeedParseResultFromJson(Map json) => feedData: const FeedDataConverter().fromJson( json['feedData'] as Map, ), - articleData: - (json['articleData'] as List) - .map((e) => FeedArticle.fromJson(e as Map)) - .toList(), + articleData: (json['articleData'] as List) + .map((e) => FeedArticle.fromJson(e as Map)) + .toList(), ); Map _$FeedParseResultToJson(FeedParseResult instance) => diff --git a/app/lib/features/web_feed/data/providers.g.dart b/app/lib/features/web_feed/data/providers.g.dart index 38933295..a53338cc 100644 --- a/app/lib/features/web_feed/data/providers.g.dart +++ b/app/lib/features/web_feed/data/providers.g.dart @@ -13,8 +13,9 @@ String _$feedDatabaseHash() => r'c3b20e867da5af6e92d1e8c1efa96b79988837a1'; final feedDatabaseProvider = Provider.internal( feedDatabase, name: r'feedDatabaseProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$feedDatabaseHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedDatabaseHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/domain/providers.dart b/app/lib/features/web_feed/domain/providers.dart index f7578a57..54500898 100644 --- a/app/lib/features/web_feed/domain/providers.dart +++ b/app/lib/features/web_feed/domain/providers.dart @@ -104,21 +104,19 @@ class FilteredArticleList extends _$FilteredArticleList { AsyncValue> build(Uri? feedId) { final filterTags = ref.watch(articleFilterProvider); - final articlesAsync = - _hasSearch - ? ref.watch(articleSearchProvider(feedId)) - : ref.watch(feedArticleListProvider(feedId)); + final articlesAsync = _hasSearch + ? ref.watch(articleSearchProvider(feedId)) + : ref.watch(feedArticleListProvider(feedId)); return articlesAsync.whenData((articles) { if (filterTags.isNotEmpty) { return articles.where((article) { final tags = article.tags?.map((tag) => tag.id).toSet(); - final authors = - article.authors - ?.map((author) => author.name.whenNotEmpty) - .nonNulls - .toSet(); + final authors = article.authors + ?.map((author) => author.name.whenNotEmpty) + .nonNulls + .toSet(); return filterTags.every( (filter) => diff --git a/app/lib/features/web_feed/domain/providers.g.dart b/app/lib/features/web_feed/domain/providers.g.dart index 59f15464..1c7dacdb 100644 --- a/app/lib/features/web_feed/domain/providers.g.dart +++ b/app/lib/features/web_feed/domain/providers.g.dart @@ -13,8 +13,9 @@ String _$feedListHash() => r'0076186437354768c39fb1d7c8bcfcf7b94c7dd1'; final feedListProvider = AutoDisposeStreamProvider>.internal( feedList, name: r'feedListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$feedListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedListHash, dependencies: null, allTransitiveDependencies: null, ); @@ -87,10 +88,9 @@ class FeedDataProvider extends AutoDisposeStreamProvider { (ref) => feedData(ref as FeedDataRef, feedId), from: feedDataProvider, name: r'feedDataProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$feedDataHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedDataHash, dependencies: FeedDataFamily._dependencies, allTransitiveDependencies: FeedDataFamily._allTransitiveDependencies, feedId: feedId, @@ -208,10 +208,9 @@ class FeedArticleListProvider (ref) => feedArticleList(ref as FeedArticleListRef, feedId), from: feedArticleListProvider, name: r'feedArticleListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$feedArticleListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedArticleListHash, dependencies: FeedArticleListFamily._dependencies, allTransitiveDependencies: FeedArticleListFamily._allTransitiveDependencies, @@ -333,10 +332,9 @@ class FeedArticleProvider extends AutoDisposeStreamProvider { ), from: feedArticleProvider, name: r'feedArticleProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$feedArticleHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedArticleHash, dependencies: FeedArticleFamily._dependencies, allTransitiveDependencies: FeedArticleFamily._allTransitiveDependencies, articleId: articleId, @@ -428,10 +426,9 @@ final unreadArticleCountProvider = AutoDisposeProvider>>>.internal( unreadArticleCount, name: r'unreadArticleCountProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$unreadArticleCountHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$unreadArticleCountHash, dependencies: null, allTransitiveDependencies: null, ); @@ -488,10 +485,9 @@ class UnreadFeedArticleCountProvider extends AutoDisposeStreamProvider { unreadFeedArticleCount(ref as UnreadFeedArticleCountRef, feedId), from: unreadFeedArticleCountProvider, name: r'unreadFeedArticleCountProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$unreadFeedArticleCountHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$unreadFeedArticleCountHash, dependencies: UnreadFeedArticleCountFamily._dependencies, allTransitiveDependencies: UnreadFeedArticleCountFamily._allTransitiveDependencies, @@ -609,10 +605,9 @@ class FetchWebFeedProvider extends AutoDisposeFutureProvider { (ref) => fetchWebFeed(ref as FetchWebFeedRef, url), from: fetchWebFeedProvider, name: r'fetchWebFeedProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$fetchWebFeedHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$fetchWebFeedHash, dependencies: FetchWebFeedFamily._dependencies, allTransitiveDependencies: FetchWebFeedFamily._allTransitiveDependencies, @@ -742,10 +737,9 @@ class ArticleSearchProvider () => ArticleSearch()..feedId = feedId, from: articleSearchProvider, name: r'articleSearchProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$articleSearchHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$articleSearchHash, dependencies: ArticleSearchFamily._dependencies, allTransitiveDependencies: ArticleSearchFamily._allTransitiveDependencies, @@ -885,10 +879,9 @@ class FilteredArticleListProvider () => FilteredArticleList()..feedId = feedId, from: filteredArticleListProvider, name: r'filteredArticleListProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$filteredArticleListHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$filteredArticleListHash, dependencies: FilteredArticleListFamily._dependencies, allTransitiveDependencies: FilteredArticleListFamily._allTransitiveDependencies, diff --git a/app/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart b/app/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart index 05727c2c..590dfcef 100644 --- a/app/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart +++ b/app/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart @@ -15,10 +15,9 @@ final addFeedDialogBlockingProvider = NotifierProvider.internal( AddFeedDialogBlocking.new, name: r'addFeedDialogBlockingProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$addFeedDialogBlockingHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$addFeedDialogBlockingHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/domain/providers/article_filter.g.dart b/app/lib/features/web_feed/domain/providers/article_filter.g.dart index 3947518a..18cf1931 100644 --- a/app/lib/features/web_feed/domain/providers/article_filter.g.dart +++ b/app/lib/features/web_feed/domain/providers/article_filter.g.dart @@ -14,10 +14,9 @@ final articleFilterProvider = NotifierProvider>.internal( ArticleFilter.new, name: r'articleFilterProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$articleFilterHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$articleFilterHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/domain/repositories/feed_repository.g.dart b/app/lib/features/web_feed/domain/repositories/feed_repository.g.dart index 2356612a..f25c4f85 100644 --- a/app/lib/features/web_feed/domain/repositories/feed_repository.g.dart +++ b/app/lib/features/web_feed/domain/repositories/feed_repository.g.dart @@ -13,10 +13,9 @@ String _$feedRepositoryHash() => r'805cc26890b0d43576a1eab0ecb5851b6649d7b7'; final feedRepositoryProvider = NotifierProvider.internal( FeedRepository.new, name: r'feedRepositoryProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$feedRepositoryHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedRepositoryHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/domain/services/article_content_processor.g.dart b/app/lib/features/web_feed/domain/services/article_content_processor.g.dart index 984f0f80..4320631e 100644 --- a/app/lib/features/web_feed/domain/services/article_content_processor.g.dart +++ b/app/lib/features/web_feed/domain/services/article_content_processor.g.dart @@ -15,10 +15,9 @@ final articleContentProcessorServiceProvider = NotifierProvider.internal( ArticleContentProcessorService.new, name: r'articleContentProcessorServiceProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$articleContentProcessorServiceHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$articleContentProcessorServiceHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/domain/services/feed_reader.g.dart b/app/lib/features/web_feed/domain/services/feed_reader.g.dart index 1cddd500..b49b2d57 100644 --- a/app/lib/features/web_feed/domain/services/feed_reader.g.dart +++ b/app/lib/features/web_feed/domain/services/feed_reader.g.dart @@ -13,8 +13,9 @@ String _$feedReaderHash() => r'301e01fa831c58723dc0ab118496f4fb34c38610'; final feedReaderProvider = NotifierProvider.internal( FeedReader.new, name: r'feedReaderProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') ? null : _$feedReaderHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$feedReaderHash, dependencies: null, allTransitiveDependencies: null, ); diff --git a/app/lib/features/web_feed/extensions/web_feed_converter.dart b/app/lib/features/web_feed/extensions/web_feed_converter.dart index 233da046..7cd03507 100644 --- a/app/lib/features/web_feed/extensions/web_feed_converter.dart +++ b/app/lib/features/web_feed/extensions/web_feed_converter.dart @@ -15,13 +15,9 @@ extension WebFeedJson on WebFeed { title: json['title'] as String, description: json['description'] as String, links: (json['links'] as List).cast(), - items: - (json['items'] as List) - .map( - (item) => - WebFeedItemJson.fromJson(item as Map), - ) - .toList(), + items: (json['items'] as List) + .map((item) => WebFeedItemJson.fromJson(item as Map)) + .toList(), ); } } @@ -41,10 +37,9 @@ extension WebFeedItemJson on WebFeedItem { title: json['title'] as String, body: json['body'] as String, links: (json['links'] as List).cast(), - updated: - json['updated'] != null - ? DateTime.parse(json['updated'] as String) - : null, + updated: json['updated'] != null + ? DateTime.parse(json['updated'] as String) + : null, ); } } diff --git a/app/lib/features/web_feed/presentation/controllers/fetch_articles.dart b/app/lib/features/web_feed/presentation/controllers/fetch_articles.dart index 30dd0eb4..167b245b 100644 --- a/app/lib/features/web_feed/presentation/controllers/fetch_articles.dart +++ b/app/lib/features/web_feed/presentation/controllers/fetch_articles.dart @@ -10,8 +10,9 @@ class FetchArticlesController extends _$FetchArticlesController { Future fetchAllArticles() async { state = const AsyncLoading(); state = await AsyncValue.guard(() async { - final feeds = - await ref.read(feedRepositoryProvider.notifier).getAllFeeds(); + final feeds = await ref + .read(feedRepositoryProvider.notifier) + .getAllFeeds(); await Future.wait( feeds.map((feed) async { diff --git a/app/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart b/app/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart index 8458e999..8a629926 100644 --- a/app/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart +++ b/app/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart @@ -11,19 +11,19 @@ String _$fetchArticlesControllerHash() => /// See also [FetchArticlesController]. @ProviderFor(FetchArticlesController) -final fetchArticlesControllerProvider = AutoDisposeNotifierProvider< - FetchArticlesController, - AsyncValue ->.internal( - FetchArticlesController.new, - name: r'fetchArticlesControllerProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') +final fetchArticlesControllerProvider = + AutoDisposeNotifierProvider< + FetchArticlesController, + AsyncValue + >.internal( + FetchArticlesController.new, + name: r'fetchArticlesControllerProvider', + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') ? null : _$fetchArticlesControllerHash, - dependencies: null, - allTransitiveDependencies: null, -); + dependencies: null, + allTransitiveDependencies: null, + ); typedef _$FetchArticlesController = AutoDisposeNotifier>; // ignore_for_file: type=lint diff --git a/app/lib/features/web_feed/presentation/screens/feed_article.dart b/app/lib/features/web_feed/presentation/screens/feed_article.dart index 8eabd9f4..c4ac68b1 100644 --- a/app/lib/features/web_feed/presentation/screens/feed_article.dart +++ b/app/lib/features/web_feed/presentation/screens/feed_article.dart @@ -91,121 +91,118 @@ class FeedArticleScreen extends HookConsumerWidget { }, [article]); return NestedScrollView( - headerSliverBuilder: - (context, innerBoxIsScrolled) => [ - SliverAppBar.large( - pinned: false, - flexibleSpace: FlexibleSpaceBar( - centerTitle: false, - titlePadding: EdgeInsetsDirectional.only( - start: 72, - end: 72, - bottom: bottomHeight + 16, - ), - title: Text( - article.displayTitle, - maxLines: 2, - overflow: TextOverflow.ellipsis, - ), - background: articleImages?.firstOrNull.mapNotNull( - (img) => Image.network( - img.toString(), - fit: BoxFit.cover, - color: Theme.of( - context, - ).colorScheme.surface.withAlpha(200), - colorBlendMode: BlendMode.darken, - ), - ), - ), - bottom: PreferredSize( - preferredSize: Size(double.infinity, bottomHeight), - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Divider(), - Text( - 'Published: ${hasArticleCreated ? ref.read(formatProvider.notifier).fullDateTimeWithTimezone(article.created!) : 'N/A'}', - style: Theme.of(context).textTheme.bodySmall - ?.copyWith(fontStyle: FontStyle.italic), - ), - if (hasArticleUpdated) - Text( - 'Updated: ${ref.read(formatProvider.notifier).fullDateTimeWithTimezone(article.updated!)}', - style: Theme.of(context).textTheme.bodySmall - ?.copyWith(fontStyle: FontStyle.italic), - ), - if (hasAuthors) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: Row( - children: [ - const Text('Authors:'), - const SizedBox(width: 8), - Expanded( - child: AuthorsHorizontalList( - authors: article.authors!, - ), - ), - ], - ), - ), - if (hasTags) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: Row( - children: [ - const Text('Tags:'), - const SizedBox(width: 8), - Expanded( - child: TagsHorizontalList( - tags: article.tags!, - ), - ), - ], - ), - ), - ], - ), - ), - ), - actions: [ - if (articleLink != null) - IconButton( - onPressed: () async { - await ref - .read(tabRepositoryProvider.notifier) - .addTab(url: articleLink.uri); - - if (context.mounted) { - BrowserRoute().go(context); - } - }, - icon: const Icon(Icons.open_in_browser), - ), - ], + headerSliverBuilder: (context, innerBoxIsScrolled) => [ + SliverAppBar.large( + pinned: false, + flexibleSpace: FlexibleSpaceBar( + centerTitle: false, + titlePadding: EdgeInsetsDirectional.only( + start: 72, + end: 72, + bottom: bottomHeight + 16, ), - // SliverToBoxAdapter( - // child: Padding( - // padding: const EdgeInsets.all(8.0), - // child: TabBar( - // controller: tabController, - // tabs: [ - // ...tabs.map( - // (tab) => switch (tab) { - // _Pages.summary => const Tab(text: 'Summary'), - // _Pages.content => const Tab(text: 'Article'), - // }, - // ), - // ], - // ), - // ), - // ), + title: Text( + article.displayTitle, + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + background: articleImages?.firstOrNull.mapNotNull( + (img) => Image.network( + img.toString(), + fit: BoxFit.cover, + color: Theme.of( + context, + ).colorScheme.surface.withAlpha(200), + colorBlendMode: BlendMode.darken, + ), + ), + ), + bottom: PreferredSize( + preferredSize: Size(double.infinity, bottomHeight), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Divider(), + Text( + 'Published: ${hasArticleCreated ? ref.read(formatProvider.notifier).fullDateTimeWithTimezone(article.created!) : 'N/A'}', + style: Theme.of(context).textTheme.bodySmall + ?.copyWith(fontStyle: FontStyle.italic), + ), + if (hasArticleUpdated) + Text( + 'Updated: ${ref.read(formatProvider.notifier).fullDateTimeWithTimezone(article.updated!)}', + style: Theme.of(context).textTheme.bodySmall + ?.copyWith(fontStyle: FontStyle.italic), + ), + if (hasAuthors) + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: Row( + children: [ + const Text('Authors:'), + const SizedBox(width: 8), + Expanded( + child: AuthorsHorizontalList( + authors: article.authors!, + ), + ), + ], + ), + ), + if (hasTags) + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: Row( + children: [ + const Text('Tags:'), + const SizedBox(width: 8), + Expanded( + child: TagsHorizontalList( + tags: article.tags!, + ), + ), + ], + ), + ), + ], + ), + ), + ), + actions: [ + if (articleLink != null) + IconButton( + onPressed: () async { + await ref + .read(tabRepositoryProvider.notifier) + .addTab(url: articleLink.uri); + + if (context.mounted) { + BrowserRoute().go(context); + } + }, + icon: const Icon(Icons.open_in_browser), + ), ], + ), + // SliverToBoxAdapter( + // child: Padding( + // padding: const EdgeInsets.all(8.0), + // child: TabBar( + // controller: tabController, + // tabs: [ + // ...tabs.map( + // (tab) => switch (tab) { + // _Pages.summary => const Tab(text: 'Summary'), + // _Pages.content => const Tab(text: 'Article'), + // }, + // ), + // ], + // ), + // ), + // ), + ], body: TabBarView( controller: tabController, children: [ @@ -230,17 +227,17 @@ class FeedArticleScreen extends HookConsumerWidget { } } }, - styleSheet: MarkdownStyleSheet.fromTheme( - Theme.of(context), - ).copyWith( - blockquoteDecoration: BoxDecoration( - color: - Theme.of( + styleSheet: + MarkdownStyleSheet.fromTheme( + Theme.of(context), + ).copyWith( + blockquoteDecoration: BoxDecoration( + color: Theme.of( context, ).colorScheme.secondaryContainer, - borderRadius: BorderRadius.circular(2.0), - ), - ), + borderRadius: BorderRadius.circular(2.0), + ), + ), data: switch (tab) { _Pages.summary => article.summaryMarkdown!, _Pages.content => article.contentMarkdown!, @@ -253,13 +250,12 @@ class FeedArticleScreen extends HookConsumerWidget { }, ); }, - error: - (error, stackTrace) => Center( - child: FailureWidget( - title: 'Failed reading article', - exception: error, - ), - ), + error: (error, stackTrace) => Center( + child: FailureWidget( + title: 'Failed reading article', + exception: error, + ), + ), loading: () => const Center(child: CircularProgressIndicator()), ), ); diff --git a/app/lib/features/web_feed/presentation/screens/feed_article_list.dart b/app/lib/features/web_feed/presentation/screens/feed_article_list.dart index 7c10636d..068a416e 100644 --- a/app/lib/features/web_feed/presentation/screens/feed_article_list.dart +++ b/app/lib/features/web_feed/presentation/screens/feed_article_list.dart @@ -70,21 +70,20 @@ class FeedArticleListScreen extends HookConsumerWidget { controller: searchTextController, decoration: InputDecoration( label: const Text('Search'), - suffixIcon: - hasText - ? IconButton( - onPressed: () { - searchTextController.clear(); - focusNode.requestFocus(); - }, - icon: const Icon(Icons.clear), - ) - : SpeechToTextButton( - onTextReceived: (data) { - searchTextController.text = - data.toString(); - }, - ), + suffixIcon: hasText + ? IconButton( + onPressed: () { + searchTextController.clear(); + focusNode.requestFocus(); + }, + icon: const Icon(Icons.clear), + ) + : SpeechToTextButton( + onTextReceived: (data) { + searchTextController.text = data + .toString(); + }, + ), ), ), const SizedBox(height: 4), @@ -99,30 +98,29 @@ class FeedArticleListScreen extends HookConsumerWidget { controller: controller, shrinkWrap: true, scrollDirection: Axis.horizontal, - children: - tags - .map( - (tag) => Padding( - padding: const EdgeInsets.only( - right: 8.0, - ), - child: FilterChip( - label: Text(tag), - showCheckmark: false, - selected: true, - onSelected: (value) {}, - onDeleted: () { - ref - .read( - articleFilterProvider - .notifier, - ) - .removeTag(tag); - }, - ), - ), - ) - .toList(), + children: tags + .map( + (tag) => Padding( + padding: const EdgeInsets.only( + right: 8.0, + ), + child: FilterChip( + label: Text(tag), + showCheckmark: false, + selected: true, + onSelected: (value) {}, + onDeleted: () { + ref + .read( + articleFilterProvider + .notifier, + ) + .removeTag(tag); + }, + ), + ), + ) + .toList(), ); }, ), @@ -175,13 +173,12 @@ class FeedArticleListScreen extends HookConsumerWidget { ), ); }, - error: - (error, stackTrace) => Center( - child: FailureWidget( - title: 'Failed to load Articles', - exception: error, - ), - ), + error: (error, stackTrace) => Center( + child: FailureWidget( + title: 'Failed to load Articles', + exception: error, + ), + ), loading: () => const SizedBox.shrink(), ); }, diff --git a/app/lib/features/web_feed/presentation/screens/feed_edit.dart b/app/lib/features/web_feed/presentation/screens/feed_edit.dart index 9710fe91..a301b42e 100644 --- a/app/lib/features/web_feed/presentation/screens/feed_edit.dart +++ b/app/lib/features/web_feed/presentation/screens/feed_edit.dart @@ -60,39 +60,34 @@ class FeedEditScreen extends HookConsumerWidget { return _FeedEditContent(mode: _mode, initialFeed: initialFeed); }, - error: - (error, stackTrace) => Scaffold( - key: const ValueKey('error'), - appBar: AppBar(), - body: Center( - child: FailureWidget( - title: 'Failed to load feed', - exception: error, + error: (error, stackTrace) => Scaffold( + key: const ValueKey('error'), + appBar: AppBar(), + body: Center( + child: FailureWidget(title: 'Failed to load feed', exception: error), + ), + ), + loading: () => Scaffold( + key: const ValueKey('loading'), + appBar: AppBar( + title: Text(switch (_mode) { + _DialogMode.create => 'New Feed', + _DialogMode.edit => 'Edit Feed', + }), + ), + body: const Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + CircularProgressIndicator(), + Padding( + padding: EdgeInsets.only(top: 8.0), + child: Text('Fetching feed...'), ), - ), - ), - loading: - () => Scaffold( - key: const ValueKey('loading'), - appBar: AppBar( - title: Text(switch (_mode) { - _DialogMode.create => 'New Feed', - _DialogMode.edit => 'Edit Feed', - }), - ), - body: const Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - CircularProgressIndicator(), - Padding( - padding: EdgeInsets.only(top: 8.0), - child: Text('Fetching feed...'), - ), - ], - ), - ), + ], ), + ), + ), ); } } @@ -141,11 +136,10 @@ class _FeedEditContent extends HookConsumerWidget { onPressed: () async { if (formKey.currentState?.validate() ?? false) { final feedData = FeedData( - url: - uri_parser.tryParseUrl( - urlTextController.text, - eagerParsing: true, - )!, + url: uri_parser.tryParseUrl( + urlTextController.text, + eagerParsing: true, + )!, authors: initialFeed.authors, description: descriptionTextController.text.whenNotEmpty, icon: uri_parser.tryParseUrl( diff --git a/app/lib/features/web_feed/presentation/screens/feed_list.dart b/app/lib/features/web_feed/presentation/screens/feed_list.dart index 966b2dfa..ce80e875 100644 --- a/app/lib/features/web_feed/presentation/screens/feed_list.dart +++ b/app/lib/features/web_feed/presentation/screens/feed_list.dart @@ -32,17 +32,16 @@ class FeedListScreen extends HookConsumerWidget { ), ); }, - error: - (error, stackTrace) => Center( - child: FailureWidget( - title: 'Failed to load Feeds', - exception: error, - onRetry: () { - // ignore: unused_result - ref.refresh(feedListProvider); - }, - ), - ), + error: (error, stackTrace) => Center( + child: FailureWidget( + title: 'Failed to load Feeds', + exception: error, + onRetry: () { + // ignore: unused_result + ref.refresh(feedListProvider); + }, + ), + ), loading: () => const SizedBox.shrink(), ), floatingActionButton: FloatingActionButton.extended( diff --git a/app/lib/features/web_feed/presentation/select_feed_dialog.dart b/app/lib/features/web_feed/presentation/select_feed_dialog.dart index 2d18e7ff..178d3d68 100644 --- a/app/lib/features/web_feed/presentation/select_feed_dialog.dart +++ b/app/lib/features/web_feed/presentation/select_feed_dialog.dart @@ -15,51 +15,44 @@ class SelectFeedDialog extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return SimpleDialog( title: const Text('Add Feed'), - children: - feedUris - .map( - (uri) => HookConsumer( - builder: (context, ref, child) { - final feedAsync = ref.watch(fetchWebFeedProvider(uri)); + children: feedUris + .map( + (uri) => HookConsumer( + builder: (context, ref, child) { + final feedAsync = ref.watch(fetchWebFeedProvider(uri)); - return feedAsync.when( - data: (data) { - return ListTile( - title: Text( - data.feedData.title.whenNotEmpty ?? 'Unnamed Feed', - ), - subtitle: Text(uri.toString()), - trailing: const Icon(Icons.add), - onTap: () { - FeedCreateRoute( - feedId: uri, - ).pushReplacement(context); - }, - ); + return feedAsync.when( + data: (data) { + return ListTile( + title: Text( + data.feedData.title.whenNotEmpty ?? 'Unnamed Feed', + ), + subtitle: Text(uri.toString()), + trailing: const Icon(Icons.add), + onTap: () { + FeedCreateRoute(feedId: uri).pushReplacement(context); }, - error: - (error, stackTrace) => FailureWidget( - title: 'Failed to fetch Feed', - exception: error, - onRetry: () { - // ignore: unused_result - ref.refresh(fetchWebFeedProvider(uri)); - }, - ), - loading: - () => Skeletonizer( - child: ListTile( - title: Text(BoneMock.title), - subtitle: Skeleton.keep( - child: Text(uri.toString()), - ), - ), - ), ); }, - ), - ) - .toList(), + error: (error, stackTrace) => FailureWidget( + title: 'Failed to fetch Feed', + exception: error, + onRetry: () { + // ignore: unused_result + ref.refresh(fetchWebFeedProvider(uri)); + }, + ), + loading: () => Skeletonizer( + child: ListTile( + title: Text(BoneMock.title), + subtitle: Skeleton.keep(child: Text(uri.toString())), + ), + ), + ); + }, + ), + ) + .toList(), ); } } diff --git a/app/lib/features/web_feed/presentation/widgets/authors_horizontal_list.dart b/app/lib/features/web_feed/presentation/widgets/authors_horizontal_list.dart index f89e4b81..973108d8 100644 --- a/app/lib/features/web_feed/presentation/widgets/authors_horizontal_list.dart +++ b/app/lib/features/web_feed/presentation/widgets/authors_horizontal_list.dart @@ -11,26 +11,25 @@ class AuthorsHorizontalList extends StatelessWidget { Set selectedTags = const {}, void Function(String tagId, bool value)? onTagSelected, }) { - _authors = - authors.map((author) { - final label = Text( - '${author.name ?? ''} ${author.email.mapNotNull((email) => '($email)') ?? ''}' - .trim(), - ); + _authors = authors.map((author) { + final label = Text( + '${author.name ?? ''} ${author.email.mapNotNull((email) => '($email)') ?? ''}' + .trim(), + ); - return onTagSelected.mapNotNull( - (onTagSelected) => FilterChip( - label: label, - selected: selectedTags.contains(author.name), - onSelected: (value) { - if (author.name.isNotEmpty) { - onTagSelected(author.name!, value); - } - }, - ), - ) ?? - Chip(label: label); - }).toList(); + return onTagSelected.mapNotNull( + (onTagSelected) => FilterChip( + label: label, + selected: selectedTags.contains(author.name), + onSelected: (value) { + if (author.name.isNotEmpty) { + onTagSelected(author.name!, value); + } + }, + ), + ) ?? + Chip(label: label); + }).toList(); } @override diff --git a/app/lib/features/web_feed/presentation/widgets/feed_article_card.dart b/app/lib/features/web_feed/presentation/widgets/feed_article_card.dart index 4285c2d6..8c61bccd 100644 --- a/app/lib/features/web_feed/presentation/widgets/feed_article_card.dart +++ b/app/lib/features/web_feed/presentation/widgets/feed_article_card.dart @@ -70,11 +70,12 @@ class FeedArticleCard extends HookConsumerWidget { MarkdownBody( data: titleHighlight!, styleSheet: MarkdownStyleSheet( - p: Theme.of( - context, - ).textTheme.titleMedium?.copyWith( - color: Theme.of(context).colorScheme.onSurface, - ), + p: Theme.of(context).textTheme.titleMedium + ?.copyWith( + color: Theme.of( + context, + ).colorScheme.onSurface, + ), ), ), if (titleHighlight.isEmpty) @@ -86,23 +87,19 @@ class FeedArticleCard extends HookConsumerWidget { MarkdownBody( data: searchSnippet!, styleSheet: MarkdownStyleSheet( - p: Theme.of( - context, - ).textTheme.bodyMedium?.copyWith( - color: - Theme.of( + p: Theme.of(context).textTheme.bodyMedium + ?.copyWith( + color: Theme.of( context, ).colorScheme.onSurfaceVariant, - ), - a: Theme.of( - context, - ).textTheme.bodyMedium?.copyWith( - color: - Theme.of( + ), + a: Theme.of(context).textTheme.bodyMedium + ?.copyWith( + color: Theme.of( context, ).colorScheme.onSurfaceVariant, - decoration: TextDecoration.none, - ), + decoration: TextDecoration.none, + ), ), ), if (searchSnippet.isEmpty && diff --git a/app/lib/features/web_feed/presentation/widgets/feed_card.dart b/app/lib/features/web_feed/presentation/widgets/feed_card.dart index d991916a..5769def3 100644 --- a/app/lib/features/web_feed/presentation/widgets/feed_card.dart +++ b/app/lib/features/web_feed/presentation/widgets/feed_card.dart @@ -108,16 +108,18 @@ class FeedCard extends HookConsumerWidget { Icon( MdiIcons.newspaperVariantMultipleOutline, size: 18, - color: - Theme.of(context).colorScheme.onPrimary, + color: Theme.of( + context, + ).colorScheme.onPrimary, ), const SizedBox(width: 4), Text( count.toString(), textAlign: TextAlign.center, style: TextStyle( - color: - Theme.of(context).colorScheme.onPrimary, + color: Theme.of( + context, + ).colorScheme.onPrimary, ), ), ], diff --git a/app/lib/features/web_feed/presentation/widgets/tag_field.dart b/app/lib/features/web_feed/presentation/widgets/tag_field.dart index 2ddeb9c4..80867adf 100644 --- a/app/lib/features/web_feed/presentation/widgets/tag_field.dart +++ b/app/lib/features/web_feed/presentation/widgets/tag_field.dart @@ -31,17 +31,16 @@ class TagField extends HookWidget { const SizedBox(height: 4), Wrap( spacing: 8.0, - children: - tags.value - .map( - (tag) => InputChip( - label: Text(tag), - onDeleted: () { - tags.value = {...tags.value}..remove(tag); - }, - ), - ) - .toList(), + children: tags.value + .map( + (tag) => InputChip( + label: Text(tag), + onDeleted: () { + tags.value = {...tags.value}..remove(tag); + }, + ), + ) + .toList(), ), TextField( controller: textController, @@ -68,12 +67,11 @@ class TagField extends HookWidget { }, onSubmitted: (value) { if (value.isNotEmpty) { - final values = - value - .split(_tagSplitPatter) - .map((str) => str.trim()) - .where((str) => str.isNotEmpty) - .toList(); + final values = value + .split(_tagSplitPatter) + .map((str) => str.trim()) + .where((str) => str.isNotEmpty) + .toList(); if (values.isNotEmpty) { textController.clear(); diff --git a/app/lib/features/web_feed/presentation/widgets/tags_horizontal_list.dart b/app/lib/features/web_feed/presentation/widgets/tags_horizontal_list.dart index 6f602196..a3e4f29e 100644 --- a/app/lib/features/web_feed/presentation/widgets/tags_horizontal_list.dart +++ b/app/lib/features/web_feed/presentation/widgets/tags_horizontal_list.dart @@ -11,28 +11,26 @@ class TagsHorizontalList extends StatelessWidget { Set selectedTags = const {}, void Function(String tagId, bool value)? onTagSelected, }) { - _tags = - tags.map((tag) { - final label = Text( - '${tag.id} ${tag.title.mapNotNull((title) => '($title)') ?? ''}' - .trim(), - ); + _tags = tags.map((tag) { + final label = Text( + '${tag.id} ${tag.title.mapNotNull((title) => '($title)') ?? ''}'.trim(), + ); - return Padding( - padding: const EdgeInsets.only(right: 8.0), - child: - onTagSelected.mapNotNull( - (onTagSelected) => FilterChip( - label: label, - selected: selectedTags.contains(tag.id), - onSelected: (value) { - onTagSelected(tag.id, value); - }, - ), - ) ?? - Chip(label: label), - ); - }).toList(); + return Padding( + padding: const EdgeInsets.only(right: 8.0), + child: + onTagSelected.mapNotNull( + (onTagSelected) => FilterChip( + label: label, + selected: selectedTags.contains(tag.id), + onSelected: (value) { + onTagSelected(tag.id, value); + }, + ), + ) ?? + Chip(label: label), + ); + }).toList(); } @override diff --git a/app/lib/features/web_feed/utils/feed_parser.dart b/app/lib/features/web_feed/utils/feed_parser.dart index a4158aaf..0a49e0b7 100644 --- a/app/lib/features/web_feed/utils/feed_parser.dart +++ b/app/lib/features/web_feed/utils/feed_parser.dart @@ -21,10 +21,9 @@ class FeedParser { RssVersion.rss1 => Rss1Feed.parse(xmlString), RssVersion.rss2 => RssFeed.parse(xmlString), RssVersion.atom => AtomFeed.parse(xmlString), - RssVersion.unknown => - throw Error.safeToString( - 'Invalid XML String? We cannot detect RSS/Atom version.', - ), + RssVersion.unknown => throw Error.safeToString( + 'Invalid XML String? We cannot detect RSS/Atom version.', + ), }; return FeedParser._(url, feed); @@ -53,8 +52,9 @@ class FeedParser { siteLink: feed.link.mapNotNull(Uri.tryParse), authors: (feed.author.whenNotEmpty ?? feed.dc?.creator.whenNotEmpty) .mapNotNull((creator) => [FeedAuthor(name: creator)]), - tags: - categories.isNotEmpty ? categories : feed.dc?.toFeedCategories(), + tags: categories.isNotEmpty + ? categories + : feed.dc?.toFeedCategories(), ); case final AtomFeed feed: final authors = feed.authors.toFeedAuthors(); @@ -64,11 +64,10 @@ class FeedParser { url: url, title: feed.title.whenNotEmpty, icon: feed.icon.mapNotNull(Uri.tryParse), - siteLink: - feed.links - .toFeedLinks() - .getRelation(FeedLinkRelation.alternate) - ?.uri, + siteLink: feed.links + .toFeedLinks() + .getRelation(FeedLinkRelation.alternate) + ?.uri, description: feed.subtitle.whenNotEmpty, authors: authors.isNotEmpty ? authors : null, tags: tags, @@ -150,10 +149,9 @@ class FeedParser { FeedLink(uri: link, relation: FeedLinkRelation.alternate), ], ), - tags: - categories.isNotEmpty - ? categories - : item.dc?.toFeedCategories(), + tags: categories.isNotEmpty + ? categories + : item.dc?.toFeedCategories(), contentHtml: item.content?.value.whenNotEmpty, ); }).toList(); diff --git a/app/lib/presentation/controllers/website_title.g.dart b/app/lib/presentation/controllers/website_title.g.dart index b8adb7fe..962ceb0e 100644 --- a/app/lib/presentation/controllers/website_title.g.dart +++ b/app/lib/presentation/controllers/website_title.g.dart @@ -72,10 +72,9 @@ class PageInfoProvider extends AutoDisposeFutureProvider { pageInfo(ref as PageInfoRef, url, isImageRequest: isImageRequest), from: pageInfoProvider, name: r'pageInfoProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$pageInfoHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$pageInfoHash, dependencies: PageInfoFamily._dependencies, allTransitiveDependencies: PageInfoFamily._allTransitiveDependencies, url: url, @@ -214,16 +213,14 @@ class CompletePageInfoProvider /// See also [CompletePageInfo]. CompletePageInfoProvider(Uri url, WebPageInfo? cached) : this._internal( - () => - CompletePageInfo() - ..url = url - ..cached = cached, + () => CompletePageInfo() + ..url = url + ..cached = cached, from: completePageInfoProvider, name: r'completePageInfoProvider', - debugGetCreateSourceHash: - const bool.fromEnvironment('dart.vm.product') - ? null - : _$completePageInfoHash, + debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product') + ? null + : _$completePageInfoHash, dependencies: CompletePageInfoFamily._dependencies, allTransitiveDependencies: CompletePageInfoFamily._allTransitiveDependencies, @@ -257,10 +254,9 @@ class CompletePageInfoProvider return ProviderOverride( origin: this, override: CompletePageInfoProvider._internal( - () => - create() - ..url = url - ..cached = cached, + () => create() + ..url = url + ..cached = cached, from: from, name: null, dependencies: null, diff --git a/app/lib/presentation/widgets/animate_gradient_shader.dart b/app/lib/presentation/widgets/animate_gradient_shader.dart index 3c6ed6f3..13ec3536 100644 --- a/app/lib/presentation/widgets/animate_gradient_shader.dart +++ b/app/lib/presentation/widgets/animate_gradient_shader.dart @@ -131,14 +131,12 @@ class _AnimateGradientShaderState extends State animation: _animation!, builder: (BuildContext context, Widget? child) { final gradient = LinearGradient( - begin: - widget.animateAlignments - ? begin.evaluate(_animation!) - : widget.primaryBegin, - end: - widget.animateAlignments - ? end.evaluate(_animation!) - : widget.primaryEnd, + begin: widget.animateAlignments + ? begin.evaluate(_animation!) + : widget.primaryBegin, + end: widget.animateAlignments + ? end.evaluate(_animation!) + : widget.primaryEnd, colors: _evaluateColors(_animation!), ); diff --git a/app/lib/presentation/widgets/auto_suggest_text_field.dart b/app/lib/presentation/widgets/auto_suggest_text_field.dart index e3544f4b..19badb11 100644 --- a/app/lib/presentation/widgets/auto_suggest_text_field.dart +++ b/app/lib/presentation/widgets/auto_suggest_text_field.dart @@ -176,10 +176,9 @@ class AutoSuggestTextField extends HookWidget { text: suggestion!.substring(text.length), style: TextStyle( height: 1.2, - color: - Theme.of( - context, - ).colorScheme.onSurfaceVariant, + color: Theme.of( + context, + ).colorScheme.onSurfaceVariant, backgroundColor: suggestionHighlightColor ?? Theme.of( diff --git a/app/lib/presentation/widgets/failure_widget.dart b/app/lib/presentation/widgets/failure_widget.dart index 5c3a72be..4475fc8e 100644 --- a/app/lib/presentation/widgets/failure_widget.dart +++ b/app/lib/presentation/widgets/failure_widget.dart @@ -22,23 +22,21 @@ class FailureWidget extends StatelessWidget { children: [ ListTile( title: Text(title ?? 'Something went wrong'), - subtitle: - exception != null - ? switch (exception) { - final String string => Text(string), - _ => Text(exception.runtimeType.toString()), - } - : null, - trailing: - compact && onRetry != null - ? IconButton.outlined( - onPressed: onRetry, - style: IconButton.styleFrom( - tapTargetSize: MaterialTapTargetSize.shrinkWrap, - ), - icon: const Icon(Icons.refresh_outlined), - ) - : null, + subtitle: exception != null + ? switch (exception) { + final String string => Text(string), + _ => Text(exception.runtimeType.toString()), + } + : null, + trailing: compact && onRetry != null + ? IconButton.outlined( + onPressed: onRetry, + style: IconButton.styleFrom( + tapTargetSize: MaterialTapTargetSize.shrinkWrap, + ), + icon: const Icon(Icons.refresh_outlined), + ) + : null, textColor: Theme.of(context).colorScheme.error, ), if (!compact && onRetry != null) diff --git a/app/lib/presentation/widgets/selectable_chips.dart b/app/lib/presentation/widgets/selectable_chips.dart index 5084e5fb..dd471ba5 100644 --- a/app/lib/presentation/widgets/selectable_chips.dart +++ b/app/lib/presentation/widgets/selectable_chips.dart @@ -85,12 +85,11 @@ class SelectableChips extends StatelessWidget { onDeleted?.call(item); } }, - onDeleted: - deleteIcon - ? () { - onDeleted?.call(item); - } - : null, + onDeleted: deleteIcon + ? () { + onDeleted?.call(item); + } + : null, label: itemLabel.call(item), avatar: itemAvatar?.call(item), ), diff --git a/app/lib/presentation/widgets/url_icon.dart b/app/lib/presentation/widgets/url_icon.dart index f24905ea..02c6ff83 100644 --- a/app/lib/presentation/widgets/url_icon.dart +++ b/app/lib/presentation/widgets/url_icon.dart @@ -15,8 +15,8 @@ class UrlIcon extends HookConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { final icon = useCachedFuture( () => - // ignore: discarded_futures - ref.read(genericWebsiteServiceProvider.notifier).getUrlIcon(urlList), + // ignore: discarded_futures + ref.read(genericWebsiteServiceProvider.notifier).getUrlIcon(urlList), [urlList], ); @@ -24,17 +24,16 @@ class UrlIcon extends HookConsumerWidget { enabled: !icon.hasData, child: SizedBox.square( dimension: iconSize, - child: - (icon.data != null) - ? RepaintBoundary( - child: RawImage( - image: icon.data?.image.value, - height: iconSize, - width: iconSize, - fit: BoxFit.fill, - ), - ) - : Icon(MdiIcons.web, size: iconSize), + child: (icon.data != null) + ? RepaintBoundary( + child: RawImage( + image: icon.data?.image.value, + height: iconSize, + width: iconSize, + fit: BoxFit.fill, + ), + ) + : Icon(MdiIcons.web, size: iconSize), ), ); } diff --git a/app/lib/presentation/widgets/website_feed_tile.dart b/app/lib/presentation/widgets/website_feed_tile.dart index 5ac1fc3d..cb70fab4 100644 --- a/app/lib/presentation/widgets/website_feed_tile.dart +++ b/app/lib/presentation/widgets/website_feed_tile.dart @@ -61,13 +61,12 @@ class WebsiteFeedTile extends HookConsumerWidget { // onRetry: () => ref.refresh(pageInfoProvider(url)), // ); }, - loading: - () => const ListTile( - leading: Icon(Icons.rss_feed), - contentPadding: EdgeInsets.zero, - title: Text('Available Web Feeds'), - trailing: Bone.icon(), - ), + loading: () => const ListTile( + leading: Icon(Icons.rss_feed), + contentPadding: EdgeInsets.zero, + title: Text('Available Web Feeds'), + trailing: Bone.icon(), + ), ), ); } diff --git a/app/lib/presentation/widgets/website_title_tile.dart b/app/lib/presentation/widgets/website_title_tile.dart index 426dc598..315862f2 100644 --- a/app/lib/presentation/widgets/website_title_tile.dart +++ b/app/lib/presentation/widgets/website_title_tile.dart @@ -36,28 +36,26 @@ class WebsiteTitleTile extends HookConsumerWidget { error: (error, stackTrace) { return FailureWidget( title: error.toString(), - onRetry: - () => ref.refresh(pageInfoProvider(url, isImageRequest: false)), + onRetry: () => + ref.refresh(pageInfoProvider(url, isImageRequest: false)), ); }, - loading: - () => - (precachedInfo != null) - ? ListTile( - leading: RawImage( - image: precachedInfo!.favicon?.image.value, - height: 24, - width: 24, - ), - contentPadding: EdgeInsets.zero, - title: Text(precachedInfo!.title ?? 'Unknown Title'), - subtitle: Text(url.authority), - ) - : const ListTile( - contentPadding: EdgeInsets.zero, - title: Bone.text(), - subtitle: Bone.text(), - ), + loading: () => (precachedInfo != null) + ? ListTile( + leading: RawImage( + image: precachedInfo!.favicon?.image.value, + height: 24, + width: 24, + ), + contentPadding: EdgeInsets.zero, + title: Text(precachedInfo!.title ?? 'Unknown Title'), + subtitle: Text(url.authority), + ) + : const ListTile( + contentPadding: EdgeInsets.zero, + title: Bone.text(), + subtitle: Bone.text(), + ), ), ); } diff --git a/app/lib/utils/ui_helper.dart b/app/lib/utils/ui_helper.dart index 05bb8adc..1a411426 100644 --- a/app/lib/utils/ui_helper.dart +++ b/app/lib/utils/ui_helper.dart @@ -21,10 +21,9 @@ void showTabBackButtonMessage( Duration duration, ) { final snackbar = SnackBar( - content: - (tabCount > 1) - ? const Text('Navigate BACK again to close current tab') - : const Text('Navigate BACK again to exit app'), + content: (tabCount > 1) + ? const Text('Navigate BACK again to close current tab') + : const Text('Navigate BACK again to exit app'), duration: duration, ); @@ -60,28 +59,27 @@ Future showSuggestNewTabMessage( }) async { final clipboardUrl = await tryGetUriFromClipboard(); - final snackBar = - (clipboardUrl != null) - ? SnackBar( - content: const Text('Want to open link from clipboard?'), - action: SnackBarAction( - label: 'Open', - onPressed: () { - onAdd(clipboardUrl.toString()); - }, - ), - duration: duration, - ) - : SnackBar( - content: const Text('Want to open a new tab?'), - action: SnackBarAction( - label: 'New Tab', - onPressed: () { - onAdd(null); - }, - ), - duration: duration, - ); + final snackBar = (clipboardUrl != null) + ? SnackBar( + content: const Text('Want to open link from clipboard?'), + action: SnackBarAction( + label: 'Open', + onPressed: () { + onAdd(clipboardUrl.toString()); + }, + ), + duration: duration, + ) + : SnackBar( + content: const Text('Want to open a new tab?'), + action: SnackBarAction( + label: 'New Tab', + onPressed: () { + onAdd(null); + }, + ), + duration: duration, + ); if (context.mounted) { ScaffoldMessenger.of(context).showSnackBar(snackBar); diff --git a/app/pubspec.yaml b/app/pubspec.yaml index d0bf3148..6d80a3ab 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 0.7.0+15 environment: - sdk: '>=3.7.0 <4.0.0' + sdk: '>=3.8.0 <4.0.0' dependencies: background_fetch: ^1.3.8 diff --git a/packages/flutter_mozilla_components/example/lib/main.dart b/packages/flutter_mozilla_components/example/lib/main.dart index 192fd7f8..00bdf82b 100644 --- a/packages/flutter_mozilla_components/example/lib/main.dart +++ b/packages/flutter_mozilla_components/example/lib/main.dart @@ -21,13 +21,12 @@ class MyAppState extends State { title: const Text('Native Fragment Example'), actions: [ MenuAnchor( - builder: - (context, controller, child) => IconButton( - onPressed: () { - controller.open(); - }, - icon: const Icon(Icons.menu), - ), + builder: (context, controller, child) => IconButton( + onPressed: () { + controller.open(); + }, + icon: const Icon(Icons.menu), + ), menuChildren: [ MenuItemButton( onPressed: () async { diff --git a/packages/flutter_mozilla_components/example/pubspec.yaml b/packages/flutter_mozilla_components/example/pubspec.yaml index a57b4679..cedf4f14 100644 --- a/packages/flutter_mozilla_components/example/pubspec.yaml +++ b/packages/flutter_mozilla_components/example/pubspec.yaml @@ -5,7 +5,7 @@ description: "Demonstrates how to use the flutter_mozilla_components plugin." publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: '>=3.7.0 <4.0.0' + sdk: '>=3.8.0 <4.0.0' dependencies: flutter: diff --git a/packages/flutter_mozilla_components/lib/src/data/models/source.dart b/packages/flutter_mozilla_components/lib/src/data/models/source.dart index eb43425a..7c32e2f1 100644 --- a/packages/flutter_mozilla_components/lib/src/data/models/source.dart +++ b/packages/flutter_mozilla_components/lib/src/data/models/source.dart @@ -42,13 +42,12 @@ abstract class Source { String? packageId, int? packageCategory, ) { - final caller = - packageId != null - ? ExternalPackage( - packageId: packageId, - category: PackageCategory.fromInt(packageCategory).toValue(), - ) - : null; + final caller = packageId != null + ? ExternalPackage( + packageId: packageId, + category: PackageCategory.fromInt(packageCategory).toValue(), + ) + : null; switch (sourceId) { case 1: diff --git a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_browser_extension.dart b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_browser_extension.dart index db221573..c3e5510b 100644 --- a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_browser_extension.dart +++ b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_browser_extension.dart @@ -25,18 +25,17 @@ class GeckoBrowserExtensionService extends BrowserExtensionEvents { .getMarkdown(htmlList) .timeout(timeout); - final results = - markdownResult - .cast() - .map( - (result) => TurndownResults( - // ignore: avoid_dynamic_calls valid - markdown: result['fullContentMarkdown'] as String, - // ignore: avoid_dynamic_calls valid - plain: result['fullContentPlain'] as String, - ), - ) - .toList(); + final results = markdownResult + .cast() + .map( + (result) => TurndownResults( + // ignore: avoid_dynamic_calls valid + markdown: result['fullContentMarkdown'] as String, + // ignore: avoid_dynamic_calls valid + plain: result['fullContentPlain'] as String, + ), + ) + .toList(); return results; } diff --git a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_pref.dart b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_pref.dart index ae4c6e86..458215b1 100644 --- a/packages/flutter_mozilla_components/lib/src/domain/services/gecko_pref.dart +++ b/packages/flutter_mozilla_components/lib/src/domain/services/gecko_pref.dart @@ -12,17 +12,16 @@ class GeckoPrefService { } Future> applyPrefs(Map prefs) { - final buffer = - prefs.entries.map((pref) { - final value = switch (pref.value) { - final bool x => '$x', - final int x => '$x', - final String x => '"$x"', - _ => throw Exception('Unknow pref type'), - }; + final buffer = prefs.entries.map((pref) { + final value = switch (pref.value) { + final bool x => '$x', + final int x => '$x', + final String x => '"$x"', + _ => throw Exception('Unknow pref type'), + }; - return 'user_pref("${pref.key}", $value);'; - }).join(); + return 'user_pref("${pref.key}", $value);'; + }).join(); return _apiInstance.applyPrefs(buffer); } diff --git a/packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart b/packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart index b90ee4d6..63084863 100644 --- a/packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart +++ b/packages/flutter_mozilla_components/lib/src/pigeons/gecko.g.dart @@ -15,7 +15,11 @@ PlatformException _createConnectionError(String channelName) { ); } -List wrapResponse({Object? result, PlatformException? error, bool empty = false}) { +List wrapResponse({ + Object? result, + PlatformException? error, + bool empty = false, +}) { if (empty) { return []; } @@ -24,27 +28,33 @@ List wrapResponse({Object? result, PlatformException? error, bool empty } return [error.code, error.message, error.details]; } + bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { return a.length == b.length && - a.indexed - .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1])); + a.indexed.every( + ((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]), + ); } if (a is Map && b is Map) { - return a.length == b.length && a.entries.every((MapEntry entry) => - (b as Map).containsKey(entry.key) && - _deepEquals(entry.value, b[entry.key])); + return a.length == b.length && + a.entries.every( + (MapEntry entry) => + (b as Map).containsKey(entry.key) && + _deepEquals(entry.value, b[entry.key]), + ); } return a == b; } - /// Indicates what location the tabs should be restored at enum RestoreLocation { /// Restore tabs at the beginning of the tab list beginning, + /// Restore tabs at the end of the tab list end, + /// Restore tabs at a specific index in the tab list atIndex, } @@ -65,73 +75,41 @@ enum IconType { /// Supported sizes. /// /// We are trying to limit the supported sizes in order to optimize our caching strategy. -enum IconSize { - defaultSize, - launcher, - launcherAdaptive, -} +enum IconSize { defaultSize, launcher, launcherAdaptive } /// The source of an [Icon]. enum IconSource { /// This icon was generated. generator, + /// This icon was downloaded. download, + /// This icon was inlined in the document. inline, + /// This icon was loaded from an in-memory cache. memory, + /// This icon was loaded from a disk cache. disk, } -enum CookieSameSiteStatus { - noRestriction, - lax, - strict, - unspecified, -} +enum CookieSameSiteStatus { noRestriction, lax, strict, unspecified } -enum SelectionPattern { - phone, - email, -} +enum SelectionPattern { phone, email } -enum WebExtensionActionType { - browser, - page, -} +enum WebExtensionActionType { browser, page } -enum GeckoSuggestionType { - session, - clipboard, - history, -} +enum GeckoSuggestionType { session, clipboard, history } -enum TrackingProtectionPolicy { - none, - recommended, - strict, - custom, -} +enum TrackingProtectionPolicy { none, recommended, strict, custom } -enum HttpsOnlyMode { - disabled, - privateOnly, - enabled, -} +enum HttpsOnlyMode { disabled, privateOnly, enabled } -enum ColorScheme { - system, - light, - dark, -} +enum ColorScheme { system, light, dark } -enum CookieBannerHandlingMode { - disabled, - rejectAll, - rejectOrAcceptAll, -} +enum CookieBannerHandlingMode { disabled, rejectAll, rejectOrAcceptAll } enum WebContentIsolationStrategy { isolateNothing, @@ -143,15 +121,20 @@ enum WebContentIsolationStrategy { enum DownloadStatus { /// Indicates that the download is in the first state after creation but not yet [DOWNLOADING]. initiated, + /// Indicates that an [INITIATED] download is now actively being downloaded. downloading, + /// Indicates that the download that has been [DOWNLOADING] has been paused. paused, + /// Indicates that the download that has been [DOWNLOADING] has been cancelled. cancelled, + /// Indicates that the download that has been [DOWNLOADING] has moved to failed because /// something unexpected has happened. failed, + /// Indicates that the [DOWNLOADING] download has been completed. completed, } @@ -161,26 +144,21 @@ enum DownloadStatus { /// @property downloadModel If the necessary models should be downloaded on request. If false, then /// the translation will not complete and throw an exception if the models are not already available. class TranslationOptions { - TranslationOptions({ - required this.downloadModel, - }); + TranslationOptions({required this.downloadModel}); bool downloadModel; List _toList() { - return [ - downloadModel, - ]; + return [downloadModel]; } Object encode() { - return _toList(); } + return _toList(); + } static TranslationOptions decode(Object result) { result as List; - return TranslationOptions( - downloadModel: result[0]! as bool, - ); + return TranslationOptions(downloadModel: result[0]! as bool); } @override @@ -197,8 +175,7 @@ class TranslationOptions { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// Value type that represents the state of reader mode/view. @@ -251,7 +228,8 @@ class ReaderState { } Object encode() { - return _toList(); } + return _toList(); + } static ReaderState decode(Object result) { result as List; @@ -280,8 +258,7 @@ class ReaderState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// Details about the last playing media in this tab. @@ -311,15 +288,12 @@ class LastMediaAccessState { bool mediaSessionActive; List _toList() { - return [ - lastMediaUrl, - lastMediaAccess, - mediaSessionActive, - ]; + return [lastMediaUrl, lastMediaAccess, mediaSessionActive]; } Object encode() { - return _toList(); } + return _toList(); + } static LastMediaAccessState decode(Object result) { result as List; @@ -344,8 +318,7 @@ class LastMediaAccessState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// Represents a set of history metadata values that uniquely identify a record. Note that @@ -353,11 +326,7 @@ class LastMediaAccessState { /// created, depending on the de-bouncing logic of the underlying storage i.e. recording history /// metadata observations with the exact same values may be combined into a single record. class HistoryMetadataKey { - HistoryMetadataKey({ - required this.url, - this.searchTerm, - this.referrerUrl, - }); + HistoryMetadataKey({required this.url, this.searchTerm, this.referrerUrl}); /// A url of the page. String url; @@ -372,15 +341,12 @@ class HistoryMetadataKey { String? referrerUrl; List _toList() { - return [ - url, - searchTerm, - referrerUrl, - ]; + return [url, searchTerm, referrerUrl]; } Object encode() { - return _toList(); } + return _toList(); + } static HistoryMetadataKey decode(Object result) { result as List; @@ -405,31 +371,25 @@ class HistoryMetadataKey { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class PackageCategoryValue { - PackageCategoryValue({ - required this.value, - }); + PackageCategoryValue({required this.value}); int value; List _toList() { - return [ - value, - ]; + return [value]; } Object encode() { - return _toList(); } + return _toList(); + } static PackageCategoryValue decode(Object result) { result as List; - return PackageCategoryValue( - value: result[0]! as int, - ); + return PackageCategoryValue(value: result[0]! as int); } @override @@ -446,16 +406,12 @@ class PackageCategoryValue { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// Describes an external package. class ExternalPackage { - ExternalPackage({ - required this.packageId, - required this.category, - }); + ExternalPackage({required this.packageId, required this.category}); /// An Android package id. String packageId; @@ -464,14 +420,12 @@ class ExternalPackage { PackageCategoryValue category; List _toList() { - return [ - packageId, - category, - ]; + return [packageId, category]; } Object encode() { - return _toList(); } + return _toList(); + } static ExternalPackage decode(Object result) { result as List; @@ -495,31 +449,25 @@ class ExternalPackage { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class LoadUrlFlagsValue { - LoadUrlFlagsValue({ - required this.value, - }); + LoadUrlFlagsValue({required this.value}); int value; List _toList() { - return [ - value, - ]; + return [value]; } Object encode() { - return _toList(); } + return _toList(); + } static LoadUrlFlagsValue decode(Object result) { result as List; - return LoadUrlFlagsValue( - value: result[0]! as int, - ); + return LoadUrlFlagsValue(value: result[0]! as int); } @override @@ -536,29 +484,23 @@ class LoadUrlFlagsValue { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class SourceValue { - SourceValue({ - required this.id, - this.caller, - }); + SourceValue({required this.id, this.caller}); int id; ExternalPackage? caller; List _toList() { - return [ - id, - caller, - ]; + return [id, caller]; } Object encode() { - return _toList(); } + return _toList(); + } static SourceValue decode(Object result) { result as List; @@ -582,8 +524,7 @@ class SourceValue { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// A tab that is no longer open and in the list of tabs, but that can be restored (recovered) at @@ -678,7 +619,8 @@ class TabState { } Object encode() { - return _toList(); } + return _toList(); + } static TabState decode(Object result) { result as List; @@ -715,16 +657,12 @@ class TabState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// A recoverable version of [TabState]. class RecoverableTab { - RecoverableTab({ - this.engineSessionStateJson, - required this.state, - }); + RecoverableTab({this.engineSessionStateJson, required this.state}); /// The [EngineSessionState] needed for restoring the previous state of this tab. String? engineSessionStateJson; @@ -733,14 +671,12 @@ class RecoverableTab { TabState state; List _toList() { - return [ - engineSessionStateJson, - state, - ]; + return [engineSessionStateJson, state]; } Object encode() { - return _toList(); } + return _toList(); + } static RecoverableTab decode(Object result) { result as List; @@ -764,16 +700,12 @@ class RecoverableTab { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// A restored browser state, read from disk. class RecoverableBrowserState { - RecoverableBrowserState({ - required this.tabs, - this.selectedTabId, - }); + RecoverableBrowserState({required this.tabs, this.selectedTabId}); /// The list of restored tabs. List tabs; @@ -782,14 +714,12 @@ class RecoverableBrowserState { String? selectedTabId; List _toList() { - return [ - tabs, - selectedTabId, - ]; + return [tabs, selectedTabId]; } Object encode() { - return _toList(); } + return _toList(); + } static RecoverableBrowserState decode(Object result) { result as List; @@ -813,8 +743,7 @@ class RecoverableBrowserState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// A request to load an [Icon]. @@ -841,18 +770,12 @@ class IconRequest { bool waitOnNetworkLoad; List _toList() { - return [ - url, - size, - resources, - color, - isPrivate, - waitOnNetworkLoad, - ]; + return [url, size, resources, color, isPrivate, waitOnNetworkLoad]; } Object encode() { - return _toList(); } + return _toList(); + } static IconRequest decode(Object result) { result as List; @@ -880,36 +803,27 @@ class IconRequest { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class ResourceSize { - ResourceSize({ - required this.height, - required this.width, - }); + ResourceSize({required this.height, required this.width}); int height; int width; List _toList() { - return [ - height, - width, - ]; + return [height, width]; } Object encode() { - return _toList(); } + return _toList(); + } static ResourceSize decode(Object result) { result as List; - return ResourceSize( - height: result[0]! as int, - width: result[1]! as int, - ); + return ResourceSize(height: result[0]! as int, width: result[1]! as int); } @override @@ -926,8 +840,7 @@ class ResourceSize { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// An icon resource that can be loaded. @@ -951,17 +864,12 @@ class Resource { bool maskable; List _toList() { - return [ - url, - type, - sizes, - mimeType, - maskable, - ]; + return [url, type, sizes, mimeType, maskable]; } Object encode() { - return _toList(); } + return _toList(); + } static Resource decode(Object result) { result as List; @@ -988,8 +896,7 @@ class Resource { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// An [Icon] returned by [BrowserIcons] after processing an [IconRequest] @@ -1014,16 +921,12 @@ class IconResult { bool maskable; List _toList() { - return [ - image, - color, - source, - maskable, - ]; + return [image, color, source, maskable]; } Object encode() { - return _toList(); } + return _toList(); + } static IconResult decode(Object result) { result as List; @@ -1049,31 +952,25 @@ class IconResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class CookiePartitionKey { - CookiePartitionKey({ - required this.topLevelSite, - }); + CookiePartitionKey({required this.topLevelSite}); String topLevelSite; List _toList() { - return [ - topLevelSite, - ]; + return [topLevelSite]; } Object encode() { - return _toList(); } + return _toList(); + } static CookiePartitionKey decode(Object result) { result as List; - return CookiePartitionKey( - topLevelSite: result[0]! as String, - ); + return CookiePartitionKey(topLevelSite: result[0]! as String); } @override @@ -1090,8 +987,7 @@ class CookiePartitionKey { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class Cookie { @@ -1156,7 +1052,8 @@ class Cookie { } Object encode() { - return _toList(); } + return _toList(); + } static Cookie decode(Object result) { result as List; @@ -1191,36 +1088,27 @@ class Cookie { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class HistoryItem { - HistoryItem({ - required this.url, - required this.title, - }); + HistoryItem({required this.url, required this.title}); String url; String title; List _toList() { - return [ - url, - title, - ]; + return [url, title]; } Object encode() { - return _toList(); } + return _toList(); + } static HistoryItem decode(Object result) { result as List; - return HistoryItem( - url: result[0]! as String, - title: result[1]! as String, - ); + return HistoryItem(url: result[0]! as String, title: result[1]! as String); } @override @@ -1237,8 +1125,7 @@ class HistoryItem { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class HistoryState { @@ -1258,16 +1145,12 @@ class HistoryState { bool canGoForward; List _toList() { - return [ - items, - currentIndex, - canGoBack, - canGoForward, - ]; + return [items, currentIndex, canGoBack, canGoForward]; } Object encode() { - return _toList(); } + return _toList(); + } static HistoryState decode(Object result) { result as List; @@ -1293,15 +1176,11 @@ class HistoryState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class ReaderableState { - ReaderableState({ - required this.readerable, - required this.active, - }); + ReaderableState({required this.readerable, required this.active}); /// Whether or not the current page can be transformed to /// be displayed in a reader view. @@ -1311,14 +1190,12 @@ class ReaderableState { bool active; List _toList() { - return [ - readerable, - active, - ]; + return [readerable, active]; } Object encode() { - return _toList(); } + return _toList(); + } static ReaderableState decode(Object result) { result as List; @@ -1342,8 +1219,7 @@ class ReaderableState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class SecurityInfoState { @@ -1360,15 +1236,12 @@ class SecurityInfoState { String issuer; List _toList() { - return [ - secure, - host, - issuer, - ]; + return [secure, host, issuer]; } Object encode() { - return _toList(); } + return _toList(); + } static SecurityInfoState decode(Object result) { result as List; @@ -1393,8 +1266,7 @@ class SecurityInfoState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class TabContentState { @@ -1439,7 +1311,8 @@ class TabContentState { } Object encode() { - return _toList(); } + return _toList(); + } static TabContentState decode(Object result) { result as List; @@ -1469,8 +1342,7 @@ class TabContentState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class FindResultState { @@ -1487,15 +1359,12 @@ class FindResultState { bool isDoneCounting; List _toList() { - return [ - activeMatchOrdinal, - numberOfMatches, - isDoneCounting, - ]; + return [activeMatchOrdinal, numberOfMatches, isDoneCounting]; } Object encode() { - return _toList(); } + return _toList(); + } static FindResultState decode(Object result) { result as List; @@ -1520,16 +1389,11 @@ class FindResultState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class CustomSelectionAction { - CustomSelectionAction({ - required this.id, - required this.title, - this.pattern, - }); + CustomSelectionAction({required this.id, required this.title, this.pattern}); String id; @@ -1538,15 +1402,12 @@ class CustomSelectionAction { SelectionPattern? pattern; List _toList() { - return [ - id, - title, - pattern, - ]; + return [id, title, pattern]; } Object encode() { - return _toList(); } + return _toList(); + } static CustomSelectionAction decode(Object result) { result as List; @@ -1571,8 +1432,7 @@ class CustomSelectionAction { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class WebExtensionData { @@ -1609,7 +1469,8 @@ class WebExtensionData { } Object encode() { - return _toList(); } + return _toList(); + } static WebExtensionData decode(Object result) { result as List; @@ -1637,8 +1498,7 @@ class WebExtensionData { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class GeckoSuggestion { @@ -1667,19 +1527,12 @@ class GeckoSuggestion { Uint8List? icon; List _toList() { - return [ - id, - type, - score, - title, - description, - editSuggestion, - icon, - ]; + return [id, type, score, title, description, editSuggestion, icon]; } Object encode() { - return _toList(); } + return _toList(); + } static GeckoSuggestion decode(Object result) { result as List; @@ -1708,8 +1561,7 @@ class GeckoSuggestion { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class TabContent { @@ -1746,7 +1598,8 @@ class TabContent { } Object encode() { - return _toList(); } + return _toList(); + } static TabContent decode(Object result) { result as List; @@ -1774,8 +1627,7 @@ class TabContent { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class GeckoEngineSettings { @@ -1832,7 +1684,8 @@ class GeckoEngineSettings { } Object encode() { - return _toList(); } + return _toList(); + } static GeckoEngineSettings decode(Object result) { result as List; @@ -1843,7 +1696,8 @@ class GeckoEngineSettings { globalPrivacyControlEnabled: result[3] as bool?, preferredColorScheme: result[4] as ColorScheme?, cookieBannerHandlingMode: result[5] as CookieBannerHandlingMode?, - cookieBannerHandlingModePrivateBrowsing: result[6] as CookieBannerHandlingMode?, + cookieBannerHandlingModePrivateBrowsing: + result[6] as CookieBannerHandlingMode?, cookieBannerHandlingGlobalRules: result[7] as bool?, cookieBannerHandlingGlobalRulesSubFrames: result[8] as bool?, webContentIsolationStrategy: result[9] as WebContentIsolationStrategy?, @@ -1865,8 +1719,7 @@ class GeckoEngineSettings { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class AutocompleteResult { @@ -1889,17 +1742,12 @@ class AutocompleteResult { int totalItems; List _toList() { - return [ - input, - text, - url, - source, - totalItems, - ]; + return [input, text, url, source, totalItems]; } Object encode() { - return _toList(); } + return _toList(); + } static AutocompleteResult decode(Object result) { result as List; @@ -1926,37 +1774,30 @@ class AutocompleteResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// Represents all the different supported types of data that can be found from long clicking /// an element. -sealed class HitResult { -} +sealed class HitResult {} /// Default type if we're unable to match the type to anything. It may or may not have a src. class UnknownHitResult extends HitResult { - UnknownHitResult({ - required this.src, - }); + UnknownHitResult({required this.src}); String src; List _toList() { - return [ - src, - ]; + return [src]; } Object encode() { - return _toList(); } + return _toList(); + } static UnknownHitResult decode(Object result) { result as List; - return UnknownHitResult( - src: result[0]! as String, - ); + return UnknownHitResult(src: result[0]! as String); } @override @@ -1973,30 +1814,24 @@ class UnknownHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// If the HTML element was of type 'HTMLImageElement'. class ImageHitResult extends HitResult { - ImageHitResult({ - required this.src, - this.title, - }); + ImageHitResult({required this.src, this.title}); String src; String? title; List _toList() { - return [ - src, - title, - ]; + return [src, title]; } Object encode() { - return _toList(); } + return _toList(); + } static ImageHitResult decode(Object result) { result as List; @@ -2020,30 +1855,24 @@ class ImageHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// If the HTML element was of type 'HTMLVideoElement'. class VideoHitResult extends HitResult { - VideoHitResult({ - required this.src, - this.title, - }); + VideoHitResult({required this.src, this.title}); String src; String? title; List _toList() { - return [ - src, - title, - ]; + return [src, title]; } Object encode() { - return _toList(); } + return _toList(); + } static VideoHitResult decode(Object result) { result as List; @@ -2067,30 +1896,24 @@ class VideoHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// If the HTML element was of type 'HTMLAudioElement'. class AudioHitResult extends HitResult { - AudioHitResult({ - required this.src, - this.title, - }); + AudioHitResult({required this.src, this.title}); String src; String? title; List _toList() { - return [ - src, - title, - ]; + return [src, title]; } Object encode() { - return _toList(); } + return _toList(); + } static AudioHitResult decode(Object result) { result as List; @@ -2114,30 +1937,24 @@ class AudioHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// If the HTML element was of type 'HTMLImageElement' and contained a URI. class ImageSrcHitResult extends HitResult { - ImageSrcHitResult({ - required this.src, - required this.uri, - }); + ImageSrcHitResult({required this.src, required this.uri}); String src; String uri; List _toList() { - return [ - src, - uri, - ]; + return [src, uri]; } Object encode() { - return _toList(); } + return _toList(); + } static ImageSrcHitResult decode(Object result) { result as List; @@ -2161,32 +1978,26 @@ class ImageSrcHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// The type used if the URI is prepended with 'tel:'. class PhoneHitResult extends HitResult { - PhoneHitResult({ - required this.src, - }); + PhoneHitResult({required this.src}); String src; List _toList() { - return [ - src, - ]; + return [src]; } Object encode() { - return _toList(); } + return _toList(); + } static PhoneHitResult decode(Object result) { result as List; - return PhoneHitResult( - src: result[0]! as String, - ); + return PhoneHitResult(src: result[0]! as String); } @override @@ -2203,32 +2014,26 @@ class PhoneHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// The type used if the URI is prepended with 'mailto:'. class EmailHitResult extends HitResult { - EmailHitResult({ - required this.src, - }); + EmailHitResult({required this.src}); String src; List _toList() { - return [ - src, - ]; + return [src]; } Object encode() { - return _toList(); } + return _toList(); + } static EmailHitResult decode(Object result) { result as List; - return EmailHitResult( - src: result[0]! as String, - ); + return EmailHitResult(src: result[0]! as String); } @override @@ -2245,32 +2050,26 @@ class EmailHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } /// The type used if the URI is prepended with 'geo:'. class GeoHitResult extends HitResult { - GeoHitResult({ - required this.src, - }); + GeoHitResult({required this.src}); String src; List _toList() { - return [ - src, - ]; + return [src]; } Object encode() { - return _toList(); } + return _toList(); + } static GeoHitResult decode(Object result) { result as List; - return GeoHitResult( - src: result[0]! as String, - ); + return GeoHitResult(src: result[0]! as String); } @override @@ -2287,8 +2086,7 @@ class GeoHitResult extends HitResult { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class DownloadState { @@ -2369,7 +2167,8 @@ class DownloadState { } Object encode() { - return _toList(); } + return _toList(); + } static DownloadState decode(Object result) { result as List; @@ -2408,8 +2207,7 @@ class DownloadState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } class ShareInternetResourceState { @@ -2429,16 +2227,12 @@ class ShareInternetResourceState { String? referrerUrl; List _toList() { - return [ - url, - contentType, - private, - referrerUrl, - ]; + return [url, contentType, private, referrerUrl]; } Object encode() { - return _toList(); } + return _toList(); + } static ShareInternetResourceState decode(Object result) { result as List; @@ -2453,7 +2247,8 @@ class ShareInternetResourceState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes bool operator ==(Object other) { - if (other is! ShareInternetResourceState || other.runtimeType != runtimeType) { + if (other is! ShareInternetResourceState || + other.runtimeType != runtimeType) { return false; } if (identical(this, other)) { @@ -2464,11 +2259,9 @@ class ShareInternetResourceState { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } - class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -2476,163 +2269,163 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is RestoreLocation) { + } else if (value is RestoreLocation) { buffer.putUint8(129); writeValue(buffer, value.index); - } else if (value is IconType) { + } else if (value is IconType) { buffer.putUint8(130); writeValue(buffer, value.index); - } else if (value is IconSize) { + } else if (value is IconSize) { buffer.putUint8(131); writeValue(buffer, value.index); - } else if (value is IconSource) { + } else if (value is IconSource) { buffer.putUint8(132); writeValue(buffer, value.index); - } else if (value is CookieSameSiteStatus) { + } else if (value is CookieSameSiteStatus) { buffer.putUint8(133); writeValue(buffer, value.index); - } else if (value is SelectionPattern) { + } else if (value is SelectionPattern) { buffer.putUint8(134); writeValue(buffer, value.index); - } else if (value is WebExtensionActionType) { + } else if (value is WebExtensionActionType) { buffer.putUint8(135); writeValue(buffer, value.index); - } else if (value is GeckoSuggestionType) { + } else if (value is GeckoSuggestionType) { buffer.putUint8(136); writeValue(buffer, value.index); - } else if (value is TrackingProtectionPolicy) { + } else if (value is TrackingProtectionPolicy) { buffer.putUint8(137); writeValue(buffer, value.index); - } else if (value is HttpsOnlyMode) { + } else if (value is HttpsOnlyMode) { buffer.putUint8(138); writeValue(buffer, value.index); - } else if (value is ColorScheme) { + } else if (value is ColorScheme) { buffer.putUint8(139); writeValue(buffer, value.index); - } else if (value is CookieBannerHandlingMode) { + } else if (value is CookieBannerHandlingMode) { buffer.putUint8(140); writeValue(buffer, value.index); - } else if (value is WebContentIsolationStrategy) { + } else if (value is WebContentIsolationStrategy) { buffer.putUint8(141); writeValue(buffer, value.index); - } else if (value is DownloadStatus) { + } else if (value is DownloadStatus) { buffer.putUint8(142); writeValue(buffer, value.index); - } else if (value is TranslationOptions) { + } else if (value is TranslationOptions) { buffer.putUint8(143); writeValue(buffer, value.encode()); - } else if (value is ReaderState) { + } else if (value is ReaderState) { buffer.putUint8(144); writeValue(buffer, value.encode()); - } else if (value is LastMediaAccessState) { + } else if (value is LastMediaAccessState) { buffer.putUint8(145); writeValue(buffer, value.encode()); - } else if (value is HistoryMetadataKey) { + } else if (value is HistoryMetadataKey) { buffer.putUint8(146); writeValue(buffer, value.encode()); - } else if (value is PackageCategoryValue) { + } else if (value is PackageCategoryValue) { buffer.putUint8(147); writeValue(buffer, value.encode()); - } else if (value is ExternalPackage) { + } else if (value is ExternalPackage) { buffer.putUint8(148); writeValue(buffer, value.encode()); - } else if (value is LoadUrlFlagsValue) { + } else if (value is LoadUrlFlagsValue) { buffer.putUint8(149); writeValue(buffer, value.encode()); - } else if (value is SourceValue) { + } else if (value is SourceValue) { buffer.putUint8(150); writeValue(buffer, value.encode()); - } else if (value is TabState) { + } else if (value is TabState) { buffer.putUint8(151); writeValue(buffer, value.encode()); - } else if (value is RecoverableTab) { + } else if (value is RecoverableTab) { buffer.putUint8(152); writeValue(buffer, value.encode()); - } else if (value is RecoverableBrowserState) { + } else if (value is RecoverableBrowserState) { buffer.putUint8(153); writeValue(buffer, value.encode()); - } else if (value is IconRequest) { + } else if (value is IconRequest) { buffer.putUint8(154); writeValue(buffer, value.encode()); - } else if (value is ResourceSize) { + } else if (value is ResourceSize) { buffer.putUint8(155); writeValue(buffer, value.encode()); - } else if (value is Resource) { + } else if (value is Resource) { buffer.putUint8(156); writeValue(buffer, value.encode()); - } else if (value is IconResult) { + } else if (value is IconResult) { buffer.putUint8(157); writeValue(buffer, value.encode()); - } else if (value is CookiePartitionKey) { + } else if (value is CookiePartitionKey) { buffer.putUint8(158); writeValue(buffer, value.encode()); - } else if (value is Cookie) { + } else if (value is Cookie) { buffer.putUint8(159); writeValue(buffer, value.encode()); - } else if (value is HistoryItem) { + } else if (value is HistoryItem) { buffer.putUint8(160); writeValue(buffer, value.encode()); - } else if (value is HistoryState) { + } else if (value is HistoryState) { buffer.putUint8(161); writeValue(buffer, value.encode()); - } else if (value is ReaderableState) { + } else if (value is ReaderableState) { buffer.putUint8(162); writeValue(buffer, value.encode()); - } else if (value is SecurityInfoState) { + } else if (value is SecurityInfoState) { buffer.putUint8(163); writeValue(buffer, value.encode()); - } else if (value is TabContentState) { + } else if (value is TabContentState) { buffer.putUint8(164); writeValue(buffer, value.encode()); - } else if (value is FindResultState) { + } else if (value is FindResultState) { buffer.putUint8(165); writeValue(buffer, value.encode()); - } else if (value is CustomSelectionAction) { + } else if (value is CustomSelectionAction) { buffer.putUint8(166); writeValue(buffer, value.encode()); - } else if (value is WebExtensionData) { + } else if (value is WebExtensionData) { buffer.putUint8(167); writeValue(buffer, value.encode()); - } else if (value is GeckoSuggestion) { + } else if (value is GeckoSuggestion) { buffer.putUint8(168); writeValue(buffer, value.encode()); - } else if (value is TabContent) { + } else if (value is TabContent) { buffer.putUint8(169); writeValue(buffer, value.encode()); - } else if (value is GeckoEngineSettings) { + } else if (value is GeckoEngineSettings) { buffer.putUint8(170); writeValue(buffer, value.encode()); - } else if (value is AutocompleteResult) { + } else if (value is AutocompleteResult) { buffer.putUint8(171); writeValue(buffer, value.encode()); - } else if (value is UnknownHitResult) { + } else if (value is UnknownHitResult) { buffer.putUint8(172); writeValue(buffer, value.encode()); - } else if (value is ImageHitResult) { + } else if (value is ImageHitResult) { buffer.putUint8(173); writeValue(buffer, value.encode()); - } else if (value is VideoHitResult) { + } else if (value is VideoHitResult) { buffer.putUint8(174); writeValue(buffer, value.encode()); - } else if (value is AudioHitResult) { + } else if (value is AudioHitResult) { buffer.putUint8(175); writeValue(buffer, value.encode()); - } else if (value is ImageSrcHitResult) { + } else if (value is ImageSrcHitResult) { buffer.putUint8(176); writeValue(buffer, value.encode()); - } else if (value is PhoneHitResult) { + } else if (value is PhoneHitResult) { buffer.putUint8(177); writeValue(buffer, value.encode()); - } else if (value is EmailHitResult) { + } else if (value is EmailHitResult) { buffer.putUint8(178); writeValue(buffer, value.encode()); - } else if (value is GeoHitResult) { + } else if (value is GeoHitResult) { buffer.putUint8(179); writeValue(buffer, value.encode()); - } else if (value is DownloadState) { + } else if (value is DownloadState) { buffer.putUint8(180); writeValue(buffer, value.encode()); - } else if (value is ShareInternetResourceState) { + } else if (value is ShareInternetResourceState) { buffer.putUint8(181); writeValue(buffer, value.encode()); } else { @@ -2643,125 +2436,125 @@ class _PigeonCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 129: + case 129: final int? value = readValue(buffer) as int?; return value == null ? null : RestoreLocation.values[value]; - case 130: + case 130: final int? value = readValue(buffer) as int?; return value == null ? null : IconType.values[value]; - case 131: + case 131: final int? value = readValue(buffer) as int?; return value == null ? null : IconSize.values[value]; - case 132: + case 132: final int? value = readValue(buffer) as int?; return value == null ? null : IconSource.values[value]; - case 133: + case 133: final int? value = readValue(buffer) as int?; return value == null ? null : CookieSameSiteStatus.values[value]; - case 134: + case 134: final int? value = readValue(buffer) as int?; return value == null ? null : SelectionPattern.values[value]; - case 135: + case 135: final int? value = readValue(buffer) as int?; return value == null ? null : WebExtensionActionType.values[value]; - case 136: + case 136: final int? value = readValue(buffer) as int?; return value == null ? null : GeckoSuggestionType.values[value]; - case 137: + case 137: final int? value = readValue(buffer) as int?; return value == null ? null : TrackingProtectionPolicy.values[value]; - case 138: + case 138: final int? value = readValue(buffer) as int?; return value == null ? null : HttpsOnlyMode.values[value]; - case 139: + case 139: final int? value = readValue(buffer) as int?; return value == null ? null : ColorScheme.values[value]; - case 140: + case 140: final int? value = readValue(buffer) as int?; return value == null ? null : CookieBannerHandlingMode.values[value]; - case 141: + case 141: final int? value = readValue(buffer) as int?; return value == null ? null : WebContentIsolationStrategy.values[value]; - case 142: + case 142: final int? value = readValue(buffer) as int?; return value == null ? null : DownloadStatus.values[value]; - case 143: + case 143: return TranslationOptions.decode(readValue(buffer)!); - case 144: + case 144: return ReaderState.decode(readValue(buffer)!); - case 145: + case 145: return LastMediaAccessState.decode(readValue(buffer)!); - case 146: + case 146: return HistoryMetadataKey.decode(readValue(buffer)!); - case 147: + case 147: return PackageCategoryValue.decode(readValue(buffer)!); - case 148: + case 148: return ExternalPackage.decode(readValue(buffer)!); - case 149: + case 149: return LoadUrlFlagsValue.decode(readValue(buffer)!); - case 150: + case 150: return SourceValue.decode(readValue(buffer)!); - case 151: + case 151: return TabState.decode(readValue(buffer)!); - case 152: + case 152: return RecoverableTab.decode(readValue(buffer)!); - case 153: + case 153: return RecoverableBrowserState.decode(readValue(buffer)!); - case 154: + case 154: return IconRequest.decode(readValue(buffer)!); - case 155: + case 155: return ResourceSize.decode(readValue(buffer)!); - case 156: + case 156: return Resource.decode(readValue(buffer)!); - case 157: + case 157: return IconResult.decode(readValue(buffer)!); - case 158: + case 158: return CookiePartitionKey.decode(readValue(buffer)!); - case 159: + case 159: return Cookie.decode(readValue(buffer)!); - case 160: + case 160: return HistoryItem.decode(readValue(buffer)!); - case 161: + case 161: return HistoryState.decode(readValue(buffer)!); - case 162: + case 162: return ReaderableState.decode(readValue(buffer)!); - case 163: + case 163: return SecurityInfoState.decode(readValue(buffer)!); - case 164: + case 164: return TabContentState.decode(readValue(buffer)!); - case 165: + case 165: return FindResultState.decode(readValue(buffer)!); - case 166: + case 166: return CustomSelectionAction.decode(readValue(buffer)!); - case 167: + case 167: return WebExtensionData.decode(readValue(buffer)!); - case 168: + case 168: return GeckoSuggestion.decode(readValue(buffer)!); - case 169: + case 169: return TabContent.decode(readValue(buffer)!); - case 170: + case 170: return GeckoEngineSettings.decode(readValue(buffer)!); - case 171: + case 171: return AutocompleteResult.decode(readValue(buffer)!); - case 172: + case 172: return UnknownHitResult.decode(readValue(buffer)!); - case 173: + case 173: return ImageHitResult.decode(readValue(buffer)!); - case 174: + case 174: return VideoHitResult.decode(readValue(buffer)!); - case 175: + case 175: return AudioHitResult.decode(readValue(buffer)!); - case 176: + case 176: return ImageSrcHitResult.decode(readValue(buffer)!); - case 177: + case 177: return PhoneHitResult.decode(readValue(buffer)!); - case 178: + case 178: return EmailHitResult.decode(readValue(buffer)!); - case 179: + case 179: return GeoHitResult.decode(readValue(buffer)!); - case 180: + case 180: return DownloadState.decode(readValue(buffer)!); - case 181: + case 181: return ShareInternetResourceState.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); @@ -2773,9 +2566,13 @@ class GeckoBrowserApi { /// Constructor for [GeckoBrowserApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoBrowserApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoBrowserApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -2783,12 +2580,14 @@ class GeckoBrowserApi { final String pigeonVar_messageChannelSuffix; Future initialize() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.initialize$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.initialize$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -2806,12 +2605,14 @@ class GeckoBrowserApi { } Future showNativeFragment() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.showNativeFragment$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.showNativeFragment$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -2834,13 +2635,17 @@ class GeckoBrowserApi { } Future onTrimMemory(int level) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.onTrimMemory$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserApi.onTrimMemory$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [level], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([level]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -2861,9 +2666,13 @@ class GeckoEngineSettingsApi { /// Constructor for [GeckoEngineSettingsApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoEngineSettingsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoEngineSettingsApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -2871,13 +2680,17 @@ class GeckoEngineSettingsApi { final String pigeonVar_messageChannelSuffix; Future setDefaultSettings(GeckoEngineSettings settings) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoEngineSettingsApi.setDefaultSettings$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoEngineSettingsApi.setDefaultSettings$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [settings], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([settings]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -2894,13 +2707,17 @@ class GeckoEngineSettingsApi { } Future updateRuntimeSettings(GeckoEngineSettings settings) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoEngineSettingsApi.updateRuntimeSettings$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoEngineSettingsApi.updateRuntimeSettings$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [settings], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([settings]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -2921,23 +2738,36 @@ class GeckoSessionApi { /// Constructor for [GeckoSessionApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoSessionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoSessionApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); final String pigeonVar_messageChannelSuffix; - Future loadUrl({required String? tabId, required String url, required LoadUrlFlagsValue flags, required Map? additionalHeaders, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.loadUrl$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future loadUrl({ + required String? tabId, + required String url, + required LoadUrlFlagsValue flags, + required Map? additionalHeaders, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.loadUrl$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, url, flags, additionalHeaders], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, url, flags, additionalHeaders]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -2953,14 +2783,23 @@ class GeckoSessionApi { } } - Future loadData({required String? tabId, required String data, required String mimeType, required String encoding, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.loadData$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future loadData({ + required String? tabId, + required String data, + required String mimeType, + required String encoding, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.loadData$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, data, mimeType, encoding], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, data, mimeType, encoding]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -2976,14 +2815,21 @@ class GeckoSessionApi { } } - Future reload({required String? tabId, required LoadUrlFlagsValue flags}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.reload$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future reload({ + required String? tabId, + required LoadUrlFlagsValue flags, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.reload$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, flags], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, flags]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3000,13 +2846,17 @@ class GeckoSessionApi { } Future stopLoading({required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.stopLoading$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.stopLoading$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3022,14 +2872,21 @@ class GeckoSessionApi { } } - Future goBack({required String? tabId, required bool userInteraction}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goBack$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future goBack({ + required String? tabId, + required bool userInteraction, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goBack$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, userInteraction], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, userInteraction]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3045,14 +2902,21 @@ class GeckoSessionApi { } } - Future goForward({required String? tabId, required bool userInteraction}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goForward$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future goForward({ + required String? tabId, + required bool userInteraction, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goForward$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, userInteraction], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, userInteraction]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3068,14 +2932,21 @@ class GeckoSessionApi { } } - Future goToHistoryIndex({required int index, required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goToHistoryIndex$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future goToHistoryIndex({ + required int index, + required String? tabId, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.goToHistoryIndex$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [index, tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([index, tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3091,14 +2962,21 @@ class GeckoSessionApi { } } - Future requestDesktopSite({required String? tabId, required bool enable}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.requestDesktopSite$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future requestDesktopSite({ + required String? tabId, + required bool enable, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.requestDesktopSite$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, enable], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, enable]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3115,13 +2993,17 @@ class GeckoSessionApi { } Future exitFullscreen({required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.exitFullscreen$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.exitFullscreen$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3138,13 +3020,17 @@ class GeckoSessionApi { } Future saveToPdf({required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.saveToPdf$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.saveToPdf$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3161,13 +3047,17 @@ class GeckoSessionApi { } Future printContent({required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.printContent$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.printContent$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3183,14 +3073,23 @@ class GeckoSessionApi { } } - Future translate({required String? tabId, required String fromLanguage, required String toLanguage, required TranslationOptions? options, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.translate$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future translate({ + required String? tabId, + required String fromLanguage, + required String toLanguage, + required TranslationOptions? options, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.translate$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, fromLanguage, toLanguage, options], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, fromLanguage, toLanguage, options]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3207,13 +3106,17 @@ class GeckoSessionApi { } Future translateRestore({required String? tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.translateRestore$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.translateRestore$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3230,13 +3133,17 @@ class GeckoSessionApi { } Future crashRecovery({required List? tabIds}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.crashRecovery$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.crashRecovery$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabIds], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabIds]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3253,12 +3160,14 @@ class GeckoSessionApi { } Future purgeHistory() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.purgeHistory$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.purgeHistory$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -3275,14 +3184,21 @@ class GeckoSessionApi { } } - Future updateLastAccess({required String? tabId, required int? lastAccess}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.updateLastAccess$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future updateLastAccess({ + required String? tabId, + required int? lastAccess, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.updateLastAccess$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, lastAccess], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, lastAccess]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3299,13 +3215,17 @@ class GeckoSessionApi { } Future requestScreenshot(bool sendBack) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.requestScreenshot$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSessionApi.requestScreenshot$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [sendBack], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([sendBack]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3326,23 +3246,50 @@ class GeckoTabsApi { /// Constructor for [GeckoTabsApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoTabsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoTabsApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); final String pigeonVar_messageChannelSuffix; - Future syncEvents({required bool onSelectedTabChange, required bool onTabListChange, required bool onTabContentStateChange, required bool onIconChange, required bool onSecurityInfoStateChange, required bool onReaderableStateChange, required bool onHistoryStateChange, required bool onFindResults, required bool onThumbnailChange, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.syncEvents$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([onSelectedTabChange, onTabListChange, onTabContentStateChange, onIconChange, onSecurityInfoStateChange, onReaderableStateChange, onHistoryStateChange, onFindResults, onThumbnailChange]); + Future syncEvents({ + required bool onSelectedTabChange, + required bool onTabListChange, + required bool onTabContentStateChange, + required bool onIconChange, + required bool onSecurityInfoStateChange, + required bool onReaderableStateChange, + required bool onHistoryStateChange, + required bool onFindResults, + required bool onThumbnailChange, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.syncEvents$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel + .send([ + onSelectedTabChange, + onTabListChange, + onTabContentStateChange, + onIconChange, + onSecurityInfoStateChange, + onReaderableStateChange, + onHistoryStateChange, + onFindResults, + onThumbnailChange, + ]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3359,13 +3306,17 @@ class GeckoTabsApi { } Future selectTab({required String tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectTab$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectTab$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3382,13 +3333,17 @@ class GeckoTabsApi { } Future removeTab({required String tabId}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeTab$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeTab$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3404,14 +3359,39 @@ class GeckoTabsApi { } } - Future addTab({required String url, required bool selectTab, required bool startLoading, required String? parentId, required LoadUrlFlagsValue flags, required String? contextId, required SourceValue source, required bool private, required HistoryMetadataKey? historyMetadata, required Map? additionalHeaders, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.addTab$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([url, selectTab, startLoading, parentId, flags, contextId, source, private, historyMetadata, additionalHeaders]); + Future addTab({ + required String url, + required bool selectTab, + required bool startLoading, + required String? parentId, + required LoadUrlFlagsValue flags, + required String? contextId, + required SourceValue source, + required bool private, + required HistoryMetadataKey? historyMetadata, + required Map? additionalHeaders, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.addTab$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel + .send([ + url, + selectTab, + startLoading, + parentId, + flags, + contextId, + source, + private, + historyMetadata, + additionalHeaders, + ]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3433,13 +3413,17 @@ class GeckoTabsApi { } Future removeAllTabs({required bool recoverable}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeAllTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeAllTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [recoverable], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([recoverable]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3456,13 +3440,17 @@ class GeckoTabsApi { } Future removeTabs({required List ids}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [ids], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([ids]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3479,12 +3467,14 @@ class GeckoTabsApi { } Future removeNormalTabs() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeNormalTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removeNormalTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -3502,12 +3492,14 @@ class GeckoTabsApi { } Future removePrivateTabs() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removePrivateTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.removePrivateTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -3525,12 +3517,14 @@ class GeckoTabsApi { } Future undo() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.undo$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.undo$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -3547,14 +3541,22 @@ class GeckoTabsApi { } } - Future restoreTabsByList({required List tabs, required String? selectTabId, required RestoreLocation restoreLocation, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.restoreTabsByList$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future restoreTabsByList({ + required List tabs, + required String? selectTabId, + required RestoreLocation restoreLocation, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.restoreTabsByList$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabs, selectTabId, restoreLocation], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabs, selectTabId, restoreLocation]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3570,14 +3572,21 @@ class GeckoTabsApi { } } - Future restoreTabsByBrowserState({required RecoverableBrowserState state, required RestoreLocation restoreLocation}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.restoreTabsByBrowserState$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future restoreTabsByBrowserState({ + required RecoverableBrowserState state, + required RestoreLocation restoreLocation, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.restoreTabsByBrowserState$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [state, restoreLocation], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([state, restoreLocation]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3595,14 +3604,21 @@ class GeckoTabsApi { /// Selects an already existing tab with the matching [HistoryMetadataKey] or otherwise /// creates a new tab with the given [url]. - Future selectOrAddTabByHistory({required String url, required HistoryMetadataKey historyMetadata}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectOrAddTabByHistory$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future selectOrAddTabByHistory({ + required String url, + required HistoryMetadataKey historyMetadata, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectOrAddTabByHistory$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [url, historyMetadata], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([url, historyMetadata]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3624,14 +3640,24 @@ class GeckoTabsApi { } /// Selects an already existing tab displaying [url] or otherwise creates a new tab. - Future selectOrAddTabByUrl({required String url, required bool private, required SourceValue source, required LoadUrlFlagsValue flags, required bool ignoreFragment, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectOrAddTabByUrl$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future selectOrAddTabByUrl({ + required String url, + required bool private, + required SourceValue source, + required LoadUrlFlagsValue flags, + required bool ignoreFragment, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.selectOrAddTabByUrl$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [url, private, source, flags, ignoreFragment], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([url, private, source, flags, ignoreFragment]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3652,14 +3678,22 @@ class GeckoTabsApi { } } - Future duplicateTab({required String? selectTabId, required bool selectNewTab, required String? newContextId, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.duplicateTab$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future duplicateTab({ + required String? selectTabId, + required bool selectNewTab, + required String? newContextId, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.duplicateTab$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [selectTabId, selectNewTab, newContextId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([selectTabId, selectNewTab, newContextId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3680,14 +3714,22 @@ class GeckoTabsApi { } } - Future moveTabs({required List tabIds, required String targetTabId, required bool placeAfter, }) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.moveTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future moveTabs({ + required List tabIds, + required String targetTabId, + required bool placeAfter, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.moveTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabIds, targetTabId, placeAfter], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabIds, targetTabId, placeAfter]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3703,14 +3745,21 @@ class GeckoTabsApi { } } - Future migratePrivateTabUseCase({required String tabId, required String? alternativeUrl}) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.migratePrivateTabUseCase$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future migratePrivateTabUseCase({ + required String tabId, + required String? alternativeUrl, + }) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabsApi.migratePrivateTabUseCase$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, alternativeUrl], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, alternativeUrl]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3736,9 +3785,13 @@ class GeckoFindApi { /// Constructor for [GeckoFindApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoFindApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoFindApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -3746,13 +3799,17 @@ class GeckoFindApi { final String pigeonVar_messageChannelSuffix; Future findAll(String? tabId, String text) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.findAll$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.findAll$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, text], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, text]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3769,13 +3826,17 @@ class GeckoFindApi { } Future findNext(String? tabId, bool forward) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.findNext$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.findNext$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, forward], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, forward]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3792,13 +3853,17 @@ class GeckoFindApi { } Future clearMatches(String? tabId) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.clearMatches$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoFindApi.clearMatches$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3819,9 +3884,13 @@ class GeckoIconsApi { /// Constructor for [GeckoIconsApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoIconsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoIconsApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -3829,13 +3898,17 @@ class GeckoIconsApi { final String pigeonVar_messageChannelSuffix; Future loadIcon(IconRequest request) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoIconsApi.loadIcon$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoIconsApi.loadIcon$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [request], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([request]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3861,9 +3934,13 @@ class GeckoPrefApi { /// Constructor for [GeckoPrefApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoPrefApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoPrefApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -3871,13 +3948,17 @@ class GeckoPrefApi { final String pigeonVar_messageChannelSuffix; Future> getPrefs(List? preferenceFilter) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.getPrefs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.getPrefs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [preferenceFilter], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([preferenceFilter]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3894,18 +3975,23 @@ class GeckoPrefApi { message: 'Host platform returned null value for non-null return value.', ); } else { - return (pigeonVar_replyList[0] as Map?)!.cast(); + return (pigeonVar_replyList[0] as Map?)! + .cast(); } } Future> applyPrefs(String prefBuffer) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.applyPrefs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.applyPrefs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [prefBuffer], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([prefBuffer]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3922,18 +4008,23 @@ class GeckoPrefApi { message: 'Host platform returned null value for non-null return value.', ); } else { - return (pigeonVar_replyList[0] as Map?)!.cast(); + return (pigeonVar_replyList[0] as Map?)! + .cast(); } } Future resetPrefs(List? preferenceNames) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.resetPrefs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoPrefApi.resetPrefs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [preferenceNames], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([preferenceNames]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3954,9 +4045,13 @@ class GeckoBrowserExtensionApi { /// Constructor for [GeckoBrowserExtensionApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoBrowserExtensionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoBrowserExtensionApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -3964,13 +4059,17 @@ class GeckoBrowserExtensionApi { final String pigeonVar_messageChannelSuffix; Future> getMarkdown(List htmlList) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserExtensionApi.getMarkdown$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoBrowserExtensionApi.getMarkdown$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [htmlList], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([htmlList]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -3996,9 +4095,13 @@ class GeckoContainerProxyApi { /// Constructor for [GeckoContainerProxyApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoContainerProxyApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoContainerProxyApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -4006,13 +4109,17 @@ class GeckoContainerProxyApi { final String pigeonVar_messageChannelSuffix; Future setProxyPort(int port) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.setProxyPort$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.setProxyPort$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [port], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([port]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4029,13 +4136,17 @@ class GeckoContainerProxyApi { } Future addContainerProxy(String contextId) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.addContainerProxy$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.addContainerProxy$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [contextId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([contextId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4052,13 +4163,17 @@ class GeckoContainerProxyApi { } Future removeContainerProxy(String contextId) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.removeContainerProxy$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.removeContainerProxy$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [contextId], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([contextId]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4075,12 +4190,14 @@ class GeckoContainerProxyApi { } Future healthcheck() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.healthcheck$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoContainerProxyApi.healthcheck$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -4107,23 +4224,37 @@ class GeckoCookieApi { /// Constructor for [GeckoCookieApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoCookieApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoCookieApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); final String pigeonVar_messageChannelSuffix; - Future getCookie(String? firstPartyDomain, String name, CookiePartitionKey? partitionKey, String? storeId, String url) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.getCookie$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future getCookie( + String? firstPartyDomain, + String name, + CookiePartitionKey? partitionKey, + String? storeId, + String url, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.getCookie$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [firstPartyDomain, name, partitionKey, storeId, url], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([firstPartyDomain, name, partitionKey, storeId, url]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4144,14 +4275,25 @@ class GeckoCookieApi { } } - Future> getAllCookies(String? domain, String? firstPartyDomain, String? name, CookiePartitionKey? partitionKey, String? storeId, String url) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.getAllCookies$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future> getAllCookies( + String? domain, + String? firstPartyDomain, + String? name, + CookiePartitionKey? partitionKey, + String? storeId, + String url, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.getAllCookies$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [domain, firstPartyDomain, name, partitionKey, storeId, url], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([domain, firstPartyDomain, name, partitionKey, storeId, url]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4172,14 +4314,43 @@ class GeckoCookieApi { } } - Future setCookie(String? domain, int? expirationDate, String? firstPartyDomain, bool? httpOnly, String? name, CookiePartitionKey? partitionKey, String? path, CookieSameSiteStatus? sameSite, bool? secure, String? storeId, String url, String? value) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.setCookie$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([domain, expirationDate, firstPartyDomain, httpOnly, name, partitionKey, path, sameSite, secure, storeId, url, value]); + Future setCookie( + String? domain, + int? expirationDate, + String? firstPartyDomain, + bool? httpOnly, + String? name, + CookiePartitionKey? partitionKey, + String? path, + CookieSameSiteStatus? sameSite, + bool? secure, + String? storeId, + String url, + String? value, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.setCookie$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel + .send([ + domain, + expirationDate, + firstPartyDomain, + httpOnly, + name, + partitionKey, + path, + sameSite, + secure, + storeId, + url, + value, + ]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4195,14 +4366,24 @@ class GeckoCookieApi { } } - Future removeCookie(String? firstPartyDomain, String name, CookiePartitionKey? partitionKey, String? storeId, String url) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.removeCookie$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future removeCookie( + String? firstPartyDomain, + String name, + CookiePartitionKey? partitionKey, + String? storeId, + String url, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoCookieApi.removeCookie$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [firstPartyDomain, name, partitionKey, storeId, url], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([firstPartyDomain, name, partitionKey, storeId, url]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4240,7 +4421,11 @@ abstract class GeckoStateEvents { void onReaderableStateChange(int timestamp, String id, ReaderableState state); - void onSecurityInfoStateChange(int timestamp, String id, SecurityInfoState state); + void onSecurityInfoStateChange( + int timestamp, + String id, + SecurityInfoState state, + ); void onIconChange(int timestamp, String id, Uint8List? bytes); @@ -4250,414 +4435,586 @@ abstract class GeckoStateEvents { void onLongPress(int timestamp, String id, HitResult hitResult); - static void setUp(GeckoStateEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + GeckoStateEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null, expected non-null int.', + ); final bool? arg_state = (args[1] as bool?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null, expected non-null bool.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onViewReadyStateChange was null, expected non-null bool.', + ); try { api.onViewReadyStateChange(arg_timestamp!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null, expected non-null int.', + ); final bool? arg_state = (args[1] as bool?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null, expected non-null bool.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onEngineReadyStateChange was null, expected non-null bool.', + ); try { api.onEngineReadyStateChange(arg_timestamp!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null int.', + ); final String? arg_url = (args[1] as String?); - assert(arg_url != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null String.'); + assert( + arg_url != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null String.', + ); final Uint8List? arg_bytes = (args[2] as Uint8List?); - assert(arg_bytes != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null Uint8List.'); + assert( + arg_bytes != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconUpdate was null, expected non-null Uint8List.', + ); try { api.onIconUpdate(arg_timestamp!, arg_url!, arg_bytes!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null, expected non-null int.', + ); final String? arg_tabId = (args[1] as String?); - assert(arg_tabId != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null, expected non-null String.'); + assert( + arg_tabId != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabAdded was null, expected non-null String.', + ); try { api.onTabAdded(arg_timestamp!, arg_tabId!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null, expected non-null int.'); - final List? arg_tabIds = (args[1] as List?)?.cast(); - assert(arg_tabIds != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null, expected non-null List.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null, expected non-null int.', + ); + final List? arg_tabIds = (args[1] as List?) + ?.cast(); + assert( + arg_tabIds != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabListChange was null, expected non-null List.', + ); try { api.onTabListChange(arg_timestamp!, arg_tabIds!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSelectedTabChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); try { api.onSelectedTabChange(arg_timestamp!, arg_id); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null, expected non-null int.', + ); final TabContentState? arg_state = (args[1] as TabContentState?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null, expected non-null TabContentState.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onTabContentStateChange was null, expected non-null TabContentState.', + ); try { api.onTabContentStateChange(arg_timestamp!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null String.', + ); final HistoryState? arg_state = (args[2] as HistoryState?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null HistoryState.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onHistoryStateChange was null, expected non-null HistoryState.', + ); try { api.onHistoryStateChange(arg_timestamp!, arg_id!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null String.', + ); final ReaderableState? arg_state = (args[2] as ReaderableState?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null ReaderableState.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onReaderableStateChange was null, expected non-null ReaderableState.', + ); try { api.onReaderableStateChange(arg_timestamp!, arg_id!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null String.', + ); final SecurityInfoState? arg_state = (args[2] as SecurityInfoState?); - assert(arg_state != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null SecurityInfoState.'); + assert( + arg_state != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onSecurityInfoStateChange was null, expected non-null SecurityInfoState.', + ); try { api.onSecurityInfoStateChange(arg_timestamp!, arg_id!, arg_state!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onIconChange was null, expected non-null String.', + ); final Uint8List? arg_bytes = (args[2] as Uint8List?); try { api.onIconChange(arg_timestamp!, arg_id!, arg_bytes); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onThumbnailChange was null, expected non-null String.', + ); final Uint8List? arg_bytes = (args[2] as Uint8List?); try { api.onThumbnailChange(arg_timestamp!, arg_id!, arg_bytes); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null String.'); - final List? arg_results = (args[2] as List?)?.cast(); - assert(arg_results != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null List.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null String.', + ); + final List? arg_results = (args[2] as List?) + ?.cast(); + assert( + arg_results != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onFindResults was null, expected non-null List.', + ); try { api.onFindResults(arg_timestamp!, arg_id!, arg_results!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null int.', + ); final String? arg_id = (args[1] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null String.', + ); final HitResult? arg_hitResult = (args[2] as HitResult?); - assert(arg_hitResult != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null HitResult.'); + assert( + arg_hitResult != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoStateEvents.onLongPress was null, expected non-null HitResult.', + ); try { api.onLongPress(arg_timestamp!, arg_id!, arg_hitResult!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -4669,9 +5026,13 @@ class ReaderViewEvents { /// Constructor for [ReaderViewEvents]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - ReaderViewEvents({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + ReaderViewEvents({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -4679,13 +5040,17 @@ class ReaderViewEvents { final String pigeonVar_messageChannelSuffix; Future onToggleReaderView(bool enable) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewEvents.onToggleReaderView$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewEvents.onToggleReaderView$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [enable], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([enable]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4702,12 +5067,14 @@ class ReaderViewEvents { } Future onAppearanceButtonTap() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewEvents.onAppearanceButtonTap$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewEvents.onAppearanceButtonTap$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -4730,32 +5097,49 @@ abstract class ReaderViewController { void appearanceButtonVisibility(int timestamp, bool visible); - static void setUp(ReaderViewController? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + ReaderViewController? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null, expected non-null int.', + ); final bool? arg_visible = (args[1] as bool?); - assert(arg_visible != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null, expected non-null bool.'); + assert( + arg_visible != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.ReaderViewController.appearanceButtonVisibility was null, expected non-null bool.', + ); try { api.appearanceButtonVisibility(arg_timestamp!, arg_visible!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -4767,9 +5151,13 @@ class GeckoSelectionActionController { /// Constructor for [GeckoSelectionActionController]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoSelectionActionController({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoSelectionActionController({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -4777,13 +5165,17 @@ class GeckoSelectionActionController { final String pigeonVar_messageChannelSuffix; Future setActions(List actions) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionController.setActions$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionController.setActions$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [actions], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([actions]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4805,32 +5197,49 @@ abstract class GeckoSelectionActionEvents { void performSelectionAction(String id, String selectedText); - static void setUp(GeckoSelectionActionEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + GeckoSelectionActionEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null.', + ); final List args = (message as List?)!; final String? arg_id = (args[0] as String?); - assert(arg_id != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null, expected non-null String.'); + assert( + arg_id != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null, expected non-null String.', + ); final String? arg_selectedText = (args[1] as String?); - assert(arg_selectedText != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null, expected non-null String.'); + assert( + arg_selectedText != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSelectionActionEvents.performSelectionAction was null, expected non-null String.', + ); try { api.performSelectionAction(arg_id!, arg_selectedText!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -4842,9 +5251,13 @@ class GeckoAddonsApi { /// Constructor for [GeckoAddonsApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoAddonsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoAddonsApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -4852,12 +5265,14 @@ class GeckoAddonsApi { final String pigeonVar_messageChannelSuffix; Future startAddonManagerActivity() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.startAddonManagerActivity$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.startAddonManagerActivity$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -4874,14 +5289,21 @@ class GeckoAddonsApi { } } - Future invokeAddonAction(String extensionId, WebExtensionActionType actionType) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.invokeAddonAction$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future invokeAddonAction( + String extensionId, + WebExtensionActionType actionType, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.invokeAddonAction$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [extensionId, actionType], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([extensionId, actionType]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4898,13 +5320,17 @@ class GeckoAddonsApi { } Future installAddon(String url) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.installAddon$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonsApi.installAddon$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [url], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([url]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -4924,109 +5350,190 @@ class GeckoAddonsApi { abstract class GeckoAddonEvents { static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - void onUpsertWebExtensionAction(int timestamp, String extensionId, WebExtensionActionType actionType, WebExtensionData extensionData); + void onUpsertWebExtensionAction( + int timestamp, + String extensionId, + WebExtensionActionType actionType, + WebExtensionData extensionData, + ); - void onRemoveWebExtensionAction(int timestamp, String extensionId, WebExtensionActionType actionType); + void onRemoveWebExtensionAction( + int timestamp, + String extensionId, + WebExtensionActionType actionType, + ); - void onUpdateWebExtensionIcon(int timestamp, String extensionId, WebExtensionActionType actionType, Uint8List icon); + void onUpdateWebExtensionIcon( + int timestamp, + String extensionId, + WebExtensionActionType actionType, + Uint8List icon, + ); - static void setUp(GeckoAddonEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + GeckoAddonEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null int.', + ); final String? arg_extensionId = (args[1] as String?); - assert(arg_extensionId != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null String.'); - final WebExtensionActionType? arg_actionType = (args[2] as WebExtensionActionType?); - assert(arg_actionType != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null WebExtensionActionType.'); - final WebExtensionData? arg_extensionData = (args[3] as WebExtensionData?); - assert(arg_extensionData != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null WebExtensionData.'); + assert( + arg_extensionId != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null String.', + ); + final WebExtensionActionType? arg_actionType = + (args[2] as WebExtensionActionType?); + assert( + arg_actionType != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null WebExtensionActionType.', + ); + final WebExtensionData? arg_extensionData = + (args[3] as WebExtensionData?); + assert( + arg_extensionData != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpsertWebExtensionAction was null, expected non-null WebExtensionData.', + ); try { - api.onUpsertWebExtensionAction(arg_timestamp!, arg_extensionId!, arg_actionType!, arg_extensionData!); + api.onUpsertWebExtensionAction( + arg_timestamp!, + arg_extensionId!, + arg_actionType!, + arg_extensionData!, + ); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null int.', + ); final String? arg_extensionId = (args[1] as String?); - assert(arg_extensionId != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null String.'); - final WebExtensionActionType? arg_actionType = (args[2] as WebExtensionActionType?); - assert(arg_actionType != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null WebExtensionActionType.'); + assert( + arg_extensionId != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null String.', + ); + final WebExtensionActionType? arg_actionType = + (args[2] as WebExtensionActionType?); + assert( + arg_actionType != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onRemoveWebExtensionAction was null, expected non-null WebExtensionActionType.', + ); try { - api.onRemoveWebExtensionAction(arg_timestamp!, arg_extensionId!, arg_actionType!); + api.onRemoveWebExtensionAction( + arg_timestamp!, + arg_extensionId!, + arg_actionType!, + ); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } } { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null int.', + ); final String? arg_extensionId = (args[1] as String?); - assert(arg_extensionId != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null String.'); - final WebExtensionActionType? arg_actionType = (args[2] as WebExtensionActionType?); - assert(arg_actionType != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null WebExtensionActionType.'); + assert( + arg_extensionId != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null String.', + ); + final WebExtensionActionType? arg_actionType = + (args[2] as WebExtensionActionType?); + assert( + arg_actionType != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null WebExtensionActionType.', + ); final Uint8List? arg_icon = (args[3] as Uint8List?); - assert(arg_icon != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null Uint8List.'); + assert( + arg_icon != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoAddonEvents.onUpdateWebExtensionIcon was null, expected non-null Uint8List.', + ); try { - api.onUpdateWebExtensionIcon(arg_timestamp!, arg_extensionId!, arg_actionType!, arg_icon!); + api.onUpdateWebExtensionIcon( + arg_timestamp!, + arg_extensionId!, + arg_actionType!, + arg_icon!, + ); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -5038,9 +5545,13 @@ class GeckoSuggestionApi { /// Constructor for [GeckoSuggestionApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoSuggestionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoSuggestionApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -5048,13 +5559,17 @@ class GeckoSuggestionApi { final String pigeonVar_messageChannelSuffix; Future getAutocompleteSuggestion(String query) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionApi.getAutocompleteSuggestion$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionApi.getAutocompleteSuggestion$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [query], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([query]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -5070,14 +5585,21 @@ class GeckoSuggestionApi { } } - Future querySuggestions(String text, List providers) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionApi.querySuggestions$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future querySuggestions( + String text, + List providers, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionApi.querySuggestions$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [text, providers], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([text, providers]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -5097,37 +5619,66 @@ class GeckoSuggestionApi { abstract class GeckoSuggestionEvents { static const MessageCodec pigeonChannelCodec = _PigeonCodec(); - void onSuggestionResult(int timestamp, GeckoSuggestionType suggestionType, List suggestions); + void onSuggestionResult( + int timestamp, + GeckoSuggestionType suggestionType, + List suggestions, + ); - static void setUp(GeckoSuggestionEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + GeckoSuggestionEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null int.'); - final GeckoSuggestionType? arg_suggestionType = (args[1] as GeckoSuggestionType?); - assert(arg_suggestionType != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null GeckoSuggestionType.'); - final List? arg_suggestions = (args[2] as List?)?.cast(); - assert(arg_suggestions != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null List.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null int.', + ); + final GeckoSuggestionType? arg_suggestionType = + (args[1] as GeckoSuggestionType?); + assert( + arg_suggestionType != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null GeckoSuggestionType.', + ); + final List? arg_suggestions = + (args[2] as List?)?.cast(); + assert( + arg_suggestions != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoSuggestionEvents.onSuggestionResult was null, expected non-null List.', + ); try { - api.onSuggestionResult(arg_timestamp!, arg_suggestionType!, arg_suggestions!); + api.onSuggestionResult( + arg_timestamp!, + arg_suggestionType!, + arg_suggestions!, + ); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -5140,32 +5691,49 @@ abstract class GeckoTabContentEvents { void onContentUpdate(int timestamp, TabContent content); - static void setUp(GeckoTabContentEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + GeckoTabContentEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null, expected non-null int.', + ); final TabContent? arg_content = (args[1] as TabContent?); - assert(arg_content != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null, expected non-null TabContent.'); + assert( + arg_content != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.GeckoTabContentEvents.onContentUpdate was null, expected non-null TabContent.', + ); try { api.onContentUpdate(arg_timestamp!, arg_content!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } @@ -5177,9 +5745,13 @@ class GeckoDeleteBrowsingDataController { /// Constructor for [GeckoDeleteBrowsingDataController]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoDeleteBrowsingDataController({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoDeleteBrowsingDataController({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -5187,12 +5759,14 @@ class GeckoDeleteBrowsingDataController { final String pigeonVar_messageChannelSuffix; Future deleteTabs() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteTabs$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteTabs$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5210,12 +5784,14 @@ class GeckoDeleteBrowsingDataController { } Future deleteBrowsingHistory() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteBrowsingHistory$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteBrowsingHistory$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5233,12 +5809,14 @@ class GeckoDeleteBrowsingDataController { } Future deleteCookiesAndSiteData() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteCookiesAndSiteData$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteCookiesAndSiteData$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5256,12 +5834,14 @@ class GeckoDeleteBrowsingDataController { } Future deleteCachedFiles() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteCachedFiles$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteCachedFiles$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5279,12 +5859,14 @@ class GeckoDeleteBrowsingDataController { } Future deleteSitePermissions() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteSitePermissions$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteSitePermissions$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5302,12 +5884,14 @@ class GeckoDeleteBrowsingDataController { } Future deleteDownloads() async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteDownloads$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, - ); + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDeleteBrowsingDataController.deleteDownloads$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; @@ -5329,9 +5913,13 @@ class GeckoDownloadsApi { /// Constructor for [GeckoDownloadsApi]. The [binaryMessenger] named argument is /// available for dependency injection. If it is left null, the default /// BinaryMessenger will be used which routes to the host platform. - GeckoDownloadsApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''}) - : pigeonVar_binaryMessenger = binaryMessenger, - pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + GeckoDownloadsApi({ + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) : pigeonVar_binaryMessenger = binaryMessenger, + pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; final BinaryMessenger? pigeonVar_binaryMessenger; static const MessageCodec pigeonChannelCodec = _PigeonCodec(); @@ -5339,13 +5927,17 @@ class GeckoDownloadsApi { final String pigeonVar_messageChannelSuffix; Future requestDownload(String tabId, DownloadState state) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.requestDownload$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.requestDownload$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, state], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, state]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -5361,14 +5953,21 @@ class GeckoDownloadsApi { } } - Future copyInternetResource(String tabId, ShareInternetResourceState state) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.copyInternetResource$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future copyInternetResource( + String tabId, + ShareInternetResourceState state, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.copyInternetResource$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, state], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, state]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -5384,14 +5983,21 @@ class GeckoDownloadsApi { } } - Future shareInternetResource(String tabId, ShareInternetResourceState state) async { - final String pigeonVar_channelName = 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.shareInternetResource$pigeonVar_messageChannelSuffix'; - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - pigeonVar_channelName, - pigeonChannelCodec, - binaryMessenger: pigeonVar_binaryMessenger, + Future shareInternetResource( + String tabId, + ShareInternetResourceState state, + ) async { + final String pigeonVar_channelName = + 'dev.flutter.pigeon.flutter_mozilla_components.GeckoDownloadsApi.shareInternetResource$pigeonVar_messageChannelSuffix'; + final BasicMessageChannel pigeonVar_channel = + BasicMessageChannel( + pigeonVar_channelName, + pigeonChannelCodec, + binaryMessenger: pigeonVar_binaryMessenger, + ); + final Future pigeonVar_sendFuture = pigeonVar_channel.send( + [tabId, state], ); - final Future pigeonVar_sendFuture = pigeonVar_channel.send([tabId, state]); final List? pigeonVar_replyList = await pigeonVar_sendFuture as List?; if (pigeonVar_replyList == null) { @@ -5413,32 +6019,49 @@ abstract class BrowserExtensionEvents { void onFeedRequested(int timestamp, String url); - static void setUp(BrowserExtensionEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + BrowserExtensionEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null, expected non-null int.', + ); final String? arg_url = (args[1] as String?); - assert(arg_url != null, - 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null, expected non-null String.'); + assert( + arg_url != null, + 'Argument for dev.flutter.pigeon.flutter_mozilla_components.BrowserExtensionEvents.onFeedRequested was null, expected non-null String.', + ); try { api.onFeedRequested(arg_timestamp!, arg_url!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml index 1be63884..e0cc4bdf 100644 --- a/packages/flutter_mozilla_components/pubspec.yaml +++ b/packages/flutter_mozilla_components/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: '>=3.7.0 <4.0.0' + sdk: '>=3.8.0 <4.0.0' flutter: '>=3.3.0' dependencies: diff --git a/packages/simple_intent_receiver/example/pubspec.yaml b/packages/simple_intent_receiver/example/pubspec.yaml index 69149728..df27bcd4 100644 --- a/packages/simple_intent_receiver/example/pubspec.yaml +++ b/packages/simple_intent_receiver/example/pubspec.yaml @@ -5,7 +5,7 @@ description: "Demonstrates how to use the simple_intent_receiver plugin." publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: ^3.7.2 + sdk: ^3.8.0 # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart b/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart index 87f5bc7b..20f2f720 100644 --- a/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart +++ b/packages/simple_intent_receiver/lib/src/pigeons/intent.g.dart @@ -8,7 +8,11 @@ import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; -List wrapResponse({Object? result, PlatformException? error, bool empty = false}) { +List wrapResponse({ + Object? result, + PlatformException? error, + bool empty = false, +}) { if (empty) { return []; } @@ -17,21 +21,25 @@ List wrapResponse({Object? result, PlatformException? error, bool empty } return [error.code, error.message, error.details]; } + bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { return a.length == b.length && - a.indexed - .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1])); + a.indexed.every( + ((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]), + ); } if (a is Map && b is Map) { - return a.length == b.length && a.entries.every((MapEntry entry) => - (b as Map).containsKey(entry.key) && - _deepEquals(entry.value, b[entry.key])); + return a.length == b.length && + a.entries.every( + (MapEntry entry) => + (b as Map).containsKey(entry.key) && + _deepEquals(entry.value, b[entry.key]), + ); } return a == b; } - class Intent { Intent({ this.fromPackageName, @@ -52,17 +60,12 @@ class Intent { Map extra; List _toList() { - return [ - fromPackageName, - action, - data, - categories, - extra, - ]; + return [fromPackageName, action, data, categories, extra]; } Object encode() { - return _toList(); } + return _toList(); + } static Intent decode(Object result) { result as List; @@ -89,11 +92,9 @@ class Intent { @override // ignore: avoid_equals_and_hash_code_on_mutable_classes - int get hashCode => Object.hashAll(_toList()) -; + int get hashCode => Object.hashAll(_toList()); } - class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); @override @@ -101,7 +102,7 @@ class _PigeonCodec extends StandardMessageCodec { if (value is int) { buffer.putUint8(4); buffer.putInt64(value); - } else if (value is Intent) { + } else if (value is Intent) { buffer.putUint8(129); writeValue(buffer, value.encode()); } else { @@ -112,7 +113,7 @@ class _PigeonCodec extends StandardMessageCodec { @override Object? readValueOfType(int type, ReadBuffer buffer) { switch (type) { - case 129: + case 129: return Intent.decode(readValue(buffer)!); default: return super.readValueOfType(type, buffer); @@ -125,32 +126,49 @@ abstract class IntentEvents { void onIntentReceived(int timestamp, Intent intent); - static void setUp(IntentEvents? api, {BinaryMessenger? binaryMessenger, String messageChannelSuffix = '',}) { - messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : ''; + static void setUp( + IntentEvents? api, { + BinaryMessenger? binaryMessenger, + String messageChannelSuffix = '', + }) { + messageChannelSuffix = messageChannelSuffix.isNotEmpty + ? '.$messageChannelSuffix' + : ''; { - final BasicMessageChannel pigeonVar_channel = BasicMessageChannel( - 'dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived$messageChannelSuffix', pigeonChannelCodec, - binaryMessenger: binaryMessenger); + final BasicMessageChannel + pigeonVar_channel = BasicMessageChannel( + 'dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived$messageChannelSuffix', + pigeonChannelCodec, + binaryMessenger: binaryMessenger, + ); if (api == null) { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert(message != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null.'); + assert( + message != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null.', + ); final List args = (message as List?)!; final int? arg_timestamp = (args[0] as int?); - assert(arg_timestamp != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null int.'); + assert( + arg_timestamp != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null int.', + ); final Intent? arg_intent = (args[1] as Intent?); - assert(arg_intent != null, - 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null Intent.'); + assert( + arg_intent != null, + 'Argument for dev.flutter.pigeon.simple_intent_receiver.IntentEvents.onIntentReceived was null, expected non-null Intent.', + ); try { api.onIntentReceived(arg_timestamp!, arg_intent!); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); - } catch (e) { - return wrapResponse(error: PlatformException(code: 'error', message: e.toString())); + } catch (e) { + return wrapResponse( + error: PlatformException(code: 'error', message: e.toString()), + ); } }); } diff --git a/packages/simple_intent_receiver/pubspec.yaml b/packages/simple_intent_receiver/pubspec.yaml index c5f9f87c..a8d5d734 100644 --- a/packages/simple_intent_receiver/pubspec.yaml +++ b/packages/simple_intent_receiver/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.1 homepage: environment: - sdk: ^3.7.2 + sdk: ^3.8.0 flutter: '>=3.3.0' dependencies: diff --git a/pubspec.yaml b/pubspec.yaml index d70a34ae..4e5d1920 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: weblibre_project environment: - sdk: '>=3.7.0 <4.0.0' + sdk: '>=3.8.0 <4.0.0' dev_dependencies: melos: ^6.3.2