From c957475a1edd437aed21a858a237c5063f0b4b2d Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Fri, 26 Jul 2024 16:28:08 +0300 Subject: [PATCH] chore: format all files --- .editorconfig | 2 +- lib/app/data/models/alignment.dart | 1 - lib/app/data/models/character.dart | 3 ++- lib/app/data/models/gear_choice.dart | 2 +- lib/app/data/models/item.dart | 3 ++- lib/app/data/models/monster.dart | 2 +- lib/app/data/services/auth_provider.dart | 1 - lib/app/data/services/intl_service.dart | 1 - .../data/services/repository_provider.dart | 1 - lib/app/data/services/user_provider.dart | 4 +-- lib/app/model_utils/character_utils.dart | 1 - .../ability_score_form_controller.dart | 1 - .../ability_scores_form_controller.dart | 1 - .../views/ability_scores_form_view.dart | 1 - lib/app/modules/About/views/about_view.dart | 1 - .../controllers/account_controller.dart | 1 - .../modules/Account/views/account_view.dart | 6 ++--- .../views/basic_info_form_view.dart | 1 - .../bonds_flags_form_controller.dart | 3 +-- .../Changelog/changelog_controller.dart | 1 - .../modules/Changelog/changelog_parser.dart | 1 - lib/app/modules/Changelog/changelog_view.dart | 4 +-- .../views/character_list_view.dart | 1 - .../class_alignments_controller.dart | 1 - .../select_moves_spells_controller.dart | 1 - .../views/select_moves_spells_view.dart | 1 - .../create_character_controller.dart | 8 +++--- .../views/create_character_view.dart | 1 - .../views/home_character_actions_view.dart | 1 - .../views/home_character_journal_view.dart | 1 - .../Home/views/home_character_view.dart | 1 - lib/app/modules/Home/views/home_fab.dart | 1 - lib/app/modules/Home/views/home_nav_bar.dart | 4 +-- .../home_character_actions_filters.dart | 1 - .../home_character_actions_summary.dart | 1 - .../home_character_dynamic_cards.dart | 1 - .../home_character_hp_xp_view.dart | 7 +++--- .../controllers/export_controller.dart | 1 - .../controllers/import_controller.dart | 1 - .../controllers/import_export_controller.dart | 9 ++++--- .../ImportExport/views/export_view.dart | 1 - .../views/import_export_view.dart | 1 - .../ImportExport/views/import_view.dart | 1 - .../controllers/library_list_controller.dart | 2 -- .../LibraryList/views/library_card_list.dart | 1 - .../views/library_collection_view.dart | 1 - .../LibraryList/views/library_list_view.dart | 4 +-- .../views/library_select_button.dart | 1 - .../views/moves_library_list_view.dart | 1 - .../Login/controllers/login_controller.dart | 1 - lib/app/modules/Login/views/login_view.dart | 16 ++++++------ .../select_character_theme_controller.dart | 3 ++- .../views/select_character_theme_view.dart | 1 - .../controllers/send_feedback_controller.dart | 1 - .../controllers/settings_controller.dart | 1 - .../modules/Settings/views/settings_view.dart | 1 - .../starting_gear_edit_form_controller.dart | 1 - .../starting_gear_edit_form_view.dart | 1 - .../views/starting_gear_form_view.dart | 4 +-- lib/app/routes/app_pages.dart | 1 - lib/app/routes/app_routes.dart | 3 ++- lib/app/routes/custom_transitions.dart | 1 - lib/app/themes/theme_utils.dart | 5 ++-- .../widgets/atoms/alignment_values_field.dart | 1 - .../widgets/atoms/custom_expansion_tile.dart | 25 +++++++++++-------- lib/app/widgets/atoms/custom_snack_bar.dart | 8 +++--- lib/app/widgets/atoms/dice_icon.dart | 2 +- lib/app/widgets/atoms/help_tooltip_icon.dart | 1 - lib/app/widgets/atoms/lifecycle_builder.dart | 2 +- lib/app/widgets/atoms/menu_button.dart | 3 ++- lib/app/widgets/atoms/number_text_field.dart | 1 - lib/app/widgets/atoms/rainbow_text.dart | 3 ++- lib/app/widgets/atoms/rich_text_field.dart | 9 ++++--- lib/app/widgets/atoms/xp_bar.dart | 1 - .../widgets/cards/character_class_card.dart | 1 - .../widgets/cards/dynamic_action_card.dart | 1 - .../cards/dynamic_action_card_mini.dart | 1 - lib/app/widgets/cards/item_card.dart | 4 +-- lib/app/widgets/chips/ability_score_chip.dart | 1 - lib/app/widgets/chips/primary_chip.dart | 1 - lib/app/widgets/dialogs/xp_dialog.dart | 1 - .../widgets/forms/character_class_form.dart | 1 - lib/app/widgets/forms/entity_share_form.dart | 1 - .../widgets/forms/library_entity_form.dart | 9 ++++--- lib/app/widgets/forms/note_form.dart | 1 - .../widgets/molecules/dice_list_input.dart | 1 - .../widgets/molecules/user_menu_popover.dart | 3 ++- lib/core/http/api_base.dart | 2 -- lib/core/platform_helper.dart | 1 - .../storage_handler/storage_handler_core.dart | 1 - lib/core/utils/color_utils.dart | 1 - lib/core/utils/list_utils.dart | 8 +++--- lib/core/utils/secrets.example.dart | 3 +-- lib/core/utils/upload_utils.dart | 1 - lib/main.dart | 1 - 95 files changed, 92 insertions(+), 145 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1befc849..066ed8f0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,5 @@ [*] trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = false indent_size = 2 indent_style = space diff --git a/lib/app/data/models/alignment.dart b/lib/app/data/models/alignment.dart index 141d7dc1..00bf958d 100644 --- a/lib/app/data/models/alignment.dart +++ b/lib/app/data/models/alignment.dart @@ -236,4 +236,3 @@ class AlignmentValues extends dw.AlignmentValues { @override String toString() => 'AlignmentValues($debugProperties)'; } - diff --git a/lib/app/data/models/character.dart b/lib/app/data/models/character.dart index 80e861ea..2c228083 100644 --- a/lib/app/data/models/character.dart +++ b/lib/app/data/models/character.dart @@ -80,7 +80,8 @@ class Character with WithIcon implements WithMeta { double get currentExpPercent => clamp(stats.currentXp / maxXp, 0, 1); int get maxLoad => stats.load ?? defaultMaxLoad; int get defaultMaxLoad => characterClass.load + abilityScores.loadBaseValue; - double get currentLoad => items.fold(0, (weight, item) => weight + item.weight); + double get currentLoad => + items.fold(0, (weight, item) => weight + item.weight); int get armor => stats.armor ?? defaultArmor; int get defaultArmor => items.fold(0, (armor, item) => armor + item.armor); int get damageModifier => items.fold(0, (mod, item) => mod + item.damage); diff --git a/lib/app/data/models/gear_choice.dart b/lib/app/data/models/gear_choice.dart index e9cdc341..e0c9b249 100644 --- a/lib/app/data/models/gear_choice.dart +++ b/lib/app/data/models/gear_choice.dart @@ -10,7 +10,7 @@ class GearChoice extends dw.GearChoice { required List super.selections, super.preselect, super.maxSelections, - }) : _selections = selections; + }) : _selections = selections; @override List get selections => _selections; diff --git a/lib/app/data/models/item.dart b/lib/app/data/models/item.dart index 6b8c7fda..db04a12f 100644 --- a/lib/app/data/models/item.dart +++ b/lib/app/data/models/item.dart @@ -35,7 +35,8 @@ class Item extends dw.Item with WithIcon implements WithMeta { .firstWhereOrNull((tag) => cleanStr(tag?.name ?? '') == name); bool get isWorn => findTag('worn') != null; - double get weight => (settings.countWeight ? tagIntValue('weight') ?? 0 : 0) * amount; + double get weight => + (settings.countWeight ? tagIntValue('weight') ?? 0 : 0) * amount; int get armor => settings.countArmor && isWorn && equipped ? tagIntValue('armor') ?? 0 : 0; int get damage => diff --git a/lib/app/data/models/monster.dart b/lib/app/data/models/monster.dart index bf5d3cfc..a107b314 100644 --- a/lib/app/data/models/monster.dart +++ b/lib/app/data/models/monster.dart @@ -12,7 +12,7 @@ class Monster extends dw.Monster implements WithMeta { required super.instinct, required super.tags, required super.moves, - }) : _meta = meta; + }) : _meta = meta; @override Meta get meta => _meta; diff --git a/lib/app/data/services/auth_provider.dart b/lib/app/data/services/auth_provider.dart index 8c152370..6d078d00 100644 --- a/lib/app/data/services/auth_provider.dart +++ b/lib/app/data/services/auth_provider.dart @@ -189,4 +189,3 @@ mixin AuthProviderMixin { AuthProvider get authProvider => AuthProvider.of(appGlobalKey.currentContext!); } - diff --git a/lib/app/data/services/intl_service.dart b/lib/app/data/services/intl_service.dart index e02fc8ad..05d3e9ef 100644 --- a/lib/app/data/services/intl_service.dart +++ b/lib/app/data/services/intl_service.dart @@ -49,4 +49,3 @@ class IntlService extends ChangeNotifier { return _m[locale]!; } } - diff --git a/lib/app/data/services/repository_provider.dart b/lib/app/data/services/repository_provider.dart index e2f8aa62..0f89a9ac 100644 --- a/lib/app/data/services/repository_provider.dart +++ b/lib/app/data/services/repository_provider.dart @@ -479,4 +479,3 @@ mixin RepositoryProviderMixin { RepositoryProvider.of(appGlobalKey.currentContext!); RepositoryProvider get repository => repo; } - diff --git a/lib/app/data/services/user_provider.dart b/lib/app/data/services/user_provider.dart index 70ba2f5b..64d5fc16 100644 --- a/lib/app/data/services/user_provider.dart +++ b/lib/app/data/services/user_provider.dart @@ -134,7 +134,8 @@ class UserProvider extends ChangeNotifier with RepositoryProviderMixin { } Future _migrateUser(fba.User user) async { - final migrationDetails = await Navigator.of(navigatorKey.currentContext!).pushNamed( + final migrationDetails = + await Navigator.of(navigatorKey.currentContext!).pushNamed( Routes.migration, arguments: MigrationArguments(email: user.email ?? ''), ) as MigrationDetails?; @@ -249,4 +250,3 @@ mixin UserProviderMixin { UserProvider.of(appGlobalKey.currentContext!); User get user => userProvider.current; } - diff --git a/lib/app/model_utils/character_utils.dart b/lib/app/model_utils/character_utils.dart index e14b9823..703f3892 100644 --- a/lib/app/model_utils/character_utils.dart +++ b/lib/app/model_utils/character_utils.dart @@ -173,4 +173,3 @@ class CharacterUtils { CustomSnackBar.show(content: tr.actions.classActions.markXP.success); } } - diff --git a/lib/app/modules/AbilityScoreForm/controllers/ability_score_form_controller.dart b/lib/app/modules/AbilityScoreForm/controllers/ability_score_form_controller.dart index fee9520f..1a75ad19 100644 --- a/lib/app/modules/AbilityScoreForm/controllers/ability_score_form_controller.dart +++ b/lib/app/modules/AbilityScoreForm/controllers/ability_score_form_controller.dart @@ -102,4 +102,3 @@ class AbilityScoreFormArguments { required this.onSave, }); } - diff --git a/lib/app/modules/AbilityScoresForm/controllers/ability_scores_form_controller.dart b/lib/app/modules/AbilityScoresForm/controllers/ability_scores_form_controller.dart index 9332fe38..506fad9b 100644 --- a/lib/app/modules/AbilityScoresForm/controllers/ability_scores_form_controller.dart +++ b/lib/app/modules/AbilityScoresForm/controllers/ability_scores_form_controller.dart @@ -79,4 +79,3 @@ class AbilityScoresFormArguments { required this.onChanged, }); } - diff --git a/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart b/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart index 1e03e1cc..19cd3658 100644 --- a/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart +++ b/lib/app/modules/AbilityScoresForm/views/ability_scores_form_view.dart @@ -180,4 +180,3 @@ class AbilityScoresFormView extends StatelessWidget { Navigator.of(context).pop(); } } - diff --git a/lib/app/modules/About/views/about_view.dart b/lib/app/modules/About/views/about_view.dart index 1acf9656..ae448e14 100644 --- a/lib/app/modules/About/views/about_view.dart +++ b/lib/app/modules/About/views/about_view.dart @@ -247,4 +247,3 @@ class _SocialButton extends StatelessWidget { ); } } - diff --git a/lib/app/modules/Account/controllers/account_controller.dart b/lib/app/modules/Account/controllers/account_controller.dart index 8b26a572..6fb0c0b6 100644 --- a/lib/app/modules/Account/controllers/account_controller.dart +++ b/lib/app/modules/Account/controllers/account_controller.dart @@ -74,4 +74,3 @@ class AccountController extends ChangeNotifier ); } } - diff --git a/lib/app/modules/Account/views/account_view.dart b/lib/app/modules/Account/views/account_view.dart index d926d7e4..9b0098d1 100644 --- a/lib/app/modules/Account/views/account_view.dart +++ b/lib/app/modules/Account/views/account_view.dart @@ -68,8 +68,9 @@ class AccountView extends StatelessWidget { ) : const Icon(Icons.image), enabled: !controller.uploading, - onTap: - !controller.uploading ? () => _uploadImage(controller, context) : null, + onTap: !controller.uploading + ? () => _uploadImage(controller, context) + : null, ), ), () => Consumer( @@ -447,4 +448,3 @@ class _PasswordFieldDialogState extends State { return PasswordValidator().validator(value); } } - diff --git a/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart b/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart index c9a0b0e0..b517c865 100644 --- a/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart +++ b/lib/app/modules/BasicInfoForm/views/basic_info_form_view.dart @@ -196,4 +196,3 @@ class BasicInfoFormView extends StatelessWidget with UserProviderMixin { Navigator.of(context).pop(); } } - diff --git a/lib/app/modules/BondsFlagsForm/controllers/bonds_flags_form_controller.dart b/lib/app/modules/BondsFlagsForm/controllers/bonds_flags_form_controller.dart index 39d81da6..c1e71ec3 100644 --- a/lib/app/modules/BondsFlagsForm/controllers/bonds_flags_form_controller.dart +++ b/lib/app/modules/BondsFlagsForm/controllers/bonds_flags_form_controller.dart @@ -44,7 +44,7 @@ class BondsFlagsFormController extends ChangeNotifier { } void removeBond(int index) { - debugPrint('remove bond $index'); + debugPrint('remove bond $index'); bonds.removeAt(index); bondsCtrls[index].removeListener(_setDirty); bondsCtrls.removeAt(index); @@ -115,4 +115,3 @@ class BondsFlagsFormArguments { required this.onChanged, }); } - diff --git a/lib/app/modules/Changelog/changelog_controller.dart b/lib/app/modules/Changelog/changelog_controller.dart index 73e2fecc..7004df77 100644 --- a/lib/app/modules/Changelog/changelog_controller.dart +++ b/lib/app/modules/Changelog/changelog_controller.dart @@ -54,4 +54,3 @@ class ChangelogController extends ChangeNotifier { currentVersion = version; } } - diff --git a/lib/app/modules/Changelog/changelog_parser.dart b/lib/app/modules/Changelog/changelog_parser.dart index 128bbf3b..e5c7df48 100644 --- a/lib/app/modules/Changelog/changelog_parser.dart +++ b/lib/app/modules/Changelog/changelog_parser.dart @@ -31,4 +31,3 @@ class ChangelogEntry { return ChangelogEntry._(version, content); } } - diff --git a/lib/app/modules/Changelog/changelog_view.dart b/lib/app/modules/Changelog/changelog_view.dart index dcccf9e9..308e947e 100644 --- a/lib/app/modules/Changelog/changelog_view.dart +++ b/lib/app/modules/Changelog/changelog_view.dart @@ -66,7 +66,8 @@ class ChangelogView extends StatelessWidget { entry.version >= controller.currentVersion, children: [ Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 32), + padding: const EdgeInsets.symmetric( + horizontal: 8, vertical: 32), child: SizedBox( width: 800, child: MarkdownBody(data: content), @@ -83,4 +84,3 @@ class ChangelogView extends StatelessWidget { ); } } - diff --git a/lib/app/modules/CharacterList/views/character_list_view.dart b/lib/app/modules/CharacterList/views/character_list_view.dart index e4b77fdc..43bbecfe 100644 --- a/lib/app/modules/CharacterList/views/character_list_view.dart +++ b/lib/app/modules/CharacterList/views/character_list_view.dart @@ -118,4 +118,3 @@ class CharacterListPageView extends StatelessWidget with UserProviderMixin { ); } } - diff --git a/lib/app/modules/ClassAlignments/controllers/class_alignments_controller.dart b/lib/app/modules/ClassAlignments/controllers/class_alignments_controller.dart index cc5b3b44..fa6f6828 100644 --- a/lib/app/modules/ClassAlignments/controllers/class_alignments_controller.dart +++ b/lib/app/modules/ClassAlignments/controllers/class_alignments_controller.dart @@ -88,4 +88,3 @@ class ClassAlignmentsArguments { this.preselected, }); } - diff --git a/lib/app/modules/CreateCharacter/SelectMovesSpells/controllers/select_moves_spells_controller.dart b/lib/app/modules/CreateCharacter/SelectMovesSpells/controllers/select_moves_spells_controller.dart index bb6f9986..7c4ee4b1 100644 --- a/lib/app/modules/CreateCharacter/SelectMovesSpells/controllers/select_moves_spells_controller.dart +++ b/lib/app/modules/CreateCharacter/SelectMovesSpells/controllers/select_moves_spells_controller.dart @@ -86,4 +86,3 @@ class SelectMovesSpellsArguments { required this.characterClass, }); } - diff --git a/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart b/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart index 84f44eb2..655fa2c1 100644 --- a/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart +++ b/lib/app/modules/CreateCharacter/SelectMovesSpells/views/select_moves_spells_view.dart @@ -192,4 +192,3 @@ class SelectMovesSpellsView extends StatelessWidget { Navigator.of(context).pop(); } } - diff --git a/lib/app/modules/CreateCharacter/controllers/create_character_controller.dart b/lib/app/modules/CreateCharacter/controllers/create_character_controller.dart index ddf6518e..c0d9ad5e 100644 --- a/lib/app/modules/CreateCharacter/controllers/create_character_controller.dart +++ b/lib/app/modules/CreateCharacter/controllers/create_character_controller.dart @@ -17,7 +17,8 @@ import 'package:dungeon_world_data/dungeon_world_data.dart' as dw; import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; -class CreateCharacterController extends ChangeNotifier with RepositoryProviderMixin { +class CreateCharacterController extends ChangeNotifier + with RepositoryProviderMixin { var name = ''; var avatarUrl = ''; CharacterClass? characterClass; @@ -30,7 +31,8 @@ class CreateCharacterController extends ChangeNotifier with RepositoryProviderMi var dirty = false; - static CreateCharacterController of(BuildContext context, {bool listen = false}) => + static CreateCharacterController of(BuildContext context, + {bool listen = false}) => Provider.of(context, listen: listen); static Widget consumer( Widget Function(BuildContext, CreateCharacterController, Widget?) builder, @@ -55,7 +57,7 @@ class CreateCharacterController extends ChangeNotifier with RepositoryProviderMi setDirty(); } - void setClass( CharacterClass cls) { + void setClass(CharacterClass cls) { characterClass = cls; setStartingGear( cls.gearChoices diff --git a/lib/app/modules/CreateCharacter/views/create_character_view.dart b/lib/app/modules/CreateCharacter/views/create_character_view.dart index 2e0e030c..007020e7 100644 --- a/lib/app/modules/CreateCharacter/views/create_character_view.dart +++ b/lib/app/modules/CreateCharacter/views/create_character_view.dart @@ -434,4 +434,3 @@ class _Card extends StatelessWidget { ); } } - diff --git a/lib/app/modules/Home/views/home_character_actions_view.dart b/lib/app/modules/Home/views/home_character_actions_view.dart index 42552ede..0f184404 100644 --- a/lib/app/modules/Home/views/home_character_actions_view.dart +++ b/lib/app/modules/Home/views/home_character_actions_view.dart @@ -511,4 +511,3 @@ class ActionsCardList extends StatelessWidget }; } } - diff --git a/lib/app/modules/Home/views/home_character_journal_view.dart b/lib/app/modules/Home/views/home_character_journal_view.dart index 33903489..c51a28a7 100644 --- a/lib/app/modules/Home/views/home_character_journal_view.dart +++ b/lib/app/modules/Home/views/home_character_journal_view.dart @@ -214,4 +214,3 @@ class HomeCharacterJournalView extends StatelessWidget ); } } - diff --git a/lib/app/modules/Home/views/home_character_view.dart b/lib/app/modules/Home/views/home_character_view.dart index a5f1c455..e68ddf60 100644 --- a/lib/app/modules/Home/views/home_character_view.dart +++ b/lib/app/modules/Home/views/home_character_view.dart @@ -235,4 +235,3 @@ mixin HomeCharacterPaddingMixin { child: child, ); } - diff --git a/lib/app/modules/Home/views/home_fab.dart b/lib/app/modules/Home/views/home_fab.dart index c8581619..5b9b200d 100644 --- a/lib/app/modules/Home/views/home_fab.dart +++ b/lib/app/modules/Home/views/home_fab.dart @@ -78,4 +78,3 @@ class _HomeFABState extends State with CharacterProviderMixin { } } } - diff --git a/lib/app/modules/Home/views/home_nav_bar.dart b/lib/app/modules/Home/views/home_nav_bar.dart index 8fc89b12..8095ddbe 100644 --- a/lib/app/modules/Home/views/home_nav_bar.dart +++ b/lib/app/modules/Home/views/home_nav_bar.dart @@ -105,7 +105,8 @@ class _NavItem extends StatelessWidget { final theme = Theme.of(context); final colorScheme = theme.colorScheme; final selectedColor = colorScheme.secondary; - final selectedFgColor = accessibleColorFor(theme.colorScheme.onSecondary, selectedColor); + final selectedFgColor = + accessibleColorFor(theme.colorScheme.onSecondary, selectedColor); final unselectedFgColor = theme.colorScheme.onSurface; const duration = Duration(milliseconds: 250); @@ -152,4 +153,3 @@ class _NavItem extends StatelessWidget { ); } } - diff --git a/lib/app/modules/Home/views/local_widgets/home_character_actions_filters.dart b/lib/app/modules/Home/views/local_widgets/home_character_actions_filters.dart index 87702bbf..b558da97 100644 --- a/lib/app/modules/Home/views/local_widgets/home_character_actions_filters.dart +++ b/lib/app/modules/Home/views/local_widgets/home_character_actions_filters.dart @@ -38,4 +38,3 @@ class HomeCharacterActionsFilters extends StatelessWidget { ); } } - diff --git a/lib/app/modules/Home/views/local_widgets/home_character_actions_summary.dart b/lib/app/modules/Home/views/local_widgets/home_character_actions_summary.dart index 07e90088..d8d4cb2d 100644 --- a/lib/app/modules/Home/views/local_widgets/home_character_actions_summary.dart +++ b/lib/app/modules/Home/views/local_widgets/home_character_actions_summary.dart @@ -97,4 +97,3 @@ class HomeCharacterActionsSummary extends StatelessWidget { return null; } } - diff --git a/lib/app/modules/Home/views/local_widgets/home_character_dynamic_cards.dart b/lib/app/modules/Home/views/local_widgets/home_character_dynamic_cards.dart index 031465c4..e4e32871 100644 --- a/lib/app/modules/Home/views/local_widgets/home_character_dynamic_cards.dart +++ b/lib/app/modules/Home/views/local_widgets/home_character_dynamic_cards.dart @@ -538,4 +538,3 @@ class HomeCharacterDynamicCards extends StatelessWidget ]; } } - diff --git a/lib/app/modules/Home/views/local_widgets/home_character_hp_xp_view.dart b/lib/app/modules/Home/views/local_widgets/home_character_hp_xp_view.dart index f6d55c04..3fc2b662 100644 --- a/lib/app/modules/Home/views/local_widgets/home_character_hp_xp_view.dart +++ b/lib/app/modules/Home/views/local_widgets/home_character_hp_xp_view.dart @@ -21,7 +21,8 @@ class HomeCharacterHpExpView extends StatelessWidget { builder: (_) => const HPDialog(), ), child: Tooltip( - message: tr.hp.bar.tooltip(PlatformHelper.actionString(context)), + message: + tr.hp.bar.tooltip(PlatformHelper.actionString(context)), preferBelow: false, child: const Padding( padding: EdgeInsets.all(4), @@ -40,7 +41,8 @@ class HomeCharacterHpExpView extends StatelessWidget { builder: (_) => const EXPDialog(), ), child: Tooltip( - message: tr.xp.bar.tooltip(PlatformHelper.actionString(context)), + message: + tr.xp.bar.tooltip(PlatformHelper.actionString(context)), preferBelow: false, child: const Padding( padding: EdgeInsets.all(4), @@ -52,4 +54,3 @@ class HomeCharacterHpExpView extends StatelessWidget { ], ); } - diff --git a/lib/app/modules/ImportExport/controllers/export_controller.dart b/lib/app/modules/ImportExport/controllers/export_controller.dart index 5b0a158c..303ec67e 100644 --- a/lib/app/modules/ImportExport/controllers/export_controller.dart +++ b/lib/app/modules/ImportExport/controllers/export_controller.dart @@ -173,4 +173,3 @@ class ExportSelections { throw TypeError(); } } - diff --git a/lib/app/modules/ImportExport/controllers/import_controller.dart b/lib/app/modules/ImportExport/controllers/import_controller.dart index 101068b7..5d46aa60 100644 --- a/lib/app/modules/ImportExport/controllers/import_controller.dart +++ b/lib/app/modules/ImportExport/controllers/import_controller.dart @@ -292,4 +292,3 @@ class ImportSelections { races, ].any((l) => l.isNotEmpty); } - diff --git a/lib/app/modules/ImportExport/controllers/import_export_controller.dart b/lib/app/modules/ImportExport/controllers/import_export_controller.dart index db0306f8..c282e005 100644 --- a/lib/app/modules/ImportExport/controllers/import_export_controller.dart +++ b/lib/app/modules/ImportExport/controllers/import_export_controller.dart @@ -8,11 +8,14 @@ import 'import_controller.dart'; // TODO remove? class ImportExportController extends ChangeNotifier { void Function()? doExport(BuildContext context) { - debugPrint('Exporting from controller'); - return Provider.of(context, listen: false).getDoExport(context); + debugPrint('Exporting from controller'); + return Provider.of(context, listen: false) + .getDoExport(context); } + void Function()? doImport(BuildContext context) => - Provider.of(context, listen: false).getDoImport(context); + Provider.of(context, listen: false) + .getDoImport(context); } abstract class ImportExportSelectionData { diff --git a/lib/app/modules/ImportExport/views/export_view.dart b/lib/app/modules/ImportExport/views/export_view.dart index 275e2096..474fd460 100644 --- a/lib/app/modules/ImportExport/views/export_view.dart +++ b/lib/app/modules/ImportExport/views/export_view.dart @@ -57,4 +57,3 @@ class ExportView extends StatelessWidget { ); } } - diff --git a/lib/app/modules/ImportExport/views/import_export_view.dart b/lib/app/modules/ImportExport/views/import_export_view.dart index 78850f5a..ed332843 100644 --- a/lib/app/modules/ImportExport/views/import_export_view.dart +++ b/lib/app/modules/ImportExport/views/import_export_view.dart @@ -74,4 +74,3 @@ class _ImportExportViewState extends State ); } } - diff --git a/lib/app/modules/ImportExport/views/import_view.dart b/lib/app/modules/ImportExport/views/import_view.dart index 6a1026f8..e355c1e5 100644 --- a/lib/app/modules/ImportExport/views/import_view.dart +++ b/lib/app/modules/ImportExport/views/import_view.dart @@ -67,4 +67,3 @@ class ImportView extends StatelessWidget { ); } } - diff --git a/lib/app/modules/LibraryList/controllers/library_list_controller.dart b/lib/app/modules/LibraryList/controllers/library_list_controller.dart index fed3ad76..5b605ef8 100644 --- a/lib/app/modules/LibraryList/controllers/library_list_controller.dart +++ b/lib/app/modules/LibraryList/controllers/library_list_controller.dart @@ -64,7 +64,6 @@ class LibraryListController> super.dispose(); } - void setFilters(FiltersGroup group, F? filters) { this.filters[group] = filters; notifyListeners(); @@ -228,4 +227,3 @@ abstract class LibraryListArguments> throw TypeError(); } } - diff --git a/lib/app/modules/LibraryList/views/library_collection_view.dart b/lib/app/modules/LibraryList/views/library_collection_view.dart index 586cf632..4c1b0fac 100644 --- a/lib/app/modules/LibraryList/views/library_collection_view.dart +++ b/lib/app/modules/LibraryList/views/library_collection_view.dart @@ -109,4 +109,3 @@ class LibraryCollectionView extends StatelessWidget ); } } - diff --git a/lib/app/modules/LibraryList/views/library_list_view.dart b/lib/app/modules/LibraryList/views/library_list_view.dart index 6e3c0c8c..0c47f26f 100644 --- a/lib/app/modules/LibraryList/views/library_list_view.dart +++ b/lib/app/modules/LibraryList/views/library_list_view.dart @@ -138,7 +138,8 @@ class _LibraryListViewState> totalItemCount: controller.builtInListRaw.length, itemCount: controller.builtInList.length, itemBuilder: (context, index) { - final item = controller.builtInList.elementAt(index); + final item = + controller.builtInList.elementAt(index); return _wrapWithSelection( context, item, FiltersGroup.playbook); }, @@ -280,4 +281,3 @@ class _LibraryListViewState> }, ); } - diff --git a/lib/app/modules/LibraryList/views/library_select_button.dart b/lib/app/modules/LibraryList/views/library_select_button.dart index fa94f22d..66ec914d 100644 --- a/lib/app/modules/LibraryList/views/library_select_button.dart +++ b/lib/app/modules/LibraryList/views/library_select_button.dart @@ -79,4 +79,3 @@ class LibrarySelectButton extends StatelessWidget { } } } - diff --git a/lib/app/modules/LibraryList/views/moves_library_list_view.dart b/lib/app/modules/LibraryList/views/moves_library_list_view.dart index 921368e7..08432f3c 100644 --- a/lib/app/modules/LibraryList/views/moves_library_list_view.dart +++ b/lib/app/modules/LibraryList/views/moves_library_list_view.dart @@ -95,4 +95,3 @@ class MoveLibraryListArguments extends LibraryListArguments { }, ); } - diff --git a/lib/app/modules/Login/controllers/login_controller.dart b/lib/app/modules/Login/controllers/login_controller.dart index a98e7566..315aafa8 100644 --- a/lib/app/modules/Login/controllers/login_controller.dart +++ b/lib/app/modules/Login/controllers/login_controller.dart @@ -125,4 +125,3 @@ class LoginController extends ChangeNotifier with AuthProviderMixin { return _valid; } } - diff --git a/lib/app/modules/Login/views/login_view.dart b/lib/app/modules/Login/views/login_view.dart index 13eb4326..cb94091f 100644 --- a/lib/app/modules/Login/views/login_view.dart +++ b/lib/app/modules/Login/views/login_view.dart @@ -157,13 +157,14 @@ class LoginView extends StatelessWidget { final controller = Provider.of(context, listen: false); - final res = PasswordValidator().validator(pwd) ?? - (pwd == controller.password.text - ? null - : tr.auth.signup.password.confirm - .error); - debugPrint('pwd: $res'); - return res; + final res = + PasswordValidator().validator(pwd) ?? + (pwd == controller.password.text + ? null + : tr.auth.signup.password.confirm + .error); + debugPrint('pwd: $res'); + return res; }, ), ], @@ -238,4 +239,3 @@ class LoginView extends StatelessWidget { ); } } - diff --git a/lib/app/modules/SelectCharacterTheme/controllers/select_character_theme_controller.dart b/lib/app/modules/SelectCharacterTheme/controllers/select_character_theme_controller.dart index 2f4a4a38..71a7a9e6 100644 --- a/lib/app/modules/SelectCharacterTheme/controllers/select_character_theme_controller.dart +++ b/lib/app/modules/SelectCharacterTheme/controllers/select_character_theme_controller.dart @@ -2,7 +2,8 @@ import 'package:dungeon_paper/app/data/services/character_provider.dart'; import 'package:dungeon_paper/app/themes/themes.dart'; import 'package:flutter/material.dart'; -class SelectCharacterThemeController extends ChangeNotifier with CharacterProviderMixin { +class SelectCharacterThemeController extends ChangeNotifier + with CharacterProviderMixin { final seeAll = {Brightness.light: false, Brightness.dark: false}; int? lightTheme = AppThemes.parchment; int? darkTheme = AppThemes.dark; diff --git a/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart b/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart index a78aef8b..c71813bf 100644 --- a/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart +++ b/lib/app/modules/SelectCharacterTheme/views/select_character_theme_view.dart @@ -111,4 +111,3 @@ class SelectCharacterThemeView extends StatelessWidget { ); } } - diff --git a/lib/app/modules/SendFeedback/controllers/send_feedback_controller.dart b/lib/app/modules/SendFeedback/controllers/send_feedback_controller.dart index 58885463..6e93060c 100644 --- a/lib/app/modules/SendFeedback/controllers/send_feedback_controller.dart +++ b/lib/app/modules/SendFeedback/controllers/send_feedback_controller.dart @@ -37,4 +37,3 @@ class SendFeedbackController extends ChangeNotifier with UserProviderMixin { } } } - diff --git a/lib/app/modules/Settings/controllers/settings_controller.dart b/lib/app/modules/Settings/controllers/settings_controller.dart index b4cf6e94..34ae0951 100644 --- a/lib/app/modules/Settings/controllers/settings_controller.dart +++ b/lib/app/modules/Settings/controllers/settings_controller.dart @@ -58,4 +58,3 @@ class SettingsController extends ChangeNotifier return userProvider.updateUser(user.copyWith(settings: settings)); } } - diff --git a/lib/app/modules/Settings/views/settings_view.dart b/lib/app/modules/Settings/views/settings_view.dart index 95559a43..fefd53bf 100644 --- a/lib/app/modules/Settings/views/settings_view.dart +++ b/lib/app/modules/Settings/views/settings_view.dart @@ -110,4 +110,3 @@ class SettingsView extends StatelessWidget ); } } - diff --git a/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_controller.dart b/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_controller.dart index 0f9f69d9..227a0317 100644 --- a/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_controller.dart +++ b/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_controller.dart @@ -292,4 +292,3 @@ class GearOptionData { amount.text = data.amount.toString(); } } - diff --git a/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_view.dart b/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_view.dart index f5722fd2..c4ac8c90 100644 --- a/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_view.dart +++ b/lib/app/modules/StartingGearEditForm/starting_gear_edit_form_view.dart @@ -343,4 +343,3 @@ class StartingGearEditFormView extends StatelessWidget }; } } - diff --git a/lib/app/modules/StartingGearForm/views/starting_gear_form_view.dart b/lib/app/modules/StartingGearForm/views/starting_gear_form_view.dart index 9dda3df5..05efd1f2 100644 --- a/lib/app/modules/StartingGearForm/views/starting_gear_form_view.dart +++ b/lib/app/modules/StartingGearForm/views/starting_gear_form_view.dart @@ -28,9 +28,8 @@ class StartingGearFormView extends StatelessWidget { label: Text(tr.generic.save), icon: const Icon(Icons.save), ), - body:Align( + body: Align( alignment: Alignment.topCenter, - child: SizedBox( width: 800, child: ListView( @@ -105,4 +104,3 @@ class StartingGearFormView extends StatelessWidget { Navigator.of(context).pop(); } } - diff --git a/lib/app/routes/app_pages.dart b/lib/app/routes/app_pages.dart index 67cb731f..93be7ec5 100644 --- a/lib/app/routes/app_pages.dart +++ b/lib/app/routes/app_pages.dart @@ -359,4 +359,3 @@ class AppPages { ), }; } - diff --git a/lib/app/routes/app_routes.dart b/lib/app/routes/app_routes.dart index caa08372..0525ba6c 100644 --- a/lib/app/routes/app_routes.dart +++ b/lib/app/routes/app_routes.dart @@ -151,7 +151,8 @@ abstract class Routes { static const changelog = _Paths.changelog; /// `/class/start-gear` - static const createClassStartingGear = _Paths.characterClass + _Paths.startingGear; + static const createClassStartingGear = + _Paths.characterClass + _Paths.startingGear; } abstract class _Paths { diff --git a/lib/app/routes/custom_transitions.dart b/lib/app/routes/custom_transitions.dart index ad72265c..d4dc781c 100644 --- a/lib/app/routes/custom_transitions.dart +++ b/lib/app/routes/custom_transitions.dart @@ -87,4 +87,3 @@ class CircularRevealTransitionBuilder extends PageRouteBuilder { ); } } - diff --git a/lib/app/themes/theme_utils.dart b/lib/app/themes/theme_utils.dart index 1e46aaa5..4bb02b61 100644 --- a/lib/app/themes/theme_utils.dart +++ b/lib/app/themes/theme_utils.dart @@ -138,8 +138,8 @@ ThemeData createTheme( checkboxTheme: base.checkboxTheme.copyWith( fillColor: WidgetStateProperty.resolveWith((states) => colorScheme.secondary), - checkColor: WidgetStateProperty.resolveWith( - (states) => colorScheme.onSecondary), + checkColor: + WidgetStateProperty.resolveWith((states) => colorScheme.onSecondary), ), switchTheme: base.switchTheme.copyWith( thumbColor: @@ -206,4 +206,3 @@ Color accessibleColorFor(Color fg, Color bg) { } return fg; } - diff --git a/lib/app/widgets/atoms/alignment_values_field.dart b/lib/app/widgets/atoms/alignment_values_field.dart index bfcc880c..b59e6833 100644 --- a/lib/app/widgets/atoms/alignment_values_field.dart +++ b/lib/app/widgets/atoms/alignment_values_field.dart @@ -84,4 +84,3 @@ class _AlignmentValuesFieldState extends State { ); } } - diff --git a/lib/app/widgets/atoms/custom_expansion_tile.dart b/lib/app/widgets/atoms/custom_expansion_tile.dart index 6069deda..ce2d85eb 100644 --- a/lib/app/widgets/atoms/custom_expansion_tile.dart +++ b/lib/app/widgets/atoms/custom_expansion_tile.dart @@ -73,8 +73,7 @@ class CustomExpansionTile extends StatefulWidget { this.minIconWidth = 20, this.reorderablePadding = false, this.controller, - }) : - assert( + }) : assert( expandedCrossAxisAlignment != CrossAxisAlignment.baseline, 'CrossAxisAlignment.baseline is not supported since the expanded children ' 'are aligned in a column, not a row. Try to use another constant.', @@ -112,8 +111,7 @@ class CustomExpansionTile extends StatefulWidget { this.minIconWidth = 20, this.reorderablePadding = false, this.controller, - }) : - assert( + }) : assert( expandedCrossAxisAlignment != CrossAxisAlignment.baseline, 'CrossAxisAlignment.baseline is not supported since the expanded children ' 'are aligned in a column, not a row. Try to use another constant.', @@ -261,7 +259,7 @@ class CustomExpansionTile extends StatefulWidget { final ListTileControlAffinity? controlAffinity; final bool reorderablePadding; - + final CustomExpansionTileController? controller; @override @@ -296,8 +294,10 @@ class _CustomExpansionTileState extends State _animationController = AnimationController(duration: _kExpand, vsync: this); _heightFactor = _animationController.drive(_easeInTween); _iconTurns = _animationController.drive(_halfTween.chain(_easeInTween)); - _headerColor = _animationController.drive(_headerColorTween.chain(_easeInTween)); - _iconColor = _animationController.drive(_iconColorTween.chain(_easeOutTween)); + _headerColor = + _animationController.drive(_headerColorTween.chain(_easeInTween)); + _iconColor = + _animationController.drive(_iconColorTween.chain(_easeOutTween)); _isExpanded = PageStorage.of(context).readState(context) as bool? ?? widget.initiallyExpanded; @@ -351,13 +351,18 @@ class _CustomExpansionTileState extends State } Widget? _buildLeadingIcon(BuildContext context) { - if (!widget.expandable || _effectiveAffinity(widget.controlAffinity) != ListTileControlAffinity.leading) return null; + if (!widget.expandable || + _effectiveAffinity(widget.controlAffinity) != + ListTileControlAffinity.leading) return null; return _buildIcon(context); } Widget? _buildTrailingIcon(BuildContext context) { - if (!widget.expandable || _effectiveAffinity(widget.controlAffinity) != ListTileControlAffinity.trailing) return null; - if (widget.reorderablePadding && PlatformHelper.currentInteractionType == InteractionType.mouse) { + if (!widget.expandable || + _effectiveAffinity(widget.controlAffinity) != + ListTileControlAffinity.trailing) return null; + if (widget.reorderablePadding && + PlatformHelper.currentInteractionType == InteractionType.mouse) { return Padding( padding: const EdgeInsets.only(right: 24), child: _buildIcon(context), diff --git a/lib/app/widgets/atoms/custom_snack_bar.dart b/lib/app/widgets/atoms/custom_snack_bar.dart index 7c018a79..6d9b290c 100644 --- a/lib/app/widgets/atoms/custom_snack_bar.dart +++ b/lib/app/widgets/atoms/custom_snack_bar.dart @@ -10,12 +10,13 @@ class CustomSnackBar extends SnackBar { final String? title; - static Widget _getContent( - String? title, String content) { + static Widget _getContent(String? title, String content) { if (title != null && title.isNotEmpty) { return Column( children: [ - Text(title, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18)), + Text(title, + style: + const TextStyle(fontWeight: FontWeight.bold, fontSize: 18)), Text(content), ], ); @@ -30,4 +31,3 @@ class CustomSnackBar extends SnackBar { ); } } - diff --git a/lib/app/widgets/atoms/dice_icon.dart b/lib/app/widgets/atoms/dice_icon.dart index a2c63d5a..5e055768 100644 --- a/lib/app/widgets/atoms/dice_icon.dart +++ b/lib/app/widgets/atoms/dice_icon.dart @@ -19,7 +19,7 @@ class DiceIcon extends StatelessWidget { super.key, this.size, this.color, - }) : sides = dice.sides; + }) : sides = dice.sides; @override Widget build(BuildContext context) { diff --git a/lib/app/widgets/atoms/help_tooltip_icon.dart b/lib/app/widgets/atoms/help_tooltip_icon.dart index f92100fd..0ab9f15c 100644 --- a/lib/app/widgets/atoms/help_tooltip_icon.dart +++ b/lib/app/widgets/atoms/help_tooltip_icon.dart @@ -14,4 +14,3 @@ class HelpTooltipIcon extends StatelessWidget { ); } } - diff --git a/lib/app/widgets/atoms/lifecycle_builder.dart b/lib/app/widgets/atoms/lifecycle_builder.dart index bb6c37ab..b2f63822 100644 --- a/lib/app/widgets/atoms/lifecycle_builder.dart +++ b/lib/app/widgets/atoms/lifecycle_builder.dart @@ -19,7 +19,7 @@ class LifecycleView extends StatefulWidget { this.onInit, this.onDispose, required this.builder, - }) : child = null; + }) : child = null; static Widget Function(BuildContext context) childBuilder(Widget child) => (_) => child; diff --git a/lib/app/widgets/atoms/menu_button.dart b/lib/app/widgets/atoms/menu_button.dart index 2bee93be..7b6448c5 100644 --- a/lib/app/widgets/atoms/menu_button.dart +++ b/lib/app/widgets/atoms/menu_button.dart @@ -180,7 +180,8 @@ class MenuButton extends StatelessWidget { return PopupMenuItem( value: entry.value, enabled: !entry.disabled, - child: PopupMenuItemListTile(icon: entry.icon, label: entry.label), + child: + PopupMenuItemListTile(icon: entry.icon, label: entry.label), ); } else { return e; diff --git a/lib/app/widgets/atoms/number_text_field.dart b/lib/app/widgets/atoms/number_text_field.dart index 542b927b..7521db9b 100644 --- a/lib/app/widgets/atoms/number_text_field.dart +++ b/lib/app/widgets/atoms/number_text_field.dart @@ -301,4 +301,3 @@ class NumberInputFormatter extends TextInputFormatter { return oldValue; } } - diff --git a/lib/app/widgets/atoms/rainbow_text.dart b/lib/app/widgets/atoms/rainbow_text.dart index ab861cd2..6b93ff51 100644 --- a/lib/app/widgets/atoms/rainbow_text.dart +++ b/lib/app/widgets/atoms/rainbow_text.dart @@ -82,7 +82,8 @@ class RainbowText extends StatelessWidget { textDirection: textDirection, softWrap: softWrap, overflow: overflow, - maxLines: maxLines, textScaler: TextScaler.linear(textScaleFactor), + maxLines: maxLines, + textScaler: TextScaler.linear(textScaleFactor), locale: locale, strutStyle: strutStyle, textWidthBasis: textWidthBasis, diff --git a/lib/app/widgets/atoms/rich_text_field.dart b/lib/app/widgets/atoms/rich_text_field.dart index 0c10995e..873604e2 100644 --- a/lib/app/widgets/atoms/rich_text_field.dart +++ b/lib/app/widgets/atoms/rich_text_field.dart @@ -637,8 +637,12 @@ class RichButton { [String? suffix, int? selectionStartOffset, int? selectionEndOffset]) { final isAuto = behavior == RichButtonTextBehavior.auto; final isWrap = behavior == RichButtonTextBehavior.wrap; - final hasPrefix = isWrap || (prefix.isNotEmpty && isAuto) || behavior == RichButtonTextBehavior.prefix; - final hasSuffix = isWrap || (suffix?.isNotEmpty == true && isAuto) || behavior == RichButtonTextBehavior.suffix; + final hasPrefix = isWrap || + (prefix.isNotEmpty && isAuto) || + behavior == RichButtonTextBehavior.prefix; + final hasSuffix = isWrap || + (suffix?.isNotEmpty == true && isAuto) || + behavior == RichButtonTextBehavior.suffix; suffix ??= prefix; // final shouldWrap = (isAuto && !controller.selection.isCollapsed) @@ -670,4 +674,3 @@ class RichButton { }; } } - diff --git a/lib/app/widgets/atoms/xp_bar.dart b/lib/app/widgets/atoms/xp_bar.dart index 4baa7f26..d9b7bdbc 100644 --- a/lib/app/widgets/atoms/xp_bar.dart +++ b/lib/app/widgets/atoms/xp_bar.dart @@ -104,4 +104,3 @@ class ExpBar extends StatelessWidget { ); } } - diff --git a/lib/app/widgets/cards/character_class_card.dart b/lib/app/widgets/cards/character_class_card.dart index 57f4dc11..abbbd66c 100644 --- a/lib/app/widgets/cards/character_class_card.dart +++ b/lib/app/widgets/cards/character_class_card.dart @@ -88,4 +88,3 @@ class CharacterClassCard extends StatelessWidget { ].join('\n'); } } - diff --git a/lib/app/widgets/cards/dynamic_action_card.dart b/lib/app/widgets/cards/dynamic_action_card.dart index 088fdf2f..d775aaaf 100644 --- a/lib/app/widgets/cards/dynamic_action_card.dart +++ b/lib/app/widgets/cards/dynamic_action_card.dart @@ -240,4 +240,3 @@ class _DynamicActionCardState extends State { ); } } - diff --git a/lib/app/widgets/cards/dynamic_action_card_mini.dart b/lib/app/widgets/cards/dynamic_action_card_mini.dart index e4cfb2c3..d33b317a 100644 --- a/lib/app/widgets/cards/dynamic_action_card_mini.dart +++ b/lib/app/widgets/cards/dynamic_action_card_mini.dart @@ -205,4 +205,3 @@ class RectClipper extends CustomClipper { oldClipper.size.width != size.width || oldClipper.size.height != size.height; } - diff --git a/lib/app/widgets/cards/item_card.dart b/lib/app/widgets/cards/item_card.dart index cdfdaccb..cbcf5d5c 100644 --- a/lib/app/widgets/cards/item_card.dart +++ b/lib/app/widgets/cards/item_card.dart @@ -87,8 +87,7 @@ class ItemCard extends StatelessWidget { numberType: NumberType.double, onChanged: (str) => onSave?.call( item.copyWithInherited( - amount: double.tryParse(str) ?? - item.amount, + amount: double.tryParse(str) ?? item.amount, ), ), controller: TextEditingController( @@ -127,4 +126,3 @@ class ItemCard extends StatelessWidget { ); } } - diff --git a/lib/app/widgets/chips/ability_score_chip.dart b/lib/app/widgets/chips/ability_score_chip.dart index 7eb22d40..24e61a02 100644 --- a/lib/app/widgets/chips/ability_score_chip.dart +++ b/lib/app/widgets/chips/ability_score_chip.dart @@ -101,4 +101,3 @@ class AbilityScoreChip extends StatelessWidget { ); } } - diff --git a/lib/app/widgets/chips/primary_chip.dart b/lib/app/widgets/chips/primary_chip.dart index dde7170d..b9603ddd 100644 --- a/lib/app/widgets/chips/primary_chip.dart +++ b/lib/app/widgets/chips/primary_chip.dart @@ -84,4 +84,3 @@ class PrimaryChip extends StatelessWidget { extension on bool { int get cInt => this ? 1 : 0; } - diff --git a/lib/app/widgets/dialogs/xp_dialog.dart b/lib/app/widgets/dialogs/xp_dialog.dart index d808d01b..9073c743 100644 --- a/lib/app/widgets/dialogs/xp_dialog.dart +++ b/lib/app/widgets/dialogs/xp_dialog.dart @@ -464,4 +464,3 @@ extension on _XPAction { } } } - diff --git a/lib/app/widgets/forms/character_class_form.dart b/lib/app/widgets/forms/character_class_form.dart index 2e8c8e58..84a2b146 100644 --- a/lib/app/widgets/forms/character_class_form.dart +++ b/lib/app/widgets/forms/character_class_form.dart @@ -243,4 +243,3 @@ class CharacterClassFormArguments required super.formContext, }); } - diff --git a/lib/app/widgets/forms/entity_share_form.dart b/lib/app/widgets/forms/entity_share_form.dart index 70038907..68003771 100644 --- a/lib/app/widgets/forms/entity_share_form.dart +++ b/lib/app/widgets/forms/entity_share_form.dart @@ -122,4 +122,3 @@ class _EntityShareFormState extends State widget.onChange(Meta.forkMeta(source!, user)); } } - diff --git a/lib/app/widgets/forms/library_entity_form.dart b/lib/app/widgets/forms/library_entity_form.dart index 100574ef..306ee429 100644 --- a/lib/app/widgets/forms/library_entity_form.dart +++ b/lib/app/widgets/forms/library_entity_form.dart @@ -32,11 +32,12 @@ class LibraryEntityForm< ), body: Center( child: SizedBox( - width: 800, + width: 800, child: ItemBuilder.lazyListView( padding: const EdgeInsets.all(16).copyWith(bottom: 80), - children: - children.joinObjects(() => const SizedBox(height: 16)).toList(), + children: children + .joinObjects(() => const SizedBox(height: 16)) + .toList(), // trailing: [ // () => const Divider(height: 64), // () => EntityShareForm( @@ -73,6 +74,7 @@ abstract class LibraryEntityFormController get fields; late Meta meta; @@ -172,4 +174,3 @@ class LibraryEntityFormArguments { required this.formContext, }); } - diff --git a/lib/app/widgets/forms/note_form.dart b/lib/app/widgets/forms/note_form.dart index d0122b15..b2ef099c 100644 --- a/lib/app/widgets/forms/note_form.dart +++ b/lib/app/widgets/forms/note_form.dart @@ -127,4 +127,3 @@ class NoteFormArguments extends LibraryEntityFormArguments { required super.formContext, }); } - diff --git a/lib/app/widgets/molecules/dice_list_input.dart b/lib/app/widgets/molecules/dice_list_input.dart index 4b5b72ae..15f7953c 100644 --- a/lib/app/widgets/molecules/dice_list_input.dart +++ b/lib/app/widgets/molecules/dice_list_input.dart @@ -110,4 +110,3 @@ class _DiceListInputState extends State { super.dispose(); } } - diff --git a/lib/app/widgets/molecules/user_menu_popover.dart b/lib/app/widgets/molecules/user_menu_popover.dart index 0e089cfc..4070198a 100644 --- a/lib/app/widgets/molecules/user_menu_popover.dart +++ b/lib/app/widgets/molecules/user_menu_popover.dart @@ -15,7 +15,8 @@ import 'package:provider/provider.dart'; import '../atoms/character_avatar.dart'; import '../atoms/user_avatar.dart'; -class UserMenuPopover extends StatelessWidget with CharacterProviderMixin, UserProviderMixin { +class UserMenuPopover extends StatelessWidget + with CharacterProviderMixin, UserProviderMixin { const UserMenuPopover({super.key}); @override diff --git a/lib/core/http/api_base.dart b/lib/core/http/api_base.dart index 3e6cd5ca..9b77eb5f 100644 --- a/lib/core/http/api_base.dart +++ b/lib/core/http/api_base.dart @@ -1,7 +1,6 @@ import 'dart:convert'; import 'package:http/http.dart' as http; - class ApiBase { final String baseUrl; @@ -52,4 +51,3 @@ class Response extends http.Response { Map get json => jsonDecode(body); } - diff --git a/lib/core/platform_helper.dart b/lib/core/platform_helper.dart index 64f1e927..0df82f69 100644 --- a/lib/core/platform_helper.dart +++ b/lib/core/platform_helper.dart @@ -259,4 +259,3 @@ class PlatformHelper { return android!; } } - diff --git a/lib/core/storage_handler/storage_handler_core.dart b/lib/core/storage_handler/storage_handler_core.dart index 3a757c62..e05b025a 100644 --- a/lib/core/storage_handler/storage_handler_core.dart +++ b/lib/core/storage_handler/storage_handler_core.dart @@ -175,4 +175,3 @@ class StorageHandler implements StorageDelegate { onError: onError, onDone: onDone, cancelOnError: cancelOnError); } } - diff --git a/lib/core/utils/color_utils.dart b/lib/core/utils/color_utils.dart index 3cf8dd2d..8fa05fa5 100644 --- a/lib/core/utils/color_utils.dart +++ b/lib/core/utils/color_utils.dart @@ -33,4 +33,3 @@ class ColorUtils { return lighten(original, -amount); } } - diff --git a/lib/core/utils/list_utils.dart b/lib/core/utils/list_utils.dart index ab51fc42..7a3cfc01 100644 --- a/lib/core/utils/list_utils.dart +++ b/lib/core/utils/list_utils.dart @@ -158,11 +158,9 @@ List upsertByKey(List list, Iterable items, final existingKeys = list.map(keyGetter); return [ - ...list - .map((x) => keys.contains(keyGetter(x)) - ? items.firstWhere((y) => keyGetter(x) == keyGetter(y)) - : x) - , + ...list.map((x) => keys.contains(keyGetter(x)) + ? items.firstWhere((y) => keyGetter(x) == keyGetter(y)) + : x), ...items.where((x) { return !existingKeys.contains(keyGetter(x)); }) diff --git a/lib/core/utils/secrets.example.dart b/lib/core/utils/secrets.example.dart index 47a89306..9b2cb1b1 100644 --- a/lib/core/utils/secrets.example.dart +++ b/lib/core/utils/secrets.example.dart @@ -2,6 +2,5 @@ part of 'secrets_base.dart'; class Secrets extends SecretsBase { @override - final String sentryDsn = - ''; + final String sentryDsn = ''; } diff --git a/lib/core/utils/upload_utils.dart b/lib/core/utils/upload_utils.dart index 69acaa58..7fca881f 100644 --- a/lib/core/utils/upload_utils.dart +++ b/lib/core/utils/upload_utils.dart @@ -131,4 +131,3 @@ Future cropAndUploadPhoto( downloadURL: downloadURL, ); } - diff --git a/lib/main.dart b/lib/main.dart index f51f24b7..081d636c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -97,4 +97,3 @@ class DungeonPaperApp extends StatelessWidget { ); } } -