increase min sdk and apply new formatter
This commit is contained in:
@@ -6,10 +6,7 @@ class EquatableImage {
|
||||
final Image value;
|
||||
final int? _imageHash;
|
||||
|
||||
EquatableImage(
|
||||
this.value, {
|
||||
required int? hash,
|
||||
}) : _imageHash = hash;
|
||||
EquatableImage(this.value, {required int? hash}) : _imageHash = hash;
|
||||
|
||||
static Future<EquatableImage> calculate(Image image) async {
|
||||
final imageHash = await image.calculateHash();
|
||||
|
||||
@@ -18,25 +18,21 @@ class AppInitializationService extends _$AppInitializationService {
|
||||
|
||||
Future<void> _initPackageInfo() {
|
||||
//Ensure Package info is loaded
|
||||
state = Result.success(
|
||||
(
|
||||
initialized: false,
|
||||
stage: 'Loading Package Info...',
|
||||
errors: List.empty(),
|
||||
),
|
||||
);
|
||||
state = Result.success((
|
||||
initialized: false,
|
||||
stage: 'Loading Package Info...',
|
||||
errors: List.empty(),
|
||||
));
|
||||
|
||||
return ref.read(packageInfoProvider.future);
|
||||
}
|
||||
|
||||
Future<Map<BangGroup, Result<void>>> _initBangs() {
|
||||
state = Result.success(
|
||||
(
|
||||
initialized: false,
|
||||
stage: 'Synchronizing Bangs...',
|
||||
errors: List.empty(),
|
||||
),
|
||||
);
|
||||
state = Result.success((
|
||||
initialized: false,
|
||||
stage: 'Synchronizing Bangs...',
|
||||
errors: List.empty(),
|
||||
));
|
||||
|
||||
return ref
|
||||
.read(bangSyncRepositoryProvider.notifier)
|
||||
@@ -60,9 +56,11 @@ class AppInitializationService extends _$AppInitializationService {
|
||||
|
||||
@override
|
||||
Result<({bool initialized, String? stage, List<ErrorMessage> errors})>
|
||||
build() {
|
||||
return Result.success(
|
||||
(initialized: false, stage: null, errors: List.empty()),
|
||||
);
|
||||
build() {
|
||||
return Result.success((
|
||||
initialized: false,
|
||||
stage: null,
|
||||
errors: List.empty(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,23 +12,22 @@ String _$appInitializationServiceHash() =>
|
||||
/// See also [AppInitializationService].
|
||||
@ProviderFor(AppInitializationService)
|
||||
final appInitializationServiceProvider = NotifierProvider<
|
||||
AppInitializationService,
|
||||
Result<
|
||||
({
|
||||
bool initialized,
|
||||
String? stage,
|
||||
List<ErrorMessage> errors
|
||||
})>>.internal(
|
||||
AppInitializationService,
|
||||
Result<({bool initialized, String? stage, List<ErrorMessage> errors})>
|
||||
>.internal(
|
||||
AppInitializationService.new,
|
||||
name: r'appInitializationServiceProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$appInitializationServiceHash,
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$appInitializationServiceHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$AppInitializationService = Notifier<
|
||||
Result<({bool initialized, String? stage, List<ErrorMessage> errors})>>;
|
||||
typedef _$AppInitializationService =
|
||||
Notifier<
|
||||
Result<({bool initialized, String? stage, List<ErrorMessage> errors})>
|
||||
>;
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
|
||||
|
||||
@@ -65,8 +65,8 @@ class GenericWebsiteService extends _$GenericWebsiteService {
|
||||
final LRUCache<String, BrowserIcon> _browserIconCache;
|
||||
|
||||
GenericWebsiteService()
|
||||
: _iconsService = GeckoIconService(),
|
||||
_browserIconCache = LRUCache(50);
|
||||
: _iconsService = GeckoIconService(),
|
||||
_browserIconCache = LRUCache(50);
|
||||
|
||||
@override
|
||||
void build() {
|
||||
@@ -89,9 +89,10 @@ class GenericWebsiteService extends _$GenericWebsiteService {
|
||||
url: resource['url'] as String,
|
||||
type: resource['type'] as IconType,
|
||||
mimeType: resource['mimeType'] as String?,
|
||||
sizes: (resource['sizes'] as List<List<int>>)
|
||||
.map((s) => ResourceSize(height: s[0], width: s[1]))
|
||||
.toList(),
|
||||
sizes:
|
||||
(resource['sizes'] as List<List<int>>)
|
||||
.map((s) => ResourceSize(height: s[0], width: s[1]))
|
||||
.toList(),
|
||||
maskable: resource['maskable'] as bool,
|
||||
);
|
||||
}
|
||||
@@ -187,45 +188,39 @@ class GenericWebsiteService extends _$GenericWebsiteService {
|
||||
}
|
||||
|
||||
Future<Result<WebPageInfo>> fetchPageInfo(Uri url) async {
|
||||
return Result.fromAsync(
|
||||
() async {
|
||||
final response =
|
||||
await _client.get(url).timeout(const Duration(seconds: 10));
|
||||
return Result.fromAsync(() async {
|
||||
final response = await _client
|
||||
.get(url)
|
||||
.timeout(const Duration(seconds: 10));
|
||||
|
||||
final result = await compute(
|
||||
(args) async {
|
||||
final document = html_parser.parse(args[0]);
|
||||
final baseUri = Uri.parse(args[1]);
|
||||
final result = await compute((args) async {
|
||||
final document = html_parser.parse(args[0]);
|
||||
final baseUri = Uri.parse(args[1]);
|
||||
|
||||
final title = document.querySelector('title')?.text;
|
||||
final resources = _extractIcons(baseUri, document);
|
||||
final title = document.querySelector('title')?.text;
|
||||
final resources = _extractIcons(baseUri, document);
|
||||
|
||||
return {
|
||||
'title': title,
|
||||
'resources': resources.map(_serializeResource).toList(),
|
||||
};
|
||||
},
|
||||
[response.body, url.toString()],
|
||||
);
|
||||
return {
|
||||
'title': title,
|
||||
'resources': resources.map(_serializeResource).toList(),
|
||||
};
|
||||
}, [response.body, url.toString()]);
|
||||
|
||||
final resources = (result['resources']! as List<Map<String, dynamic>>)
|
||||
.map(_deserializeResource)
|
||||
.toList();
|
||||
final resources =
|
||||
(result['resources']! as List<Map<String, dynamic>>)
|
||||
.map(_deserializeResource)
|
||||
.toList();
|
||||
|
||||
final favicon = await getCachedIcon(url) ??
|
||||
await loadIcon(
|
||||
url: url,
|
||||
resources: resources,
|
||||
);
|
||||
final favicon =
|
||||
await getCachedIcon(url) ??
|
||||
await loadIcon(url: url, resources: resources);
|
||||
|
||||
return WebPageInfo(
|
||||
url: url,
|
||||
title: result['title'] as String?,
|
||||
favicon: favicon,
|
||||
);
|
||||
},
|
||||
exceptionHandler: handleHttpError,
|
||||
);
|
||||
return WebPageInfo(
|
||||
url: url,
|
||||
title: result['title'] as String?,
|
||||
favicon: favicon,
|
||||
);
|
||||
}, exceptionHandler: handleHttpError);
|
||||
}
|
||||
|
||||
Future<BrowserIcon?> getCachedIcon(Uri url) async {
|
||||
@@ -281,9 +276,9 @@ class GenericWebsiteService extends _$GenericWebsiteService {
|
||||
return cachedIcon;
|
||||
}
|
||||
|
||||
return fetchPageInfo(url).then(
|
||||
(result) => result.flatMap((pageInfo) => pageInfo.favicon!).value,
|
||||
);
|
||||
return fetchPageInfo(
|
||||
url,
|
||||
).then((result) => result.flatMap((pageInfo) => pageInfo.favicon!).value);
|
||||
}
|
||||
|
||||
// Future<Uri?> tryUpgradeToHttps(Uri httpUri) async {
|
||||
|
||||
@@ -13,14 +13,15 @@ String _$genericWebsiteServiceHash() =>
|
||||
@ProviderFor(GenericWebsiteService)
|
||||
final genericWebsiteServiceProvider =
|
||||
NotifierProvider<GenericWebsiteService, void>.internal(
|
||||
GenericWebsiteService.new,
|
||||
name: r'genericWebsiteServiceProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$genericWebsiteServiceHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
GenericWebsiteService.new,
|
||||
name: r'genericWebsiteServiceProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$genericWebsiteServiceHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$GenericWebsiteService = Notifier<void>;
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
Reference in New Issue
Block a user