diff --git a/lib/main.dart b/lib/main.dart index f386c75d..29b715b9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -58,7 +58,7 @@ class MyApp extends StatelessWidget { }, ), GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate + GlobalWidgetsLocalizations.delegate, ], ); } diff --git a/lib/ui/views/contributors/contributors_view.dart b/lib/ui/views/contributors/contributors_view.dart index 1fdc6d40..26cdb12b 100644 --- a/lib/ui/views/contributors/contributors_view.dart +++ b/lib/ui/views/contributors/contributors_view.dart @@ -57,7 +57,7 @@ class ContributorsView extends StatelessWidget { title: 'contributorsView.managerContributors', contributors: model.managerContributors, ), - SizedBox(height: MediaQuery.of(context).viewPadding.bottom) + SizedBox(height: MediaQuery.of(context).viewPadding.bottom), ], ), ), diff --git a/lib/ui/views/home/home_viewmodel.dart b/lib/ui/views/home/home_viewmodel.dart index 70a06d57..161993ee 100644 --- a/lib/ui/views/home/home_viewmodel.dart +++ b/lib/ui/views/home/home_viewmodel.dart @@ -43,7 +43,7 @@ class HomeViewModel extends BaseViewModel { Future initialize(BuildContext context) async { _latestManagerVersion = await _managerAPI.getLatestManagerVersion(); - if(!_managerAPI.getPatchesConsent()){ + if (!_managerAPI.getPatchesConsent()) { await showPatchesConsent(context); } await _patcherAPI.initialize(); @@ -168,7 +168,7 @@ class HomeViewModel extends BaseViewModel { } } - Future showPatchesConsent(BuildContext context) async{ + Future showPatchesConsent(BuildContext context) async { final ValueNotifier autoUpdate = ValueNotifier(true); await showDialog( context: context, @@ -197,7 +197,9 @@ class HomeViewModel extends BaseViewModel { padding: const EdgeInsets.symmetric(vertical: 10), child: I18nText( 'homeView.patchesConsentDialogText2', - translationParams: {'url': _managerAPI.defaultApiUrl.split('/')[2]}, + translationParams: { + 'url': _managerAPI.defaultApiUrl.split('/')[2], + }, child: Text( '', style: TextStyle( @@ -211,8 +213,12 @@ class HomeViewModel extends BaseViewModel { CheckboxListTile( value: value, contentPadding: EdgeInsets.zero, - title: I18nText('homeView.patchesConsentDialogText3',), - subtitle: I18nText('homeView.patchesConsentDialogText3Sub',), + title: I18nText( + 'homeView.patchesConsentDialogText3', + ), + subtitle: I18nText( + 'homeView.patchesConsentDialogText3Sub', + ), onChanged: (selected) { autoUpdate.value = selected!; }, @@ -237,7 +243,7 @@ class HomeViewModel extends BaseViewModel { Navigator.of(context).pop(); }, label: I18nText('okButton'), - ) + ), ], ), ); diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index c33d85a2..2200c40d 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -203,7 +203,7 @@ class InstallerViewModel extends BaseViewModel { CustomMaterialButton( label: I18nText('okButton'), onPressed: () => Navigator.of(context).pop(), - ) + ), ], ), ); diff --git a/lib/ui/views/patcher/patcher_viewmodel.dart b/lib/ui/views/patcher/patcher_viewmodel.dart index 2827eedc..1087a078 100644 --- a/lib/ui/views/patcher/patcher_viewmodel.dart +++ b/lib/ui/views/patcher/patcher_viewmodel.dart @@ -78,7 +78,7 @@ class PatcherViewModel extends BaseViewModel { Navigator.of(context).pop(); showArmv7WarningDialog(context); }, - ) + ), ], ), ); @@ -111,7 +111,7 @@ class PatcherViewModel extends BaseViewModel { Navigator.of(context).pop(); navigateToInstaller(); }, - ) + ), ], ), ); diff --git a/lib/ui/views/patches_selector/patches_selector_view.dart b/lib/ui/views/patches_selector/patches_selector_view.dart index 5ee6ad83..acecf5e4 100644 --- a/lib/ui/views/patches_selector/patches_selector_view.dart +++ b/lib/ui/views/patches_selector/patches_selector_view.dart @@ -33,7 +33,7 @@ class _PatchesSelectorViewState extends State { label: Row( children: [ I18nText('patchesSelectorView.doneButton'), - Text(' (${model.selectedPatches.length})') + Text(' (${model.selectedPatches.length})'), ], ), icon: const Icon(Icons.check), diff --git a/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart b/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart index c1b1ec2d..964254be 100644 --- a/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart +++ b/lib/ui/views/settings/settingsFragment/settings_manage_api_url.dart @@ -30,7 +30,7 @@ class SManageApiUrl extends BaseViewModel { icon: const Icon(Icons.manage_history_outlined), onPressed: () => showApiUrlResetDialog(context), color: Theme.of(context).colorScheme.secondary, - ) + ), ], ), backgroundColor: Theme.of(context).colorScheme.secondaryContainer, @@ -69,7 +69,7 @@ class SManageApiUrl extends BaseViewModel { _managerAPI.setApiUrl(apiUrl); Navigator.of(context).pop(); }, - ) + ), ], ), ); @@ -97,7 +97,7 @@ class SManageApiUrl extends BaseViewModel { ..pop() ..pop(); }, - ) + ), ], ), ); diff --git a/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart b/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart index ca4bd7e8..4ac4689b 100644 --- a/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart +++ b/lib/ui/views/settings/settingsFragment/settings_manage_keystore_password.dart @@ -30,7 +30,7 @@ class SManageKeystorePassword extends BaseViewModel { onPressed: () => _keystorePasswordController.text = _managerAPI.defaultKeystorePassword, color: Theme.of(context).colorScheme.secondary, - ) + ), ], ), backgroundColor: Theme.of(context).colorScheme.secondaryContainer, @@ -62,7 +62,7 @@ class SManageKeystorePassword extends BaseViewModel { _managerAPI.setKeystorePassword(passwd); Navigator.of(context).pop(); }, - ) + ), ], ), ); diff --git a/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart b/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart index 66572e01..97dd35be 100644 --- a/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart +++ b/lib/ui/views/settings/settingsFragment/settings_manage_sources.dart @@ -40,7 +40,7 @@ class SManageSources extends BaseViewModel { icon: const Icon(Icons.manage_history_outlined), onPressed: () => showResetConfirmationDialog(context), color: Theme.of(context).colorScheme.secondary, - ) + ), ], ), backgroundColor: Theme.of(context).colorScheme.secondaryContainer, @@ -102,7 +102,7 @@ class SManageSources extends BaseViewModel { onChanged: (value) => notifyListeners(), ), const SizedBox(height: 20), - I18nText('settingsView.sourcesUpdateNote') + I18nText('settingsView.sourcesUpdateNote'), ], ), ), @@ -132,7 +132,7 @@ class SManageSources extends BaseViewModel { _toast.showBottom('settingsView.restartAppForChanges'); Navigator.of(context).pop(); }, - ) + ), ], ), ); @@ -163,7 +163,7 @@ class SManageSources extends BaseViewModel { ..pop() ..pop(); }, - ) + ), ], ), ); diff --git a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart index 0f6184a1..dd364c7d 100644 --- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart +++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart @@ -74,7 +74,7 @@ class AppInfoViewModel extends BaseViewModel { CustomMaterialButton( label: I18nText('okButton'), onPressed: () => Navigator.of(context).pop(), - ) + ), ], ), ); @@ -103,7 +103,7 @@ class AppInfoViewModel extends BaseViewModel { Navigator.of(context).pop(); Navigator.of(context).pop(); }, - ) + ), ], ), ); @@ -140,7 +140,7 @@ class AppInfoViewModel extends BaseViewModel { CustomMaterialButton( label: I18nText('okButton'), onPressed: () => Navigator.of(context).pop(), - ) + ), ], ), ); diff --git a/lib/ui/widgets/appSelectorView/installed_app_item.dart b/lib/ui/widgets/appSelectorView/installed_app_item.dart index 7e96e655..ae129cbf 100644 --- a/lib/ui/widgets/appSelectorView/installed_app_item.dart +++ b/lib/ui/widgets/appSelectorView/installed_app_item.dart @@ -66,7 +66,7 @@ class _InstalledAppItemState extends State { context, 'installed', translationParams: { - 'version': 'v${widget.installedVersion}' + 'version': 'v${widget.installedVersion}', }, ), ), diff --git a/lib/ui/widgets/homeView/installed_apps_card.dart b/lib/ui/widgets/homeView/installed_apps_card.dart index e99dbaa0..7a989856 100644 --- a/lib/ui/widgets/homeView/installed_apps_card.dart +++ b/lib/ui/widgets/homeView/installed_apps_card.dart @@ -64,7 +64,7 @@ class InstalledAppsCard extends StatelessWidget { Theme.of(context).colorScheme.secondary, ), ), - ) + ), ], ), ), diff --git a/lib/ui/widgets/homeView/update_confirmation_dialog.dart b/lib/ui/widgets/homeView/update_confirmation_dialog.dart index 4d3b877e..7839536a 100644 --- a/lib/ui/widgets/homeView/update_confirmation_dialog.dart +++ b/lib/ui/widgets/homeView/update_confirmation_dialog.dart @@ -95,7 +95,7 @@ class UpdateConfirmationDialog extends StatelessWidget { ? model.updatePatches(context) : model.updateManager(context); }, - ) + ), ], ), ), diff --git a/lib/ui/widgets/patchesSelectorView/patch_item.dart b/lib/ui/widgets/patchesSelectorView/patch_item.dart index af62f8c6..f814a28b 100644 --- a/lib/ui/widgets/patchesSelectorView/patch_item.dart +++ b/lib/ui/widgets/patchesSelectorView/patch_item.dart @@ -129,7 +129,7 @@ class _PatchItemState extends State { widget.onChanged(widget.isSelected); }, ), - ) + ), ], ), if (widget.isUnsupported && @@ -190,7 +190,7 @@ class _PatchItemState extends State { CustomMaterialButton( label: I18nText('okButton'), onPressed: () => Navigator.of(context).pop(), - ) + ), ], ), ); diff --git a/lib/ui/widgets/settingsView/custom_switch.dart b/lib/ui/widgets/settingsView/custom_switch.dart index 6561ea0e..8328c90b 100644 --- a/lib/ui/widgets/settingsView/custom_switch.dart +++ b/lib/ui/widgets/settingsView/custom_switch.dart @@ -50,7 +50,7 @@ class CustomSwitch extends StatelessWidget { color: Colors.black12.withOpacity(0.1), spreadRadius: 0.5, blurRadius: 1, - ) + ), ], ), ), diff --git a/lib/ui/widgets/settingsView/settings_advanced_section.dart b/lib/ui/widgets/settingsView/settings_advanced_section.dart index 2cf1c3d7..694aa1d5 100644 --- a/lib/ui/widgets/settingsView/settings_advanced_section.dart +++ b/lib/ui/widgets/settingsView/settings_advanced_section.dart @@ -93,9 +93,9 @@ class SAdvancedSection extends StatelessWidget { label: I18nText('yesButton'), onPressed: () => { Navigator.of(context).pop(), - _settingsViewModel.deleteKeystore() + _settingsViewModel.deleteKeystore(), }, - ) + ), ], ), ); diff --git a/lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart b/lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart index fa9dad27..b8a58412 100644 --- a/lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart +++ b/lib/ui/widgets/settingsView/settings_experimental_universal_patches.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_i18n/widgets/I18nText.dart'; -import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; - import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patches_selector/patches_selector_viewmodel.dart'; +import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; class SExperimentalUniversalPatches extends StatefulWidget { const SExperimentalUniversalPatches({super.key}); diff --git a/lib/ui/widgets/settingsView/settings_export_section.dart b/lib/ui/widgets/settingsView/settings_export_section.dart index e4881a09..817f9825 100644 --- a/lib/ui/widgets/settingsView/settings_export_section.dart +++ b/lib/ui/widgets/settingsView/settings_export_section.dart @@ -119,9 +119,9 @@ class SExportSection extends StatelessWidget { label: I18nText('yesButton'), onPressed: () => { Navigator.of(context).pop(), - _settingsViewModel.resetSelectedPatches() + _settingsViewModel.resetSelectedPatches(), }, - ) + ), ], ), ); diff --git a/lib/utils/about_info.dart b/lib/utils/about_info.dart index 5220e861..0b7dcffc 100644 --- a/lib/utils/about_info.dart +++ b/lib/utils/about_info.dart @@ -11,7 +11,7 @@ class AboutInfo { 'flavor': kReleaseMode ? 'release' : 'debug', 'model': info.model, 'androidVersion': info.version.release, - 'supportedArch': info.supportedAbis + 'supportedArch': info.supportedAbis, }; } }