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

upgrade min sdk; run formatter

Browse Source
This commit is contained in:
Fabian Freund
2025-06-02 22:25:10 +02:00
parent 8fccd767af
commit ad03cc9bac
171 changed files with 4817 additions and 4685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/settings/presentation/controllers/save_settings.g.dart
+6 -8
View File
@@ -15,10 +15,9 @@ final saveGeneralSettingsControllerProvider =
AsyncNotifierProvider<SaveGeneralSettingsController, void>.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<SaveEngineSettingsController, void>.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,
);
app/lib/features/settings/presentation/screens/general_settings.dart
+12 -13
View File
@@ -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) {
app/lib/features/settings/presentation/screens/web_engine_hardening.dart
+31 -34
View File
@@ -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(),
),
);
app/lib/features/settings/presentation/screens/web_engine_hardening_group.dart
+58 -71
View File
@@ -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(),
),
);
app/lib/features/settings/presentation/screens/web_engine_settings.dart
+26 -26
View File
@@ -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<bool>(
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) {
app/lib/features/settings/presentation/widgets/custom_list_tile.dart
+10 -12
View File
@@ -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!,
],
app/lib/features/settings/presentation/widgets/default_search_selector.dart
+2 -3
View File
@@ -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,