MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

increase min sdk and apply new formatter

Browse Source
This commit is contained in:
Fabian Freund
2025-02-18 15:37:03 +01:00
parent f7885fc829
commit a1ee8bef35
266 changed files with 11329 additions and 10058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/settings/presentation/controllers/save_settings.g.dart
+18 -16
View File
@@ -13,14 +13,15 @@ String _$saveGeneralSettingsControllerHash() =>
@ProviderFor(SaveGeneralSettingsController)
final saveGeneralSettingsControllerProvider =
AsyncNotifierProvider<SaveGeneralSettingsController, void>.internal(
SaveGeneralSettingsController.new,
name: r'saveGeneralSettingsControllerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$saveGeneralSettingsControllerHash,
dependencies: null,
allTransitiveDependencies: null,
);
SaveGeneralSettingsController.new,
name: r'saveGeneralSettingsControllerProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$saveGeneralSettingsControllerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$SaveGeneralSettingsController = AsyncNotifier<void>;
String _$saveEngineSettingsControllerHash() =>
@@ -30,14 +31,15 @@ String _$saveEngineSettingsControllerHash() =>
@ProviderFor(SaveEngineSettingsController)
final saveEngineSettingsControllerProvider =
AsyncNotifierProvider<SaveEngineSettingsController, void>.internal(
SaveEngineSettingsController.new,
name: r'saveEngineSettingsControllerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$saveEngineSettingsControllerHash,
dependencies: null,
allTransitiveDependencies: null,
);
SaveEngineSettingsController.new,
name: r'saveEngineSettingsControllerProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product')
? null
: _$saveEngineSettingsControllerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$SaveEngineSettingsController = AsyncNotifier<void>;
// ignore_for_file: type=lint
app/lib/features/settings/presentation/screens/general_settings.dart
+4 -2
View File
@@ -26,8 +26,10 @@ class GeneralSettingsScreen extends HookConsumerWidget {
controller: controller,
children: [
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
app/lib/features/settings/presentation/screens/settings.dart
+2 -6
View File
@@ -35,9 +35,7 @@ class SettingsScreen extends HookConsumerWidget {
},
),
),
const SizedBox(
height: 8,
),
const SizedBox(height: 8),
Card(
color: Theme.of(context).highlightColor,
clipBehavior: Clip.antiAlias,
@@ -54,9 +52,7 @@ class SettingsScreen extends HookConsumerWidget {
},
),
),
const SizedBox(
height: 8,
),
const SizedBox(height: 8),
Card(
color: Theme.of(context).highlightColor,
clipBehavior: Clip.antiAlias,
app/lib/features/settings/presentation/screens/web_engine_hardening.dart
+35 -34
View File
@@ -69,48 +69,49 @@ 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),
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 context.push(
WebEngineHardeningGroupRoute(
group: group.key,
).location,
);
},
),
leading: HardeningGroupIcon(
isActive: group.value.isActive,
isPartlyActive: group.value.isPartlyActive,
),
trailing: const Icon(Icons.chevron_right),
onTap: () async {
await context.push(
WebEngineHardeningGroupRoute(
group: group.key,
).location,
);
},
),
),
],
);
},
).toList(),
],
);
}).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(),
),
);
app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart
+68 -57
View File
@@ -70,73 +70,84 @@ 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,
);
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),
if (value) {
await notifier.apply(
filter: [setting.key],
);
} else {
await notifier.reset(
filter: [setting.key],
);
}
},
),
leading: HardeningGroupIcon(
isActive: setting.value.isActive,
),
trailing: const Padding(
padding: EdgeInsets.only(right: 18.0),
child: Icon(Icons.check),
)
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(),
],
);
}).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(),
),
);
app/lib/features/settings/presentation/screens/web_engine_settings.dart
+51 -48
View File
@@ -39,18 +39,21 @@ 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),
);
},
),
if (generalSettings.deleteBrowsingDataOnQuit != null)
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8,
),
child: Column(
children: [
for (final type in DeleteBrowsingDataType.values)
@@ -59,8 +62,9 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
.contains(type),
controlAffinity: ListTileControlAffinity.leading,
title: Text(type.title),
subtitle: type.description
.mapNotNull((description) => Text(description)),
subtitle: type.description.mapNotNull(
(description) => Text(description),
),
onChanged: (value) async {
final notifier = ref.read(
saveGeneralSettingsControllerProvider.notifier,
@@ -70,19 +74,20 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
await notifier.save(
(currentSettings) => currentSettings.copyWith
.deleteBrowsingDataOnQuit({
...currentSettings.deleteBrowsingDataOnQuit!,
type,
}),
...currentSettings
.deleteBrowsingDataOnQuit!,
type,
}),
);
} else {
await notifier.save(
(currentSettings) => currentSettings.copyWith
.deleteBrowsingDataOnQuit(
{
...currentSettings
.deleteBrowsingDataOnQuit!,
}..remove(type),
),
{
...currentSettings
.deleteBrowsingDataOnQuit!,
}..remove(type),
),
);
}
},
@@ -120,8 +125,10 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
},
),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -164,8 +171,10 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
),
),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -181,9 +190,7 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
groupValue: engineSettings.trackingProtectionPolicy,
onChanged: (value) async {
await ref
.read(
saveEngineSettingsControllerProvider.notifier,
)
.read(saveEngineSettingsControllerProvider.notifier)
.save(
(currentSettings) => currentSettings.copyWith
.trackingProtectionPolicy(value),
@@ -199,9 +206,7 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
groupValue: engineSettings.trackingProtectionPolicy,
onChanged: (value) async {
await ref
.read(
saveEngineSettingsControllerProvider.notifier,
)
.read(saveEngineSettingsControllerProvider.notifier)
.save(
(currentSettings) => currentSettings.copyWith
.trackingProtectionPolicy(value),
@@ -217,9 +222,7 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
groupValue: engineSettings.trackingProtectionPolicy,
onChanged: (value) async {
await ref
.read(
saveEngineSettingsControllerProvider.notifier,
)
.read(saveEngineSettingsControllerProvider.notifier)
.save(
(currentSettings) => currentSettings.copyWith
.trackingProtectionPolicy(value),
@@ -239,8 +242,10 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
),
),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
padding: const EdgeInsets.symmetric(
horizontal: 16.0,
vertical: 8,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,43 +256,41 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
contentPadding: EdgeInsets.zero,
),
CheckboxListTile.adaptive(
value: engineSettings.cookieBannerHandlingMode ==
value:
engineSettings.cookieBannerHandlingMode ==
CookieBannerHandlingMode.rejectAll,
title: const Text('In normal browsing'),
controlAffinity: ListTileControlAffinity.leading,
onChanged: (value) async {
await ref
.read(
saveEngineSettingsControllerProvider.notifier,
)
.read(saveEngineSettingsControllerProvider.notifier)
.save(
(currentSettings) => currentSettings.copyWith
.cookieBannerHandlingMode(
value!
? CookieBannerHandlingMode.rejectAll
: CookieBannerHandlingMode.disabled,
),
value!
? CookieBannerHandlingMode.rejectAll
: CookieBannerHandlingMode.disabled,
),
);
},
),
CheckboxListTile.adaptive(
value: engineSettings
value:
engineSettings
.cookieBannerHandlingModePrivateBrowsing ==
CookieBannerHandlingMode.rejectAll,
title: const Text('In private browsing'),
controlAffinity: ListTileControlAffinity.leading,
onChanged: (value) async {
await ref
.read(
saveEngineSettingsControllerProvider.notifier,
)
.read(saveEngineSettingsControllerProvider.notifier)
.save(
(currentSettings) => currentSettings.copyWith
.cookieBannerHandlingModePrivateBrowsing(
value!
? CookieBannerHandlingMode.rejectAll
: CookieBannerHandlingMode.disabled,
),
value!
? CookieBannerHandlingMode.rejectAll
: CookieBannerHandlingMode.disabled,
),
);
},
),
app/lib/features/settings/presentation/widgets/custom_list_tile.dart
+15 -10
View File
@@ -23,8 +23,9 @@ class CustomListTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final subtitleTextTheme = theme.textTheme.bodyMedium!
.copyWith(color: theme.colorScheme.onSurfaceVariant);
final subtitleTextTheme = theme.textTheme.bodyMedium!.copyWith(
color: theme.colorScheme.onSurfaceVariant,
);
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
@@ -38,17 +39,21 @@ 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!,
],
app/lib/features/settings/presentation/widgets/sync_details_table.dart
+2 -7
View File
@@ -18,17 +18,12 @@ class SyncDetailsTable extends StatelessWidget {
columnWidths: const {0: FixedColumnWidth(100)},
children: [
TableRow(
children: [
const Text('Entries'),
Text(count?.toString() ?? 'N/A'),
],
children: [const Text('Entries'), Text(count?.toString() ?? 'N/A')],
),
TableRow(
children: [
const Text('Last Sync'),
Text(
(lastSync != null) ? timeago.format(lastSync!) : 'N/A',
),
Text((lastSync != null) ? timeago.format(lastSync!) : 'N/A'),
],
),
],