diff --git a/lib/main.dart b/lib/main.dart index 74cd91e8..661cb377 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,9 +81,7 @@ class MyApp extends StatelessWidget { } class Navigation extends StatelessWidget { - const Navigation({ - Key? key, - }) : super(key: key); + const Navigation({Key? key}) : super(key: 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 93fdeee7..200d2b94 100644 --- a/lib/ui/views/home/home_view.dart +++ b/lib/ui/views/home/home_view.dart @@ -73,7 +73,6 @@ class HomeView extends StatelessWidget { const SizedBox(height: 10), LatestCommitCard( onPressed: () => model.updateManager(context), - color: Theme.of(context).colorScheme.primary, ), const SizedBox(height: 23), I18nText( diff --git a/lib/ui/views/patcher/patcher_view.dart b/lib/ui/views/patcher/patcher_view.dart index 65e05fe7..e8f11fb0 100644 --- a/lib/ui/views/patcher/patcher_view.dart +++ b/lib/ui/views/patcher/patcher_view.dart @@ -1,4 +1,3 @@ -import 'package:animations/animations.dart'; import 'package:flutter/material.dart'; import 'package:flutter_i18n/flutter_i18n.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -10,6 +9,7 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; import 'package:revanced_manager/ui/widgets/patcherView/app_selector_card.dart'; import 'package:revanced_manager/ui/widgets/patcherView/patch_selector_card.dart'; +import 'package:revanced_manager/ui/widgets/shared/open_container_wrapper.dart'; import 'package:stacked/stacked.dart'; class PatcherView extends StatelessWidget { @@ -23,14 +23,8 @@ class PatcherView extends StatelessWidget { builder: (context, model, child) => Scaffold( floatingActionButton: Visibility( visible: model.showPatchButton(), - child: OpenContainer( - transitionDuration: const Duration(milliseconds: 400), - openBuilder: (_, openContainer) => const InstallerView(), - openColor: Theme.of(context).colorScheme.primary, - closedColor: Colors.transparent, - closedShape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), + child: OpenContainerWrapper( + openBuilder: (_, __) => const InstallerView(), closedBuilder: (_, openContainer) => FloatingActionButton.extended( label: I18nText('patcherView.patchButton'), icon: const Icon(Icons.build), @@ -80,18 +74,10 @@ class PatcherView extends StatelessWidget { sliver: SliverList( delegate: SliverChildListDelegate.fixed( [ - OpenContainer( - transitionDuration: const Duration(milliseconds: 400), - openBuilder: (_, openContainer) => - const AppSelectorView(), - openColor: Theme.of(context).colorScheme.primary, - closedColor: Colors.transparent, - closedShape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), + OpenContainerWrapper( + openBuilder: (_, __) => const AppSelectorView(), closedBuilder: (_, openContainer) => AppSelectorCard( onPressed: openContainer, - color: Theme.of(context).colorScheme.primary, ), ), const SizedBox(height: 16), @@ -99,19 +85,11 @@ class PatcherView extends StatelessWidget { opacity: isDark ? (model.dimPatchesCard() ? 0.5 : 1) : (model.dimPatchesCard() ? 0.75 : 1), - child: OpenContainer( - transitionDuration: const Duration(milliseconds: 400), - openBuilder: (_, openContainer) => - const PatchesSelectorView(), - openColor: Theme.of(context).colorScheme.primary, - closedColor: Colors.transparent, - closedShape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), + child: OpenContainerWrapper( + openBuilder: (_, __) => const PatchesSelectorView(), closedBuilder: (_, openContainer) => PatchSelectorCard( onPressed: model.dimPatchesCard() ? () => {} : openContainer, - color: Theme.of(context).colorScheme.primary, ), ), ), diff --git a/lib/ui/widgets/homeView/available_updates_card.dart b/lib/ui/widgets/homeView/available_updates_card.dart index cc7642e6..d00c5aec 100644 --- a/lib/ui/widgets/homeView/available_updates_card.dart +++ b/lib/ui/widgets/homeView/available_updates_card.dart @@ -5,9 +5,7 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/widgets/shared/application_item.dart'; class AvailableUpdatesCard extends StatelessWidget { - AvailableUpdatesCard({ - Key? key, - }) : super(key: key); + AvailableUpdatesCard({Key? key}) : super(key: key); final List apps = locator().patchedUpdatableApps; diff --git a/lib/ui/widgets/homeView/dashboard_raw_chip.dart b/lib/ui/widgets/homeView/dashboard_raw_chip.dart index ac995802..439ac69c 100644 --- a/lib/ui/widgets/homeView/dashboard_raw_chip.dart +++ b/lib/ui/widgets/homeView/dashboard_raw_chip.dart @@ -7,6 +7,7 @@ class DashboardChip extends StatelessWidget { final String label; final bool isSelected; final Function(bool)? onSelected; + const DashboardChip({ Key? key, required this.label, diff --git a/lib/ui/widgets/homeView/installed_apps_card.dart b/lib/ui/widgets/homeView/installed_apps_card.dart index 8c1716a6..abc3a021 100644 --- a/lib/ui/widgets/homeView/installed_apps_card.dart +++ b/lib/ui/widgets/homeView/installed_apps_card.dart @@ -6,9 +6,7 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/widgets/shared/application_item.dart'; class InstalledAppsCard extends StatelessWidget { - InstalledAppsCard({ - Key? key, - }) : super(key: key); + InstalledAppsCard({Key? key}) : super(key: key); final List apps = locator().patchedInstalledApps; diff --git a/lib/ui/widgets/homeView/latest_commit_card.dart b/lib/ui/widgets/homeView/latest_commit_card.dart index 7729c639..6800116f 100644 --- a/lib/ui/widgets/homeView/latest_commit_card.dart +++ b/lib/ui/widgets/homeView/latest_commit_card.dart @@ -9,11 +9,10 @@ import 'package:revanced_manager/ui/widgets/shared/patch_text_button.dart'; class LatestCommitCard extends StatefulWidget { final Function() onPressed; - final Color? color; + const LatestCommitCard({ Key? key, required this.onPressed, - this.color = const Color(0xff1B222B), }) : super(key: key); @override @@ -28,7 +27,7 @@ class _LatestCommitCardState extends State { return Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: widget.color, + color: Theme.of(context).colorScheme.primary, ), padding: const EdgeInsets.symmetric(vertical: 18, horizontal: 20), child: Row( diff --git a/lib/ui/widgets/patcherView/app_selector_card.dart b/lib/ui/widgets/patcherView/app_selector_card.dart index dc5eac2e..ea1d55fc 100644 --- a/lib/ui/widgets/patcherView/app_selector_card.dart +++ b/lib/ui/widgets/patcherView/app_selector_card.dart @@ -8,12 +8,10 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; class AppSelectorCard extends StatelessWidget { final Function() onPressed; - final Color? color; const AppSelectorCard({ Key? key, required this.onPressed, - this.color = const Color(0xff1B222B), }) : super(key: key); @override @@ -24,13 +22,12 @@ class AppSelectorCard extends StatelessWidget { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: color, + color: Theme.of(context).colorScheme.primary, ), padding: const EdgeInsets.symmetric(vertical: 18, horizontal: 20), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - const SizedBox(height: 10), I18nText( locator().selectedApp == null ? 'appSelectorCard.widgetTitle' diff --git a/lib/ui/widgets/patcherView/patch_selector_card.dart b/lib/ui/widgets/patcherView/patch_selector_card.dart index f0b99af0..559c391b 100644 --- a/lib/ui/widgets/patcherView/patch_selector_card.dart +++ b/lib/ui/widgets/patcherView/patch_selector_card.dart @@ -8,12 +8,10 @@ import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; class PatchSelectorCard extends StatelessWidget { final Function() onPressed; - final Color? color; const PatchSelectorCard({ Key? key, required this.onPressed, - this.color = const Color(0xff1B222B), }) : super(key: key); @override @@ -24,7 +22,7 @@ class PatchSelectorCard extends StatelessWidget { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: color, + color: Theme.of(context).colorScheme.primary, ), padding: const EdgeInsets.symmetric(vertical: 18, horizontal: 20), child: Column( diff --git a/lib/ui/widgets/rootCheckerView/magisk_button.dart b/lib/ui/widgets/rootCheckerView/magisk_button.dart index bd9d1d23..f1daa71b 100644 --- a/lib/ui/widgets/rootCheckerView/magisk_button.dart +++ b/lib/ui/widgets/rootCheckerView/magisk_button.dart @@ -5,6 +5,7 @@ import 'package:google_fonts/google_fonts.dart'; class MagiskButton extends StatelessWidget { final Function() onPressed; + const MagiskButton({ Key? key, required this.onPressed, diff --git a/lib/ui/widgets/settingsView/custom_switch.dart b/lib/ui/widgets/settingsView/custom_switch.dart index 236b4936..a8c75c15 100644 --- a/lib/ui/widgets/settingsView/custom_switch.dart +++ b/lib/ui/widgets/settingsView/custom_switch.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; class CustomSwitch extends StatelessWidget { final ValueChanged onChanged; final bool value; + const CustomSwitch({ Key? key, required this.onChanged, diff --git a/lib/ui/widgets/shared/open_container_wrapper.dart b/lib/ui/widgets/shared/open_container_wrapper.dart new file mode 100644 index 00000000..250f000f --- /dev/null +++ b/lib/ui/widgets/shared/open_container_wrapper.dart @@ -0,0 +1,28 @@ +import 'package:animations/animations.dart'; +import 'package:flutter/material.dart'; + +class OpenContainerWrapper extends StatelessWidget { + final OpenContainerBuilder openBuilder; + final CloseContainerBuilder closedBuilder; + + const OpenContainerWrapper({ + Key? key, + required this.openBuilder, + required this.closedBuilder, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return OpenContainer( + openBuilder: openBuilder, + closedBuilder: closedBuilder, + transitionType: ContainerTransitionType.fade, + transitionDuration: const Duration(milliseconds: 400), + openColor: Theme.of(context).colorScheme.primary, + closedColor: Colors.transparent, + closedShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + ), + ); + } +} diff --git a/lib/ui/widgets/shared/patch_text_button.dart b/lib/ui/widgets/shared/patch_text_button.dart index b81da000..785b4cc7 100644 --- a/lib/ui/widgets/shared/patch_text_button.dart +++ b/lib/ui/widgets/shared/patch_text_button.dart @@ -8,6 +8,7 @@ class PatchTextButton extends StatelessWidget { final Function() onPressed; final Color borderColor; final Color backgroundColor; + const PatchTextButton({ Key? key, required this.text,