diff --git a/lib/main.dart b/lib/main.dart
index c81701bae2..b38cb4c78c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,7 +30,7 @@ Future main() async {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/theme/dynamic_theme_builder.dart b/lib/ui/theme/dynamic_theme_builder.dart
index 233c78b562..8f9fc98bcb 100644
--- a/lib/ui/theme/dynamic_theme_builder.dart
+++ b/lib/ui/theme/dynamic_theme_builder.dart
@@ -12,11 +12,11 @@ import 'package:stacked_services/stacked_services.dart';
 
 class DynamicThemeBuilder extends StatefulWidget {
   const DynamicThemeBuilder({
-    Key? key,
+    super.key,
     required this.title,
     required this.home,
     required this.localizationsDelegates,
-  }) : super(key: key);
+  });
   final String title;
   final Widget home;
   final Iterable<LocalizationsDelegate> localizationsDelegates;
diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart
index 3d1d92ca93..55890f17ab 100644
--- a/lib/ui/views/app_selector/app_selector_view.dart
+++ b/lib/ui/views/app_selector/app_selector_view.dart
@@ -8,7 +8,7 @@ import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart' hide SkeletonLoader;
 
 class AppSelectorView extends StatefulWidget {
-  const AppSelectorView({Key? key}) : super(key: key);
+  const AppSelectorView({super.key});
 
   @override
   State<AppSelectorView> createState() => _AppSelectorViewState();
@@ -114,7 +114,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                       ),
                                     ),
                                   )
-                                  .toList(),
+                                  ,
                               ...model
                                   .getFilteredAppsNames(_query)
                                   .map(
@@ -128,7 +128,7 @@ class _AppSelectorViewState extends State<AppSelectorView> {
                                       },
                                     ),
                                   )
-                                  .toList(),
+                                  ,
                               const SizedBox(height: 70.0),
                             ],
                           ),
diff --git a/lib/ui/views/contributors/contributors_view.dart b/lib/ui/views/contributors/contributors_view.dart
index a409c17ecd..2d9c8b7427 100644
--- a/lib/ui/views/contributors/contributors_view.dart
+++ b/lib/ui/views/contributors/contributors_view.dart
@@ -7,7 +7,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class ContributorsView extends StatelessWidget {
-  const ContributorsView({Key? key}) : super(key: key);
+  const ContributorsView({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/views/home/home_view.dart b/lib/ui/views/home/home_view.dart
index 06ed6e9f28..b2fdcd867b 100644
--- a/lib/ui/views/home/home_view.dart
+++ b/lib/ui/views/home/home_view.dart
@@ -9,7 +9,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class HomeView extends StatelessWidget {
-  const HomeView({Key? key}) : super(key: key);
+  const HomeView({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/views/installer/installer_view.dart b/lib/ui/views/installer/installer_view.dart
index 4093258e5f..d1626ed5ab 100644
--- a/lib/ui/views/installer/installer_view.dart
+++ b/lib/ui/views/installer/installer_view.dart
@@ -8,7 +8,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class InstallerView extends StatelessWidget {
-  const InstallerView({Key? key}) : super(key: key);
+  const InstallerView({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/views/navigation/navigation_view.dart b/lib/ui/views/navigation/navigation_view.dart
index 7089d06908..13a4457e22 100644
--- a/lib/ui/views/navigation/navigation_view.dart
+++ b/lib/ui/views/navigation/navigation_view.dart
@@ -6,7 +6,7 @@ import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
 import 'package:stacked/stacked.dart';
 
 class NavigationView extends StatelessWidget {
-  const NavigationView({Key? key}) : super(key: key);
+  const NavigationView({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/views/patch_options/patch_options_viewmodel.dart b/lib/ui/views/patch_options/patch_options_viewmodel.dart
index c1da79920b..520fd9c68e 100644
--- a/lib/ui/views/patch_options/patch_options_viewmodel.dart
+++ b/lib/ui/views/patch_options/patch_options_viewmodel.dart
@@ -38,11 +38,11 @@ class PatchOptionsViewModel extends BaseViewModel {
                   option.required &&
                   !savedOptions.any((sOption) => sOption.key == option.key),
             )
-            .toList(),
+            ,
       ];
     } else {
       visibleOptions = [
-        ...options.where((option) => option.required).toList(),
+        ...options.where((option) => option.required),
       ];
     }
   }
diff --git a/lib/ui/views/patcher/patcher_view.dart b/lib/ui/views/patcher/patcher_view.dart
index c15a69439c..0921bb1d73 100644
--- a/lib/ui/views/patcher/patcher_view.dart
+++ b/lib/ui/views/patcher/patcher_view.dart
@@ -9,7 +9,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class PatcherView extends StatelessWidget {
-  const PatcherView({Key? key}) : super(key: key);
+  const PatcherView({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/views/patches_selector/patches_selector_view.dart b/lib/ui/views/patches_selector/patches_selector_view.dart
index eb20cf822b..29489078ef 100644
--- a/lib/ui/views/patches_selector/patches_selector_view.dart
+++ b/lib/ui/views/patches_selector/patches_selector_view.dart
@@ -7,7 +7,7 @@ import 'package:revanced_manager/ui/widgets/shared/search_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class PatchesSelectorView extends StatefulWidget {
-  const PatchesSelectorView({Key? key}) : super(key: key);
+  const PatchesSelectorView({super.key});
 
   @override
   State<PatchesSelectorView> createState() => _PatchesSelectorViewState();
diff --git a/lib/ui/views/settings/settings_view.dart b/lib/ui/views/settings/settings_view.dart
index fb623440b8..0d5b8e30f5 100644
--- a/lib/ui/views/settings/settings_view.dart
+++ b/lib/ui/views/settings/settings_view.dart
@@ -13,7 +13,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_sliver_app_bar.dart';
 import 'package:stacked/stacked.dart';
 
 class SettingsView extends StatelessWidget {
-  const SettingsView({Key? key}) : super(key: key);
+  const SettingsView({super.key});
 
   static const _settingsDivider =
       Divider(thickness: 1.0, indent: 20.0, endIndent: 20.0);
diff --git a/lib/ui/views/settings/settings_viewmodel.dart b/lib/ui/views/settings/settings_viewmodel.dart
index 721ee78e74..d1dbfd7eb0 100644
--- a/lib/ui/views/settings/settings_viewmodel.dart
+++ b/lib/ui/views/settings/settings_viewmodel.dart
@@ -145,7 +145,7 @@ class SettingsViewModel extends BaseViewModel {
   }
 
   Future<void>? showRequireSuggestedAppVersionDialog(
-      BuildContext context, bool value) {
+      BuildContext context, bool value,) {
     if (!value) {
       return showDialog(
         context: context,
diff --git a/lib/ui/widgets/appInfoView/app_info_view.dart b/lib/ui/widgets/appInfoView/app_info_view.dart
index 283beb1293..0e7bed3d31 100644
--- a/lib/ui/widgets/appInfoView/app_info_view.dart
+++ b/lib/ui/widgets/appInfoView/app_info_view.dart
@@ -9,9 +9,9 @@ import 'package:stacked/stacked.dart';
 
 class AppInfoView extends StatelessWidget {
   const AppInfoView({
-    Key? key,
+    super.key,
     required this.app,
-  }) : super(key: key);
+  });
   final PatchedApplication app;
 
   @override
diff --git a/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart b/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart
index 0cb80428a6..2f98d2a8b0 100644
--- a/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart
+++ b/lib/ui/widgets/appSelectorView/app_skeleton_loader.dart
@@ -3,7 +3,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 import 'package:skeletons/skeletons.dart';
 
 class AppSkeletonLoader extends StatelessWidget {
-  const AppSkeletonLoader({Key? key}) : super(key: key);
+  const AppSkeletonLoader({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart
index ae129cbfdc..9147e1d028 100644
--- a/lib/ui/widgets/appSelectorView/installed_app_item.dart
+++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart
@@ -5,7 +5,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class InstalledAppItem extends StatefulWidget {
   const InstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.pkgName,
     required this.icon,
@@ -13,7 +13,7 @@ class InstalledAppItem extends StatefulWidget {
     required this.suggestedVersion,
     required this.installedVersion,
     this.onTap,
-  }) : super(key: key);
+  });
   final String name;
   final String pkgName;
   final Uint8List icon;
diff --git a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart
index c2f3f52e09..48e134eacb 100644
--- a/lib/ui/widgets/appSelectorView/not_installed_app_item.dart
+++ b/lib/ui/widgets/appSelectorView/not_installed_app_item.dart
@@ -4,12 +4,12 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class NotInstalledAppItem extends StatefulWidget {
   const NotInstalledAppItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.patchesCount,
     required this.suggestedVersion,
     this.onTap,
-  }) : super(key: key);
+  });
   final String name;
   final int patchesCount;
   final String suggestedVersion;
diff --git a/lib/ui/widgets/contributorsView/contributors_card.dart b/lib/ui/widgets/contributorsView/contributors_card.dart
index d0a4c624ef..d039e5b703 100644
--- a/lib/ui/widgets/contributorsView/contributors_card.dart
+++ b/lib/ui/widgets/contributorsView/contributors_card.dart
@@ -7,10 +7,10 @@ import 'package:url_launcher/url_launcher.dart';
 
 class ContributorsCard extends StatefulWidget {
   const ContributorsCard({
-    Key? key,
+    super.key,
     required this.title,
     required this.contributors,
-  }) : super(key: key);
+  });
   final String title;
   final List<dynamic> contributors;
 
diff --git a/lib/ui/widgets/homeView/installed_apps_card.dart b/lib/ui/widgets/homeView/installed_apps_card.dart
index ec825340bf..e6ac9a0214 100644
--- a/lib/ui/widgets/homeView/installed_apps_card.dart
+++ b/lib/ui/widgets/homeView/installed_apps_card.dart
@@ -10,7 +10,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 //ignore: must_be_immutable
 class InstalledAppsCard extends StatelessWidget {
-  InstalledAppsCard({Key? key}) : super(key: key);
+  InstalledAppsCard({super.key});
 
   List<PatchedApplication> apps = locator<HomeViewModel>().patchedInstalledApps;
   final ManagerAPI _managerAPI = locator<ManagerAPI>();
diff --git a/lib/ui/widgets/homeView/latest_commit_card.dart b/lib/ui/widgets/homeView/latest_commit_card.dart
index cb263e259d..9d0625ce53 100644
--- a/lib/ui/widgets/homeView/latest_commit_card.dart
+++ b/lib/ui/widgets/homeView/latest_commit_card.dart
@@ -7,10 +7,10 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 
 class LatestCommitCard extends StatefulWidget {
   const LatestCommitCard({
-    Key? key,
+    super.key,
     required this.model,
     required this.parentContext,
-  }) : super(key: key);
+  });
   final HomeViewModel model;
   final BuildContext parentContext;
 
diff --git a/lib/ui/widgets/patcherView/app_selector_card.dart b/lib/ui/widgets/patcherView/app_selector_card.dart
index e97a004d6e..2fb0e803ae 100644
--- a/lib/ui/widgets/patcherView/app_selector_card.dart
+++ b/lib/ui/widgets/patcherView/app_selector_card.dart
@@ -7,9 +7,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class AppSelectorCard extends StatelessWidget {
   const AppSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Function() onPressed;
 
   @override
diff --git a/lib/ui/widgets/patcherView/patch_selector_card.dart b/lib/ui/widgets/patcherView/patch_selector_card.dart
index 56da857078..ceea41c97d 100644
--- a/lib/ui/widgets/patcherView/patch_selector_card.dart
+++ b/lib/ui/widgets/patcherView/patch_selector_card.dart
@@ -7,9 +7,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
 
 class PatchSelectorCard extends StatelessWidget {
   const PatchSelectorCard({
-    Key? key,
+    super.key,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Function() onPressed;
 
   @override
diff --git a/lib/ui/widgets/patchesSelectorView/patch_item.dart b/lib/ui/widgets/patchesSelectorView/patch_item.dart
index 92fe1454b4..11fd08392f 100644
--- a/lib/ui/widgets/patchesSelectorView/patch_item.dart
+++ b/lib/ui/widgets/patchesSelectorView/patch_item.dart
@@ -10,7 +10,7 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
 // ignore: must_be_immutable
 class PatchItem extends StatefulWidget {
   PatchItem({
-    Key? key,
+    super.key,
     required this.name,
     required this.simpleName,
     required this.description,
@@ -23,7 +23,7 @@ class PatchItem extends StatefulWidget {
     required this.onChanged,
     required this.navigateToOptions,
     required this.isChangeEnabled,
-  }) : super(key: key);
+  });
   final String name;
   final String simpleName;
   final String description;
diff --git a/lib/ui/widgets/settingsView/about_widget.dart b/lib/ui/widgets/settingsView/about_widget.dart
index ebad5f92e8..1884b5e37a 100644
--- a/lib/ui/widgets/settingsView/about_widget.dart
+++ b/lib/ui/widgets/settingsView/about_widget.dart
@@ -4,7 +4,7 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:revanced_manager/utils/about_info.dart';
 
 class AboutWidget extends StatefulWidget {
-  const AboutWidget({Key? key, this.padding}) : super(key: key);
+  const AboutWidget({super.key, this.padding});
 
   final EdgeInsetsGeometry? padding;
 
diff --git a/lib/ui/widgets/settingsView/custom_switch.dart b/lib/ui/widgets/settingsView/custom_switch.dart
index 8328c90b26..75229bb03e 100644
--- a/lib/ui/widgets/settingsView/custom_switch.dart
+++ b/lib/ui/widgets/settingsView/custom_switch.dart
@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
 
 class CustomSwitch extends StatelessWidget {
   const CustomSwitch({
-    Key? key,
+    super.key,
     required this.onChanged,
     required this.value,
-  }) : super(key: key);
+  });
   final ValueChanged<bool> onChanged;
   final bool value;
 
diff --git a/lib/ui/widgets/settingsView/custom_switch_tile.dart b/lib/ui/widgets/settingsView/custom_switch_tile.dart
index f17f967082..3bf563a5a7 100644
--- a/lib/ui/widgets/settingsView/custom_switch_tile.dart
+++ b/lib/ui/widgets/settingsView/custom_switch_tile.dart
@@ -3,13 +3,13 @@ import 'package:revanced_manager/ui/widgets/settingsView/custom_switch.dart';
 
 class CustomSwitchTile extends StatelessWidget {
   const CustomSwitchTile({
-    Key? key,
+    super.key,
     required this.title,
     required this.subtitle,
     required this.value,
     required this.onTap,
     this.padding,
-  }) : super(key: key);
+  });
   final Widget title;
   final Widget subtitle;
   final bool value;
diff --git a/lib/ui/widgets/settingsView/custom_text_field.dart b/lib/ui/widgets/settingsView/custom_text_field.dart
index 6f2b8a76a0..986b2ac685 100644
--- a/lib/ui/widgets/settingsView/custom_text_field.dart
+++ b/lib/ui/widgets/settingsView/custom_text_field.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomTextField extends StatelessWidget {
   const CustomTextField({
-    Key? key,
+    super.key,
     required this.inputController,
     required this.label,
     required this.hint,
     this.leadingIcon,
     required this.onChanged,
-  }) : super(key: key);
+  });
   final TextEditingController inputController;
   final Widget label;
   final String hint;
diff --git a/lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart b/lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart
index a46ee10d34..1d431e6004 100644
--- a/lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart
+++ b/lib/ui/widgets/settingsView/settings_require_suggested_app_version.dart
@@ -29,7 +29,7 @@ class _SRequireSuggestedAppVersionState extends State<SRequireSuggestedAppVersio
       subtitle: I18nText('settingsView.requireSuggestedAppVersionHint'),
       value: _settingsViewModel.isRequireSuggestedAppVersionEnabled(),
       onChanged: (value) async {
-          await _settingsViewModel.showRequireSuggestedAppVersionDialog(context, value);
+          await _settingsViewModel.showRequireSuggestedAppVersionDialog(context, value,);
           setState(() {});
       },
     );
diff --git a/lib/ui/widgets/settingsView/settings_section.dart b/lib/ui/widgets/settingsView/settings_section.dart
index 74570a14af..56e9247ebc 100644
--- a/lib/ui/widgets/settingsView/settings_section.dart
+++ b/lib/ui/widgets/settingsView/settings_section.dart
@@ -3,10 +3,10 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsSection extends StatelessWidget {
   const SettingsSection({
-    Key? key,
+    super.key,
     required this.title,
     required this.children,
-  }) : super(key: key);
+  });
   final String title;
   final List<Widget> children;
 
diff --git a/lib/ui/widgets/settingsView/settings_tile_dialog.dart b/lib/ui/widgets/settingsView/settings_tile_dialog.dart
index ce3a817d70..822ffe6f87 100644
--- a/lib/ui/widgets/settingsView/settings_tile_dialog.dart
+++ b/lib/ui/widgets/settingsView/settings_tile_dialog.dart
@@ -3,12 +3,12 @@ import 'package:flutter_i18n/flutter_i18n.dart';
 
 class SettingsTileDialog extends StatelessWidget {
   const SettingsTileDialog({
-    Key? key,
+    super.key,
     required this.title,
     required this.subtitle,
     required this.onTap,
     this.padding,
-  }) : super(key: key);
+  });
   final String title;
   final String subtitle;
   final Function()? onTap;
diff --git a/lib/ui/widgets/settingsView/social_media_item.dart b/lib/ui/widgets/settingsView/social_media_item.dart
index 86971a2762..78e8eb9406 100644
--- a/lib/ui/widgets/settingsView/social_media_item.dart
+++ b/lib/ui/widgets/settingsView/social_media_item.dart
@@ -3,12 +3,12 @@ import 'package:url_launcher/url_launcher.dart';
 
 class SocialMediaItem extends StatelessWidget {
   const SocialMediaItem({
-    Key? key,
+    super.key,
     this.icon,
     required this.title,
     this.subtitle,
     this.url,
-  }) : super(key: key);
+  });
   final Widget? icon;
   final Widget title;
   final Widget? subtitle;
diff --git a/lib/ui/widgets/settingsView/social_media_widget.dart b/lib/ui/widgets/settingsView/social_media_widget.dart
index 4431ac6ab9..c42c526dce 100644
--- a/lib/ui/widgets/settingsView/social_media_widget.dart
+++ b/lib/ui/widgets/settingsView/social_media_widget.dart
@@ -8,9 +8,9 @@ import 'package:revanced_manager/ui/widgets/shared/custom_icon.dart';
 
 class SocialMediaWidget extends StatelessWidget {
   const SocialMediaWidget({
-    Key? key,
+    super.key,
     this.padding,
-  }) : super(key: key);
+  });
   final EdgeInsetsGeometry? padding;
 
   @override
diff --git a/lib/ui/widgets/shared/application_item.dart b/lib/ui/widgets/shared/application_item.dart
index b733643563..5f527eb14a 100644
--- a/lib/ui/widgets/shared/application_item.dart
+++ b/lib/ui/widgets/shared/application_item.dart
@@ -8,12 +8,12 @@ import 'package:timeago/timeago.dart';
 
 class ApplicationItem extends StatefulWidget {
   const ApplicationItem({
-    Key? key,
+    super.key,
     required this.icon,
     required this.name,
     required this.patchDate,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Uint8List icon;
   final String name;
   final DateTime patchDate;
diff --git a/lib/ui/widgets/shared/custom_card.dart b/lib/ui/widgets/shared/custom_card.dart
index 34b3c72860..17b3d0e1e4 100644
--- a/lib/ui/widgets/shared/custom_card.dart
+++ b/lib/ui/widgets/shared/custom_card.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomCard extends StatelessWidget {
   const CustomCard({
-    Key? key,
+    super.key,
     this.isFilled = true,
     required this.child,
     this.onTap,
     this.padding,
     this.backgroundColor,
-  }) : super(key: key);
+  });
   final bool isFilled;
   final Widget child;
   final Function()? onTap;
diff --git a/lib/ui/widgets/shared/custom_chip.dart b/lib/ui/widgets/shared/custom_chip.dart
index 8f3bb41831..c0567ce23f 100644
--- a/lib/ui/widgets/shared/custom_chip.dart
+++ b/lib/ui/widgets/shared/custom_chip.dart
@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 
 class CustomChip extends StatelessWidget {
   const CustomChip({
-    Key? key,
+    super.key,
     required this.label,
     this.isSelected = false,
     this.onSelected,
-  }) : super(key: key);
+  });
   final Widget label;
   final bool isSelected;
   final Function(bool)? onSelected;
diff --git a/lib/ui/widgets/shared/custom_material_button.dart b/lib/ui/widgets/shared/custom_material_button.dart
index 2ff80e4cf2..c861a709ea 100644
--- a/lib/ui/widgets/shared/custom_material_button.dart
+++ b/lib/ui/widgets/shared/custom_material_button.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 
 class CustomMaterialButton extends StatelessWidget {
   const CustomMaterialButton({
-    Key? key,
+    super.key,
     required this.label,
     this.isFilled = true,
     this.isExpanded = false,
     required this.onPressed,
-  }) : super(key: key);
+  });
   final Widget label;
   final bool isFilled;
   final bool isExpanded;
@@ -49,13 +49,13 @@ class CustomMaterialButton extends StatelessWidget {
 // ignore: must_be_immutable
 class TimerButton extends StatefulWidget {
   TimerButton({
-    Key? key,
+    super.key,
     required this.seconds,
     required this.isRunning,
     required this.onTimerEnd,
     this.label = const Text(''),
     this.isFilled = true,
-  }) : super(key: key);
+  });
   Widget label;
   bool isFilled;
   int seconds;
diff --git a/lib/ui/widgets/shared/custom_popup_menu.dart b/lib/ui/widgets/shared/custom_popup_menu.dart
deleted file mode 100644
index aaf2412563..0000000000
--- a/lib/ui/widgets/shared/custom_popup_menu.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomPopupMenu extends StatelessWidget {
-  const CustomPopupMenu({
-    Key? key,
-    required this.onSelected,
-    required this.children,
-  }) : super(key: key);
-  final Function(dynamic) onSelected;
-  final Map<int, Widget> children;
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      data: Theme.of(context).copyWith(useMaterial3: false),
-      child: PopupMenuButton<int>(
-        icon: Icon(
-          Icons.more_vert,
-          color: Theme.of(context).colorScheme.secondary,
-        ),
-        onSelected: onSelected,
-        itemBuilder: (context) => children.entries
-            .map(
-              (entry) => PopupMenuItem<int>(
-                padding: const EdgeInsets.all(16.0).copyWith(right: 20),
-                value: entry.key,
-                child: entry.value,
-              ),
-            )
-            .toList(),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(24),
-        ),
-        color: Theme.of(context).colorScheme.secondaryContainer,
-        position: PopupMenuPosition.under,
-      ),
-    );
-  }
-}
diff --git a/lib/ui/widgets/shared/custom_sliver_app_bar.dart b/lib/ui/widgets/shared/custom_sliver_app_bar.dart
index 144bd6ab8e..08b75af2c2 100644
--- a/lib/ui/widgets/shared/custom_sliver_app_bar.dart
+++ b/lib/ui/widgets/shared/custom_sliver_app_bar.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 class CustomSliverAppBar extends StatelessWidget {
   const CustomSliverAppBar({
-    Key? key,
+    super.key,
     required this.title,
     this.actions,
     this.bottom,
     this.isMainView = false,
     this.onBackButtonPressed,
-  }) : super(key: key);
+  });
   final Widget title;
   final List<Widget>? actions;
   final PreferredSizeWidget? bottom;
diff --git a/lib/ui/widgets/shared/open_container_wrapper.dart b/lib/ui/widgets/shared/open_container_wrapper.dart
index f5b1c642b9..458e8937da 100644
--- a/lib/ui/widgets/shared/open_container_wrapper.dart
+++ b/lib/ui/widgets/shared/open_container_wrapper.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 
 class OpenContainerWrapper extends StatelessWidget {
   const OpenContainerWrapper({
-    Key? key,
+    super.key,
     required this.openBuilder,
     required this.closedBuilder,
-  }) : super(key: key);
+  });
   final OpenContainerBuilder openBuilder;
   final CloseContainerBuilder closedBuilder;
 
diff --git a/lib/ui/widgets/shared/search_bar.dart b/lib/ui/widgets/shared/search_bar.dart
index e48e3031f0..862584af66 100644
--- a/lib/ui/widgets/shared/search_bar.dart
+++ b/lib/ui/widgets/shared/search_bar.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 
 class SearchBar extends StatefulWidget {
   const SearchBar({
-    Key? key,
+    super.key,
     required this.hintText,
     this.showSelectIcon = false,
     this.onSelectAll,
     required this.onQueryChanged,
-  }) : super(key: key);
+  });
   final String? hintText;
   final bool showSelectIcon;
   final Function(bool)? onSelectAll;
diff --git a/pubspec.yaml b/pubspec.yaml
index e5d5c80b64..36320b6559 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -86,7 +86,7 @@ dev_dependencies:
   json_serializable: ^6.6.1
   build_runner: any
   flutter_launcher_icons: ^0.13.0
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
   flutter_test:
     sdk: flutter
   injectable_generator: ^2.1.5