From c91214044046d0935560232c72b5a2125a0363ae Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 29 Jan 2025 15:49:17 -0300 Subject: [PATCH 1/4] format --- integration_test/example_test.dart | 1 + integration_test/test_bundle.dart | 3 ++- lib/shared/constants/index.dart | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/integration_test/example_test.dart b/integration_test/example_test.dart index e69de29b..8b137891 100644 --- a/integration_test/example_test.dart +++ b/integration_test/example_test.dart @@ -0,0 +1 @@ + diff --git a/integration_test/test_bundle.dart b/integration_test/test_bundle.dart index 32287821..9045d298 100644 --- a/integration_test/test_bundle.dart +++ b/integration_test/test_bundle.dart @@ -59,7 +59,8 @@ Future main() async { // Maybe somewhat counterintuitively, this callback runs *after* the calls // to group() below. final topLevelGroup = Invoker.current!.liveTest.groups.first; - final dartTestGroup = createDartTestGroup(topLevelGroup, + final dartTestGroup = createDartTestGroup( + topLevelGroup, tags: null, excludeTags: null, ); diff --git a/lib/shared/constants/index.dart b/lib/shared/constants/index.dart index e69de29b..8b137891 100644 --- a/lib/shared/constants/index.dart +++ b/lib/shared/constants/index.dart @@ -0,0 +1 @@ + From 3a3c0d74f4f9557e4e07c9b16a7b41bfd761512d Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 29 Jan 2025 16:02:05 -0300 Subject: [PATCH 2/4] format --- integration_test/app_test.dart | 4 +- integration_test/auth_test.dart | 58 +- integration_test/common.dart | 2 +- integration_test/example_test.dart | 1 + integration_test/locals_test.dart | 20 +- integration_test/menu_test.dart | 24 +- integration_test/module_test.dart | 14 +- integration_test/test_bundle.dart | 3 +- integration_test/utils_test.dart | 12 +- integration_test/welcome_test.dart | 8 +- ...ot_password_template_component_widget.dart | 118 ++- .../sign_in_template_component_widget.dart | 839 +++++++++++++----- .../notification/deep_link_service.dart | 3 +- lib/flutter_flow/nav/nav.dart | 150 +++- .../forgot_password_screen.dart | 111 ++- lib/shared/constants/index.dart | 1 + 16 files changed, 940 insertions(+), 428 deletions(-) diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart index 239f2e4a..f1caa621 100644 --- a/integration_test/app_test.dart +++ b/integration_test/app_test.dart @@ -29,6 +29,8 @@ import 'package:integration_test/integration_test.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:patrol/patrol.dart'; import 'package:flutter_web_plugins/url_strategy.dart'; +import 'package:patrol_finders/patrol_finders.dart'; +// import 'package:patrol_finders/patrol_finders.dart'; import 'app_test.dart'; import 'fuzzer/fuzzer.dart'; @@ -50,7 +52,7 @@ part 'storage_test.dart'; part 'utils_test.dart'; part 'welcome_test.dart'; -late PatrolIntegrationTester $; +late PatrolTester $; void main() { //init integration test diff --git a/integration_test/auth_test.dart b/integration_test/auth_test.dart index e18a3916..30d62340 100644 --- a/integration_test/auth_test.dart +++ b/integration_test/auth_test.dart @@ -2,11 +2,12 @@ part of 'app_test.dart'; class AuthenticationTest { static Future signIn() async { - patrol( + patrolWidgetTest( 'Sign-In with fuzzed emails', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; - $.tester.printToConsole('Authentication Test - Sign-In with fuzzed emails'); + $.tester + .printToConsole('Authentication Test - Sign-In with fuzzed emails'); final PatrolFinder throwsException = $(Dialog).$(ThrowExceptionWidget); final Fuzzer fuzzer = Fuzzer( @@ -32,7 +33,8 @@ class AuthenticationTest { ], iterations: 2, ); - Map concat(String username, String domain, String password) { + Map concat( + String username, String domain, String password) { return { 'emailTextFormField': '${username}@${domain}.test', 'passwordTextFormField': password, @@ -57,11 +59,12 @@ class AuthenticationTest { }, ); - patrol( + patrolWidgetTest( 'Sign-In with email_app@exemplo.com', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; - $.tester.printToConsole('Authentication Test - Sign-In with email_app@exemplo.com'); + $.tester.printToConsole( + 'Authentication Test - Sign-In with email_app@exemplo.com'); final PatrolFinder throwsException = $(Dialog).$(ThrowExceptionWidget); final Map credentials = { @@ -78,11 +81,12 @@ class AuthenticationTest { } static Future signUp() async { - patrol( + patrolWidgetTest( 'Sign Up - credenciais já registradas', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; - $.tester.printToConsole('Authentication Test - Sign-Up: credenciais já registradas'); + $.tester.printToConsole( + 'Authentication Test - Sign-Up: credenciais já registradas'); final PatrolFinder throwsException = $(Dialog).$(ThrowExceptionWidget); final Map credentials = { @@ -98,11 +102,12 @@ class AuthenticationTest { }, ); - patrol( + patrolWidgetTest( 'Sign Up - credenciais novas', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; - $.tester.printToConsole('Authentication Test - Sign-Up: credenciais novas'); + $.tester + .printToConsole('Authentication Test - Sign-Up: credenciais novas'); final PatrolFinder throwsException = $(Dialog).$(ThrowExceptionWidget); @@ -135,7 +140,8 @@ class AuthenticationTest { ], iterations: 2, ); - Map concat(String name, String username, String domain, String password) { + Map concat( + String name, String username, String domain, String password) { return { 'nameTextFormField': name, 'emailTextFormField': '${username}@${domain}.test', @@ -164,11 +170,12 @@ class AuthenticationTest { } static Future signOut() async { - patrol( + patrolWidgetTest( 'Deslogar da Conta', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; - $.tester.printToConsole('Authentication Test - Sign-Out: Deslogar da Conta'); + $.tester.printToConsole( + 'Authentication Test - Sign-Out: Deslogar da Conta'); await _loggedWithMultiLocalsAccount($); await $.pumpWidget(const App()); @@ -179,7 +186,9 @@ class AuthenticationTest { await $.waitUntilVisible($(MenuListView)); - await $(Icons.exit_to_app).waitUntilVisible().tap(settlePolicy: SettlePolicy.trySettle); + await $(Icons.exit_to_app) + .waitUntilVisible() + .tap(settlePolicy: SettlePolicy.trySettle); await Future.delayed(const Duration(milliseconds: 500)); }, @@ -203,7 +212,8 @@ class AuthenticationTest { Future.delayed(Duration(seconds: 3)); await $.pump(Duration(seconds: 3)); await $.pumpAndSettle(); - final PatrolFinder forgotPassword = await $(#ForgotPasswordScreen).waitUntilVisible(); + final PatrolFinder forgotPassword = + await $(#ForgotPasswordScreen).waitUntilVisible(); expect(forgotPassword, findsOneWidget); }); } @@ -211,7 +221,7 @@ class AuthenticationTest { Future _auth( Map credentials, - PatrolIntegrationTester $, + PatrolTester $, PatrolFinder throwsException, ) async { await _enterCredentials(credentials, $); @@ -220,7 +230,7 @@ Future _auth( Future _enterCredentials( Map credentials, - PatrolIntegrationTester $, + PatrolTester $, ) async { for (var entry in credentials.entries) { await $(ValueKey(entry.key)) // @@ -230,7 +240,8 @@ Future _enterCredentials( } } -Future _submit(String key, PatrolIntegrationTester $, PatrolFinder throwsException) async { +Future _submit( + String key, PatrolTester $, PatrolFinder throwsException) async { await $(ValueKey(key)) // .waitUntilVisible() .tap(); @@ -248,5 +259,6 @@ Future _submit(String key, PatrolIntegrationTester $, PatrolFinder throwsE String _generateRandomString(int length) { const chars = 'abcdefghijklmnopqrstuvwxyz0123456789'; final rand = Random(); - return List.generate(length, (index) => chars[rand.nextInt(chars.length)]).join(); + return List.generate(length, (index) => chars[rand.nextInt(chars.length)]) + .join(); } diff --git a/integration_test/common.dart b/integration_test/common.dart index 87825994..958a328e 100644 --- a/integration_test/common.dart +++ b/integration_test/common.dart @@ -5,7 +5,7 @@ final _nativeAutomatorConfig = NativeAutomatorConfig( findTimeout: Duration(seconds: 20), // 10 seconds is too short for some CIs ); -// Future createApp(PatrolIntegrationTester $) async { +// Future createApp(PatrolTester $) async { // await app_main.main(); // await $.pumpAndSettle(); // } diff --git a/integration_test/example_test.dart b/integration_test/example_test.dart index e69de29b..8b137891 100644 --- a/integration_test/example_test.dart +++ b/integration_test/example_test.dart @@ -0,0 +1 @@ + diff --git a/integration_test/locals_test.dart b/integration_test/locals_test.dart index 50c9cb3c..1fe1a6cb 100644 --- a/integration_test/locals_test.dart +++ b/integration_test/locals_test.dart @@ -46,9 +46,9 @@ class LocalsTest { // } // }, // ); - patrol( + patrolWidgetTest( 'Selecionar um local disponível com somente um local disponivel', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Locals Test - Selecionar um local disponível'); @@ -184,9 +184,9 @@ class LocalsTest { // // } // }, // ); - patrol( + patrolWidgetTest( 'Desvincular do local selecionado com somente um local disponivel', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole( 'Locals Test - Desvincular do local selecionado com multiplos locais disponiveis'); @@ -247,9 +247,9 @@ class LocalsTest { expect(entriesFinder, findsWidgets); }); - patrol( + patrolWidgetTest( 'Vincular um local desvinculado com somente um local disponivel', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Locals Test - Vincular um local desvinculado'); @@ -302,9 +302,9 @@ class LocalsTest { } static Future attachLocal() async { - patrol( + patrolWidgetTest( 'Selecionar um local disponível com multíplos locais disponíveis', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; await _loggedWithMultiLocalsAccount($); await $.pumpWidget(const App()); @@ -337,9 +337,9 @@ class LocalsTest { return; }, ); - patrol( + patrolWidgetTest( 'Selecionar um local disponível com somente um local disponível', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; await _loggedWithSomeoneLocalAccount($); await $.pumpWidget(const App()); diff --git a/integration_test/menu_test.dart b/integration_test/menu_test.dart index 1dd315d1..092ca63c 100644 --- a/integration_test/menu_test.dart +++ b/integration_test/menu_test.dart @@ -2,10 +2,10 @@ part of 'app_test.dart'; class MenuTest { static Future labels2AppbarConsistency() async { - patrol( + patrolWidgetTest( 'As labels dos menuItems correspondem aos títulos das AppBars? (MultiLocais)', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole( 'Menu Test - As labels dos menuItems correspondem aos títulos das AppBars?'); @@ -96,9 +96,9 @@ class MenuTest { } static Future containEntries() async { - patrol( + patrolWidgetTest( 'HomeMenu contém seus itens? (MultiLocais)', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Menu Test - HomeMenu contém seus itens?'); @@ -135,9 +135,9 @@ class MenuTest { expect(entriesKey, containsAll(menuKeys)); }, ); - patrol( + patrolWidgetTest( 'HomeMenu contém seus itens? (MonoLocal)', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Menu Test - HomeMenu contém seus itens?'); @@ -175,9 +175,9 @@ class MenuTest { }, ); - patrol( + patrolWidgetTest( 'DrawerMenu contém seus itens? (MultiLocais)', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Menu Test - DrawerMenu contém seus itens?'); @@ -222,9 +222,9 @@ class MenuTest { await Future.delayed(const Duration(milliseconds: 500)); }, ); - patrol( + patrolWidgetTest( 'DrawerMenu contém seus itens? (MonoLocal)', // - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Menu Test - DrawerMenu contém seus itens?'); @@ -272,9 +272,9 @@ class MenuTest { } static Future navToEntries() async { - patrol( + patrolWidgetTest( 'Navegação entre items do Menu (MultiLocais)', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Menu Test - Navegação entre items do Menu'); diff --git a/integration_test/module_test.dart b/integration_test/module_test.dart index 80c0aa4b..3138f8e0 100644 --- a/integration_test/module_test.dart +++ b/integration_test/module_test.dart @@ -2,8 +2,9 @@ part of 'app_test.dart'; class ModularizationTest { static Future containLicense() async { - patrol('Os modulos de licença está sendo processados? (MultiLocais)', - (PatrolIntegrationTester tester) async { + patrolWidgetTest( + 'Os modulos de licença está sendo processados? (MultiLocais)', + (PatrolTester tester) async { $ = tester; $.tester.printToConsole( 'Modularization Test - Os modulos de licença está sendo processados?'); @@ -27,8 +28,9 @@ class ModularizationTest { return; }); - patrol('Os modulos de licença está sendo processados? (MonoLocal)', - (PatrolIntegrationTester tester) async { + patrolWidgetTest( + 'Os modulos de licença está sendo processados? (MonoLocal)', + (PatrolTester tester) async { $ = tester; $.tester.printToConsole( 'Modularization Test - Os modulos de licença está sendo processados?'); @@ -55,9 +57,9 @@ class ModularizationTest { } static Future switchLicense() async { - patrol( + patrolWidgetTest( 'Licença está sendo atualizada?', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Licença está sendo atualizada?'); diff --git a/integration_test/test_bundle.dart b/integration_test/test_bundle.dart index 52ae7570..55d38e30 100644 --- a/integration_test/test_bundle.dart +++ b/integration_test/test_bundle.dart @@ -59,7 +59,8 @@ Future main() async { // Maybe somewhat counterintuitively, this callback runs *after* the calls // to group() below. final topLevelGroup = Invoker.current!.liveTest.groups.first; - final dartTestGroup = createDartTestGroup(topLevelGroup, + final dartTestGroup = createDartTestGroup( + topLevelGroup, tags: null, excludeTags: null, ); diff --git a/integration_test/utils_test.dart b/integration_test/utils_test.dart index 309c0923..77eeb957 100644 --- a/integration_test/utils_test.dart +++ b/integration_test/utils_test.dart @@ -1,6 +1,6 @@ part of 'app_test.dart'; -Future _loggedWithMultiLocalsAccount(PatrolIntegrationTester $, +Future _loggedWithMultiLocalsAccount(PatrolTester $, [bool forceLinkedLocal = true]) async { await _init($); await StorageHelper() // @@ -29,7 +29,7 @@ Future _loggedWithMultiLocalsAccount(PatrolIntegrationTester $, } } -Future _loggedWithSomeoneLocalAccount(PatrolIntegrationTester $, +Future _loggedWithSomeoneLocalAccount(PatrolTester $, [bool forceLinkedLocal = true]) async { await _init($); await StorageHelper() // @@ -58,7 +58,7 @@ Future _loggedWithSomeoneLocalAccount(PatrolIntegrationTester $, } } -Future _unlogged(PatrolIntegrationTester $) async { +Future _unlogged(PatrolTester $) async { await _init($); await StorageHelper() // .set(SecureStorageKey.isLogged.value, 'false'); @@ -78,7 +78,7 @@ Future _unlogged(PatrolIntegrationTester $) async { .set(LocalsStorageKey.isNewVersion.key, true); } -Future _init(PatrolIntegrationTester $) async { +Future _init(PatrolTester $) async { WidgetsFlutterBinding.ensureInitialized(); await _initializeTracking(); await _initializeStorage(); @@ -90,12 +90,12 @@ Future _init(PatrolIntegrationTester $) async { await _initializeNav(); } -Future _navigateToSignIn(PatrolIntegrationTester $) async { +Future _navigateToSignIn(PatrolTester $) async { final signInButton = $(#toggleSignInPage).waitUntilVisible(); await signInButton.tap(); } -Future _navigateToSignUp(PatrolIntegrationTester $) async { +Future _navigateToSignUp(PatrolTester $) async { final signUpButton = $(#toggleSignUpPage).waitUntilVisible(); await signUpButton.tap(); } diff --git a/integration_test/welcome_test.dart b/integration_test/welcome_test.dart index 29c308c8..e5d1a3f2 100644 --- a/integration_test/welcome_test.dart +++ b/integration_test/welcome_test.dart @@ -2,9 +2,9 @@ part of 'app_test.dart'; class WelcomeTest { static Future signInToSignUp() async { - patrol( + patrolWidgetTest( 'Sign-In to Sign-Up', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Welcome Test - Sign-In to Sign-Up'); await _unlogged($); @@ -17,9 +17,9 @@ class WelcomeTest { } static Future signUpToSignIn() async { - patrol( + patrolWidgetTest( 'Sign-Up to Sign-In', - (PatrolIntegrationTester tester) async { + (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Welcome Test - Sign-Up to Sign-In'); await _unlogged($); diff --git a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart index 62e99c23..12bdc25e 100644 --- a/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart +++ b/lib/components/templates_components/forgot_password_template_component/forgot_password_template_component_widget.dart @@ -19,10 +19,12 @@ class ForgotPasswordTemplateComponentWidget extends StatefulWidget { const ForgotPasswordTemplateComponentWidget({super.key}); @override - State createState() => _ForgotPasswordTemplateComponentWidgetState(); + State createState() => + _ForgotPasswordTemplateComponentWidgetState(); } -class _ForgotPasswordTemplateComponentWidgetState extends State { +class _ForgotPasswordTemplateComponentWidgetState + extends State { late ForgotPasswordTemplateComponentModel _model; @override @@ -49,9 +51,11 @@ class _ForgotPasswordTemplateComponentWidgetState extends State('BackButton'), splashColor: Colors.transparent, @@ -98,7 +103,8 @@ class _ForgotPasswordTemplateComponentWidgetState extends State('SendButtonWidget'), - onPressed: (_model.emailAddressTextController.text == '' || - !ValidatorUtil.isValidEmail(_model.emailAddressTextController.text)) + onPressed: (_model.emailAddressTextController.text == + '' || + !ValidatorUtil.isValidEmail( + _model.emailAddressTextController.text)) ? null - : () async => await AuthenticationService.forgotPassword( + : () async => + await AuthenticationService.forgotPassword( context, _model.emailAddressTextController.text, ).then((v) => v == true ? context.pop() : null), @@ -251,23 +278,28 @@ class _ForgotPasswordTemplateComponentWidgetState extends State createState() => _SignInTemplateComponentWidgetState(); + State createState() => + _SignInTemplateComponentWidgetState(); } -class _SignInTemplateComponentWidgetState extends State with TickerProviderStateMixin { +class _SignInTemplateComponentWidgetState + extends State with TickerProviderStateMixin { late SignInTemplateComponentModel _model; final animationsMap = {}; @@ -99,14 +101,17 @@ class _SignInTemplateComponentWidgetState extends State('emailTextFormField'), - controller: _model.emailAddressTextController, - focusNode: _model.emailAddressFocusNode, - cursorColor: FlutterFlowTheme.of(context).primary, - onChanged: (_) => EasyDebounce.debounce( + key: const ValueKey( + 'emailTextFormField'), + controller: _model + .emailAddressTextController, + focusNode: _model + .emailAddressFocusNode, + cursorColor: + FlutterFlowTheme.of(context) + .primary, + onChanged: (_) => + EasyDebounce.debounce( '_model.emailAddressTextController', - const Duration(milliseconds: 500), + const Duration( + milliseconds: 500), () => setState(() {}), ), autofocus: true, - autofillHints: const [AutofillHints.email], - textCapitalization: TextCapitalization.none, - textInputAction: TextInputAction.next, + autofillHints: const [ + AutofillHints.email + ], + textCapitalization: + TextCapitalization.none, + textInputAction: + TextInputAction.next, obscureText: false, decoration: InputDecoration( isDense: true, - labelText: FFLocalizations.of(context).getText( + labelText: FFLocalizations.of( + context) + .getText( '1ltg0ylb' /* Email */, ), - labelStyle: FlutterFlowTheme.of(context).labelLarge.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).primaryText, - fontSize: limitedInputFontSize, + labelStyle: FlutterFlowTheme + .of(context) + .labelLarge + .override( + fontFamily: + 'Plus Jakarta Sans', + color: + FlutterFlowTheme.of( + context) + .primaryText, + fontSize: + limitedInputFontSize, letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), + fontWeight: + FontWeight.w500, + useGoogleFonts: GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), ), - enabledBorder: OutlineInputBorder( + enabledBorder: + OutlineInputBorder( borderSide: BorderSide( - color: FlutterFlowTheme.of(context).customColor1, + color: + FlutterFlowTheme.of( + context) + .customColor1, width: 0.25, ), - borderRadius: BorderRadius.circular(12.0), + borderRadius: + BorderRadius.circular( + 12.0), ), - focusedBorder: OutlineInputBorder( + focusedBorder: + OutlineInputBorder( borderSide: BorderSide( - color: FlutterFlowTheme.of(context).success, + color: + FlutterFlowTheme.of( + context) + .success, width: 0.25, ), - borderRadius: BorderRadius.circular(12.0), + borderRadius: + BorderRadius.circular( + 12.0), ), - errorBorder: OutlineInputBorder( + errorBorder: + OutlineInputBorder( borderSide: BorderSide( - color: FlutterFlowTheme.of(context).error, + color: + FlutterFlowTheme.of( + context) + .error, width: 0.25, ), - borderRadius: BorderRadius.circular(12.0), + borderRadius: + BorderRadius.circular( + 12.0), ), errorStyle: TextStyle( - color: FlutterFlowTheme.of(context).error, - fontSize: limitedInputFontSize, + color: FlutterFlowTheme.of( + context) + .error, + fontSize: + limitedInputFontSize, fontWeight: FontWeight.w500, ), - focusedErrorBorder: OutlineInputBorder( + focusedErrorBorder: + OutlineInputBorder( borderSide: BorderSide( - color: FlutterFlowTheme.of(context).error, + color: + FlutterFlowTheme.of( + context) + .error, width: 0.25, ), - borderRadius: BorderRadius.circular(12.0), + borderRadius: + BorderRadius.circular( + 12.0), ), suffixIcon: Icon( Icons.email, - color: FlutterFlowTheme.of(context).accent1, + color: FlutterFlowTheme.of( + context) + .accent1, size: 22.0, ), ), - style: FlutterFlowTheme.of(context).bodyLarge.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).primaryText, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), - ), - keyboardType: TextInputType.emailAddress, - validator: - _model.emailAddressTextControllerValidator.asValidator(context), + style: + FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .primaryText, + fontSize: + limitedInputFontSize, + letterSpacing: 0.0, + fontWeight: + FontWeight.w500, + useGoogleFonts: + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), + ), + keyboardType: + TextInputType.emailAddress, + validator: _model + .emailAddressTextControllerValidator + .asValidator(context), ), ), ), Padding( - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0), + padding: const EdgeInsetsDirectional + .fromSTEB(0.0, 0.0, 0.0, 16.0), child: SizedBox( width: double.infinity, child: TextFormField( - key: const ValueKey('passwordTextFormField'), - controller: _model.passwordTextController, - cursorColor: FlutterFlowTheme.of(context).primary, - focusNode: _model.passwordFocusNode, - onChanged: (_) => EasyDebounce.debounce('_model.passwordTextController', - const Duration(milliseconds: 500), () => setState(() {})), + key: const ValueKey( + 'passwordTextFormField'), + controller: _model + .passwordTextController, + cursorColor: + FlutterFlowTheme.of(context) + .primary, + focusNode: + _model.passwordFocusNode, + onChanged: (_) => + EasyDebounce.debounce( + '_model.passwordTextController', + const Duration( + milliseconds: 500), + () => setState(() {})), autofocus: true, - autofillHints: const [AutofillHints.password], - textInputAction: TextInputAction.send, - obscureText: !_model.passwordVisibility, + autofillHints: const [ + AutofillHints.password + ], + textInputAction: + TextInputAction.send, + obscureText: + !_model.passwordVisibility, decoration: InputDecoration( isDense: true, - labelText: - FFLocalizations.of(context).getText('2x19ce8k' /* Senha */), - labelStyle: FlutterFlowTheme.of(context).labelLarge.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).primaryText, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans')), - enabledBorder: OutlineInputBorder( + labelText: FFLocalizations.of( + context) + .getText( + '2x19ce8k' /* Senha */), + labelStyle: FlutterFlowTheme + .of(context) + .labelLarge + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .primaryText, + fontSize: + limitedInputFontSize, + letterSpacing: 0.0, + fontWeight: + FontWeight.w500, + useGoogleFonts: + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans')), + enabledBorder: + OutlineInputBorder( borderSide: BorderSide( - color: FlutterFlowTheme.of(context).customColor1, width: 0.25), - borderRadius: BorderRadius.circular(12.0), + color: + FlutterFlowTheme.of( + context) + .customColor1, + width: 0.25), + borderRadius: + BorderRadius.circular( + 12.0), ), errorStyle: TextStyle( - color: FlutterFlowTheme.of(context).error, - fontSize: limitedInputFontSize, + color: FlutterFlowTheme.of( + context) + .error, + fontSize: + limitedInputFontSize, fontWeight: FontWeight.w500, ), focusedBorder: OutlineInputBorder( borderSide: - const BorderSide(color: Color(0xFF1AAB5F), width: 0.25), - borderRadius: BorderRadius.circular(12.0)), - errorBorder: OutlineInputBorder( - borderSide: const BorderSide(color: Color(0xFFFF5963), width: 0.25), - borderRadius: BorderRadius.circular(12.0), + const BorderSide( + color: Color( + 0xFF1AAB5F), + width: 0.25), + borderRadius: + BorderRadius.circular( + 12.0)), + errorBorder: + OutlineInputBorder( + borderSide: + const BorderSide( + color: Color( + 0xFFFF5963), + width: 0.25), + borderRadius: + BorderRadius.circular( + 12.0), ), - focusedErrorBorder: OutlineInputBorder( - borderSide: const BorderSide(color: Color(0xFFFF5963), width: 0.25), - borderRadius: BorderRadius.circular(12.0), + focusedErrorBorder: + OutlineInputBorder( + borderSide: + const BorderSide( + color: Color( + 0xFFFF5963), + width: 0.25), + borderRadius: + BorderRadius.circular( + 12.0), ), filled: true, - fillColor: FlutterFlowTheme.of(context).primaryBackground, + fillColor: + FlutterFlowTheme.of( + context) + .primaryBackground, suffixIcon: InkWell( - onTap: () => setState( - () => _model.passwordVisibility = !_model.passwordVisibility), - focusNode: FocusNode(skipTraversal: true), + onTap: () => setState(() => + _model.passwordVisibility = + !_model + .passwordVisibility), + focusNode: FocusNode( + skipTraversal: true), child: Icon( _model.passwordVisibility - ? Icons.visibility_outlined - : Icons.visibility_off_outlined, - color: FlutterFlowTheme.of(context).accent1, + ? Icons + .visibility_outlined + : Icons + .visibility_off_outlined, + color: + FlutterFlowTheme.of( + context) + .accent1, size: 24.0), ), ), - style: FlutterFlowTheme.of(context).bodyLarge.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).primaryText, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), - ), - validator: _model.passwordTextControllerValidator.asValidator(context), + style: + FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .primaryText, + fontSize: + limitedInputFontSize, + letterSpacing: 0.0, + fontWeight: + FontWeight.w500, + useGoogleFonts: + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), + ), + validator: _model + .passwordTextControllerValidator + .asValidator(context), ), ), ), @@ -353,77 +512,153 @@ class _SignInTemplateComponentWidgetState extends State('SubmitButtonWidget'), + key: const ValueKey( + 'SubmitButtonWidget'), onPressed: _isFormInvalid() ? null : () async { - await AuthenticationService.signIn( + await AuthenticationService + .signIn( context, _model, - emailAdress: _model.emailAddressTextController.text, - password: _model.passwordTextController.text, + emailAdress: _model + .emailAddressTextController + .text, + password: _model + .passwordTextController + .text, ); setState(() {}); }, - text: FFLocalizations.of(context).getText('k44tm7wo' /* Entrar */), + text: FFLocalizations.of( + context) + .getText( + 'k44tm7wo' /* Entrar */), options: FFButtonOptions( width: double.infinity, height: 44.0, - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), + padding: + const EdgeInsetsDirectional + .fromSTEB( + 0.0, 0.0, 0.0, 0.0), iconPadding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), - color: FlutterFlowTheme.of(context).primary, - textStyle: FlutterFlowTheme.of(context).titleSmall.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).info, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans')), + const EdgeInsetsDirectional + .fromSTEB( + 0.0, 0.0, 0.0, 0.0), + color: FlutterFlowTheme.of( + context) + .primary, + textStyle: FlutterFlowTheme + .of(context) + .titleSmall + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .info, + fontSize: + limitedInputFontSize, + letterSpacing: 0.0, + fontWeight: + FontWeight.w500, + useGoogleFonts: + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans')), elevation: 3.0, - borderSide: const BorderSide(color: Colors.transparent, width: 1.0), - borderRadius: BorderRadius.circular(12.0), - disabledColor: FlutterFlowTheme.of(context).customColor5, - disabledTextColor: Colors.white, + borderSide: + const BorderSide( + color: Colors + .transparent, + width: 1.0), + borderRadius: + BorderRadius.circular( + 12.0), + disabledColor: + FlutterFlowTheme.of( + context) + .customColor5, + disabledTextColor: + Colors.white, ), showLoadingIndicator: false, ), ), Padding( - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0), + padding: + const EdgeInsetsDirectional + .fromSTEB( + 0.0, 0.0, 0.0, 16.0), child: FFButtonWidget( - key: const ValueKey('toggleSignUpPage'), - onPressed: () async => await widget.toggleSignUpPage?.call(), - text: FFLocalizations.of(context).getText( + key: const ValueKey( + 'toggleSignUpPage'), + onPressed: () async => + await widget + .toggleSignUpPage + ?.call(), + text: FFLocalizations.of( + context) + .getText( '14u7ipws' /* Cadastrar */, ), options: FFButtonOptions( width: double.infinity, height: 44.0, - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), + padding: + const EdgeInsetsDirectional + .fromSTEB( + 0.0, 0.0, 0.0, 0.0), iconPadding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), - color: FlutterFlowTheme.of(context).customColor1, - textStyle: FlutterFlowTheme.of(context).titleSmall.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).secondaryText, - fontSize: limitedInputFontSize, + const EdgeInsetsDirectional + .fromSTEB( + 0.0, 0.0, 0.0, 0.0), + color: FlutterFlowTheme.of( + context) + .customColor1, + textStyle: FlutterFlowTheme + .of(context) + .titleSmall + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .secondaryText, + fontSize: + limitedInputFontSize, letterSpacing: 0.0, - fontWeight: FontWeight.w500, + fontWeight: + FontWeight.w500, useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), ), elevation: 3.0, - borderSide: const BorderSide(color: Colors.transparent, width: 1.0), - borderRadius: BorderRadius.circular(12.0), + borderSide: + const BorderSide( + color: Colors + .transparent, + width: 1.0), + borderRadius: + BorderRadius.circular( + 12.0), ), showLoadingIndicator: false, ), @@ -433,158 +668,279 @@ class _SignInTemplateComponentWidgetState extends State('SubmitButtonWidget'), - onPressed: _isFormInvalid() - ? null - : () async { - try { - await AuthenticationService.signIn( - context, - _model, - emailAdress: _model.emailAddressTextController.text, - password: _model.passwordTextController.text, - ); - setState(() {}); - } catch (e, s) { - await DialogUtil.errorDefault(context); - LogUtil.requestAPIFailed( - 'login.php', - _model.emailAddressTextController.text, - "Login", - e, - s); - } - }, - text: FFLocalizations.of(context).getText('1x926nsn'), + key: const ValueKey< + String>( + 'SubmitButtonWidget'), + onPressed: + _isFormInvalid() + ? null + : () async { + try { + await AuthenticationService + .signIn( + context, + _model, + emailAdress: _model + .emailAddressTextController + .text, + password: _model + .passwordTextController + .text, + ); + setState( + () {}); + } catch (e, s) { + await DialogUtil + .errorDefault( + context); + LogUtil.requestAPIFailed( + 'login.php', + _model + .emailAddressTextController + .text, + "Login", + e, + s); + } + }, + text: FFLocalizations.of( + context) + .getText('1x926nsn'), options: FFButtonOptions( width: double.infinity, height: 44.0, padding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), + const EdgeInsetsDirectional + .fromSTEB(0.0, + 0.0, 0.0, 0.0), iconPadding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), - color: FlutterFlowTheme.of(context).accent1, - textStyle: FlutterFlowTheme.of(context).titleSmall.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).info, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), - ), + const EdgeInsetsDirectional + .fromSTEB(0.0, + 0.0, 0.0, 0.0), + color: + FlutterFlowTheme.of( + context) + .accent1, + textStyle: + FlutterFlowTheme.of( + context) + .titleSmall + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme.of( + context) + .info, + fontSize: + limitedInputFontSize, + letterSpacing: + 0.0, + fontWeight: + FontWeight + .w500, + useGoogleFonts: GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), + ), elevation: 3.0, - borderSide: const BorderSide( - color: Colors.transparent, + borderSide: + const BorderSide( + color: Colors + .transparent, width: 1.0, ), - borderRadius: BorderRadius.circular(12.0), - disabledColor: const Color(0xE81AAB5F), + borderRadius: + BorderRadius + .circular(12.0), + disabledColor: + const Color( + 0xE81AAB5F), ), - showLoadingIndicator: true, + showLoadingIndicator: + true, ), ), ), Expanded( child: Padding( - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0), + padding: + const EdgeInsetsDirectional + .fromSTEB(0.0, 0.0, + 0.0, 16.0), child: FFButtonWidget( - key: const ValueKey('toggleSignUpPage'), - onPressed: () async => await widget.toggleSignUpPage?.call(), - text: FFLocalizations.of(context) - .getText('jwvd4ai1' /* Cadastrar */), + key: const ValueKey< + String>( + 'toggleSignUpPage'), + onPressed: () async => + await widget + .toggleSignUpPage + ?.call(), + text: FFLocalizations.of( + context) + .getText( + 'jwvd4ai1' /* Cadastrar */), options: FFButtonOptions( width: double.infinity, height: 44.0, padding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), + const EdgeInsetsDirectional + .fromSTEB(0.0, + 0.0, 0.0, 0.0), iconPadding: - const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), - color: FlutterFlowTheme.of(context).customColor1, - textStyle: FlutterFlowTheme.of(context).titleSmall.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).secondaryText, - fontSize: 16.0, - letterSpacing: 0.0, - fontWeight: FontWeight.w500, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), - ), + const EdgeInsetsDirectional + .fromSTEB(0.0, + 0.0, 0.0, 0.0), + color: + FlutterFlowTheme.of( + context) + .customColor1, + textStyle: + FlutterFlowTheme.of( + context) + .titleSmall + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme.of( + context) + .secondaryText, + fontSize: + 16.0, + letterSpacing: + 0.0, + fontWeight: + FontWeight + .w500, + useGoogleFonts: GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), + ), elevation: 3.0, - borderSide: const BorderSide( - color: Colors.transparent, + borderSide: + const BorderSide( + color: Colors + .transparent, width: 1.0, ), - borderRadius: BorderRadius.circular(12.0), + borderRadius: + BorderRadius + .circular(12.0), ), - showLoadingIndicator: false, + showLoadingIndicator: + false, ), ), ), - ].divide(const SizedBox(width: 7.0))); + ].divide( + const SizedBox(width: 7.0))); } }, ), Padding( - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 12.0, 0.0, 12.0), + padding: + const EdgeInsetsDirectional.fromSTEB( + 0.0, 12.0, 0.0, 12.0), child: InkWell( - key: const ValueKey('ForgotPassword'), + key: const ValueKey( + 'ForgotPassword'), splashColor: Colors.transparent, focusColor: Colors.transparent, hoverColor: Colors.transparent, highlightColor: Colors.transparent, onTap: () async { await showModalBottomSheet( - isScrollControlled: true, - backgroundColor: Colors.transparent, - context: context, - builder: (context) { - return Padding( - padding: MediaQuery.viewInsetsOf(context), - child: const ForgotPasswordTemplateComponentWidget(), - ); - }).then((value) => safeSetState(() {})); + isScrollControlled: true, + backgroundColor: + Colors.transparent, + context: context, + builder: (context) { + return Padding( + padding: MediaQuery + .viewInsetsOf( + context), + child: + const ForgotPasswordTemplateComponentWidget(), + ); + }) + .then((value) => + safeSetState(() {})); }, child: RichText( - textScaler: MediaQuery.of(context).textScaler, + textScaler: + MediaQuery.of(context).textScaler, text: TextSpan( children: [ TextSpan( - text: FFLocalizations.of(context).getText( + text: + FFLocalizations.of(context) + .getText( '05dx91ku' /* Você esqueceu a sua senha? */, ), style: TextStyle( - color: FlutterFlowTheme.of(context).primaryText, - fontSize: limitedInputFontSize, + color: FlutterFlowTheme.of( + context) + .primaryText, + fontSize: + limitedInputFontSize, ), ), TextSpan( - text: FFLocalizations.of(context) - .getText('p5c6d54y' /* Recupere aqui */), - style: FlutterFlowTheme.of(context).bodyMedium.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).primary, - fontSize: limitedInputFontSize, - letterSpacing: 0.0, - fontWeight: FontWeight.normal, - useGoogleFonts: - GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), - ), - mouseCursor: SystemMouseCursors.click, + text: FFLocalizations.of( + context) + .getText( + 'p5c6d54y' /* Recupere aqui */), + style: + FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: + 'Plus Jakarta Sans', + color: FlutterFlowTheme + .of(context) + .primary, + fontSize: + limitedInputFontSize, + letterSpacing: 0.0, + fontWeight: + FontWeight.normal, + useGoogleFonts: + GoogleFonts + .asMap() + .containsKey( + 'Plus Jakarta Sans'), + ), + mouseCursor: + SystemMouseCursors.click, ) ], - style: FlutterFlowTheme.of(context).bodyMedium.override( - fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily, - letterSpacing: 0.0, - useGoogleFonts: GoogleFonts.asMap() - .containsKey(FlutterFlowTheme.of(context).bodyMediumFamily), - fontSize: limitedInputFontSize), + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: + FlutterFlowTheme.of( + context) + .bodyMediumFamily, + letterSpacing: 0.0, + useGoogleFonts: GoogleFonts + .asMap() + .containsKey( + FlutterFlowTheme.of( + context) + .bodyMediumFamily), + fontSize: + limitedInputFontSize), ), ), ), @@ -594,7 +950,8 @@ class _SignInTemplateComponentWidgetState extends State( future: () async { - final bool isLogged = await StorageHelper().get(SecureStorageKey.isLogged.value) == 'true'; - final bool haveLocal = await StorageHelper().get(SecureStorageKey.haveLocal.value) == 'true'; + final bool isLogged = + await StorageHelper().get(SecureStorageKey.isLogged.value) == + 'true'; + final bool haveLocal = + await StorageHelper().get(SecureStorageKey.haveLocal.value) == + 'true'; final bool haveUserUUID = - (await StorageHelper().get(ProfileStorageKey.userUUID.key))?.isNotEmpty ?? false; - final bool haveDevUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key))?.isNotEmpty ?? false; + (await StorageHelper().get(ProfileStorageKey.userUUID.key)) + ?.isNotEmpty ?? + false; + final bool haveDevUUID = + (await StorageHelper().get(ProfileStorageKey.devUUID.key)) + ?.isNotEmpty ?? + false; if (isLogged && haveDevUUID && haveUserUUID) { return haveLocal @@ -100,17 +109,20 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { create: (context) => MenuBloc( style: MenuView.list_grid, item: EnumMenuItem.button, - entries: MenuEntry.getEntriesByType(MenuEntryType.Home), + entries: MenuEntry.getEntriesByType( + MenuEntryType.Home), )..add(MenuEvent()), ), BlocProvider( create: (context) => HomeBloc()..add(HomeEvent()), ), BlocProvider( - create: (context) => LocalProfileBloc()..add(LocalProfileEvent()), + create: (context) => + LocalProfileBloc()..add(LocalProfileEvent()), ), ], - child: HomePageWidget(key: UniqueKey(), LocalsRepositoryImpl().update), + child: HomePageWidget( + key: UniqueKey(), LocalsRepositoryImpl().update), ) : const ReceptionPageWidget(); } else { @@ -134,8 +146,10 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { name: 'forgotPassword', path: '/forgotPassword', builder: (context, params) { - late final String email = params.getParam('email', ParamType.String); - late final String token = params.getParam('token', ParamType.String); + late final String email = + params.getParam('email', ParamType.String); + late final String token = + params.getParam('token', ParamType.String); return ForgotPasswordScreen( key: ValueKey('ForgotPasswordScreen'), @@ -152,7 +166,8 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { name: 'homePage', path: '/homePage', builder: (context, params) { - final Future Function(BuildContext context)? update = params.getParam('update', ParamType.Function); + final Future Function(BuildContext context)? update = + params.getParam('update', ParamType.Function); return MultiBlocProvider( providers: [ BlocProvider( @@ -166,7 +181,8 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { create: (context) => HomeBloc()..add(HomeEvent()), ), BlocProvider( - create: (context) => LocalProfileBloc()..add(LocalProfileEvent()), + create: (context) => + LocalProfileBloc()..add(LocalProfileEvent()), ), ], child: HomePageWidget(key: UniqueKey(), update), @@ -175,12 +191,16 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { FFRoute( name: 'petsOnThePropertyPage', path: '/petsOnThePropertyPage', - builder: (context, params) => Scaffold(body: const PetsHistoryScreen(isApp: true))), + builder: (context, params) => + Scaffold(body: const PetsHistoryScreen(isApp: true))), FFRoute( name: 'vehiclesOnThePropertyPage', path: '/vehiclesOnThePropertyPage', builder: (context, params) => const VehicleOnTheProperty()), - FFRoute(name: 'receptionPage', path: '/receptionPage', builder: (context, params) => const ReceptionPageWidget()), + FFRoute( + name: 'receptionPage', + path: '/receptionPage', + builder: (context, params) => const ReceptionPageWidget()), FFRoute( name: 'messageHistoryPage', path: '/messageHistoryPage', @@ -192,19 +212,28 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { FFRoute( name: 'scheduleCompleteVisitPage', path: '/scheduleCompleteVisitPage', - builder: (context, params) => const ScheduleCompleteVisitPageWidget()), + builder: (context, params) => + const ScheduleCompleteVisitPageWidget()), FFRoute( - name: 'deliverySchedule', path: '/deliverySchedule', builder: (context, params) => const DeliverySchedule()), + name: 'deliverySchedule', + path: '/deliverySchedule', + builder: (context, params) => const DeliverySchedule()), FFRoute( name: 'provisionalSchedule', path: '/provisionalSchedule', builder: (context, params) => const ProvisionalSchedule()), - FFRoute(name: 'fastPassPage', path: '/fastPassPage', builder: (context, params) => FastPassPageWidget()), + FFRoute( + name: 'fastPassPage', + path: '/fastPassPage', + builder: (context, params) => FastPassPageWidget()), FFRoute( name: 'preferencesSettings', path: '/preferencesSettings', builder: (context, params) => PreferencesPageWidget()), - FFRoute(name: 'aboutProperty', path: '/aboutProperty', builder: (context, params) => AboutPropertyPage()), + FFRoute( + name: 'aboutProperty', + path: '/aboutProperty', + builder: (context, params) => AboutPropertyPage()), FFRoute( name: 'residentsOnThePropertyPage', path: '/residentsOnThePropertyPage', @@ -220,8 +249,11 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { FFRoute( name: 'acessHistoryPage', path: '/acessHistoryPage', - builder: (context, params) => - AccessHistoryScreen(opt: const {'personType': '.*', 'accessType': '.*', 'search': '.*'})), + builder: (context, params) => AccessHistoryScreen(opt: const { + 'personType': '.*', + 'accessType': '.*', + 'search': '.*' + })), FFRoute( name: 'provisionalHistoryPage', path: '/provisionalHistoryPage', @@ -230,13 +262,34 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { name: 'liberationHistory', path: '/liberationHistory', builder: (context, params) => const LiberationHistoryWidget()), - FFRoute(name: 'signInPage', path: '/signInPage', builder: (context, params) => const SignInPageWidget()), - FFRoute(name: 'signUpPage', path: '/signUpPage', builder: (context, params) => const SignUpPageWidget()), - FFRoute(name: 'welcomePage', path: '/welcomePage', builder: (context, params) => const WelcomePage()), - FFRoute(name: 'qrCodePage', path: '/qrCodePage', builder: (context, params) => const QrCodePageWidget()), - FFRoute(name: 'preferencesPage', path: '/preferencesPage', builder: (context, params) => PreferencesPageWidget()), - FFRoute(name: 'packageOrder', path: '/packageOrder', builder: (context, params) => const PackageOrderPage()), - FFRoute(name: 'reservation', path: '/reservation', builder: (context, params) => ReservationPageWidget()), + FFRoute( + name: 'signInPage', + path: '/signInPage', + builder: (context, params) => const SignInPageWidget()), + FFRoute( + name: 'signUpPage', + path: '/signUpPage', + builder: (context, params) => const SignUpPageWidget()), + FFRoute( + name: 'welcomePage', + path: '/welcomePage', + builder: (context, params) => const WelcomePage()), + FFRoute( + name: 'qrCodePage', + path: '/qrCodePage', + builder: (context, params) => const QrCodePageWidget()), + FFRoute( + name: 'preferencesPage', + path: '/preferencesPage', + builder: (context, params) => PreferencesPageWidget()), + FFRoute( + name: 'packageOrder', + path: '/packageOrder', + builder: (context, params) => const PackageOrderPage()), + FFRoute( + name: 'reservation', + path: '/reservation', + builder: (context, params) => ReservationPageWidget()), FFRoute( name: 'petsPage', path: '/petsPage', @@ -252,7 +305,9 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) { extension NavParamExtensions on Map { Map get withoutNulls => Map.fromEntries( - entries.where((e) => e.value != null).map((e) => MapEntry(e.key, e.value!)), + entries + .where((e) => e.value != null) + .map((e) => MapEntry(e.key, e.value!)), ); } @@ -266,7 +321,8 @@ extension NavigationExtensions on BuildContext { } extension _GoRouterStateExtensions on GoRouterState { - Map get extraMap => extra != null ? extra as Map : {}; + Map get extraMap => + extra != null ? extra as Map : {}; Map get allParams => {} ..addAll(pathParameters) ..addAll(uri.queryParameters) @@ -279,8 +335,9 @@ extension _GoRouterStateExtensions on GoRouterState { extension GoRouterLocationExtension on GoRouter { String getCurrentLocation() { final RouteMatch lastMatch = routerDelegate.currentConfiguration.last; - final RouteMatchList matchList = - lastMatch is ImperativeRouteMatch ? lastMatch.matches : routerDelegate.currentConfiguration; + final RouteMatchList matchList = lastMatch is ImperativeRouteMatch + ? lastMatch.matches + : routerDelegate.currentConfiguration; return matchList.uri.toString(); } } @@ -293,13 +350,17 @@ class FFParameters { Map futureParamValues = {}; bool get isEmpty => - state.allParams.isEmpty || (state.allParams.length == 1 && state.extraMap.containsKey(kTransitionInfoKey)); - bool isAsyncParam(MapEntry param) => asyncParams.containsKey(param.key) && param.value is String; + state.allParams.isEmpty || + (state.allParams.length == 1 && + state.extraMap.containsKey(kTransitionInfoKey)); + bool isAsyncParam(MapEntry param) => + asyncParams.containsKey(param.key) && param.value is String; bool get hasFutures => state.allParams.entries.any(isAsyncParam); Future completeFutures() => Future.wait( state.allParams.entries.where(isAsyncParam).map( (param) async { - final doc = await asyncParams[param.key]!(param.value).onError((_, __) => null); + final doc = await asyncParams[param.key]!(param.value) + .onError((_, __) => null); if (doc != null) { futureParamValues[param.key] = doc; return true; @@ -309,12 +370,15 @@ class FFParameters { ), ).onError((_, __) => [false]).then((v) => v.every((e) => e)); - dynamic getParam(String paramName, ParamType type, {bool isList = false, StructBuilder? structBuilder}) { - if (futureParamValues.containsKey(paramName)) return futureParamValues[paramName]; + dynamic getParam(String paramName, ParamType type, + {bool isList = false, StructBuilder? structBuilder}) { + if (futureParamValues.containsKey(paramName)) + return futureParamValues[paramName]; if (!state.allParams.containsKey(paramName)) return null; final param = state.allParams[paramName]; if (param is! String) return param; - return deserializeParam(param, type, isList, structBuilder: structBuilder); + return deserializeParam(param, type, isList, + structBuilder: structBuilder); } } @@ -354,13 +418,16 @@ class FFRoute { key: state.pageKey, child: child, transitionDuration: transitionInfo.duration, - transitionsBuilder: (context, animation, secondaryAnimation, child) => PageTransition( + transitionsBuilder: + (context, animation, secondaryAnimation, child) => + PageTransition( type: transitionInfo.transitionType, duration: transitionInfo.duration, reverseDuration: transitionInfo.duration, alignment: transitionInfo.alignment, child: child, - ).buildTransitions(context, animation, secondaryAnimation, child), + ).buildTransitions( + context, animation, secondaryAnimation, child), ) : MaterialPage(key: state.pageKey, child: child); }, @@ -381,7 +448,8 @@ class TransitionInfo { final Duration duration; final Alignment? alignment; - static TransitionInfo appDefault() => const TransitionInfo(hasTransition: false); + static TransitionInfo appDefault() => + const TransitionInfo(hasTransition: false); } class RootPageContext { @@ -393,7 +461,9 @@ class RootPageContext { final rootPageContext = context.read(); final isRootPage = rootPageContext?.isRootPage ?? false; final location = GoRouterState.of(context).uri.toString(); - return isRootPage && location != '/' && location != rootPageContext?.errorRoute; + return isRootPage && + location != '/' && + location != rootPageContext?.errorRoute; } static Widget wrap(Widget child, {String? errorRoute}) => diff --git a/lib/pages/forgot_password_page/forgot_password_screen.dart b/lib/pages/forgot_password_page/forgot_password_screen.dart index da97657c..99d0914d 100644 --- a/lib/pages/forgot_password_page/forgot_password_screen.dart +++ b/lib/pages/forgot_password_page/forgot_password_screen.dart @@ -15,7 +15,8 @@ import '../../flutter_flow/internationalization.dart'; import 'forgot_password_model.dart'; class ForgotPasswordScreen extends StatefulWidget { - const ForgotPasswordScreen({super.key, required this.email, required this.token}); + const ForgotPasswordScreen( + {super.key, required this.email, required this.token}); final String email; final String token; @@ -23,7 +24,8 @@ class ForgotPasswordScreen extends StatefulWidget { State createState() => _ForgotPasswordScreenState(); } -class _ForgotPasswordScreenState extends State with TickerProviderStateMixin { +class _ForgotPasswordScreenState extends State + with TickerProviderStateMixin { late ForgotPasswordScreenModel _model; final animationsMap = {}; @@ -148,7 +150,8 @@ class _ForgotPasswordScreenState extends State with Ticker width: MediaQuery.of(context).size.width, child: SingleChildScrollView( child: Padding( - padding: const EdgeInsets.only(left: 15.0, right: 15.0, top: 10.0, bottom: 0.0), + padding: const EdgeInsets.only( + left: 15.0, right: 15.0, top: 10.0, bottom: 0.0), child: Container( width: double.infinity, constraints: const BoxConstraints(maxWidth: 570.0), @@ -157,7 +160,8 @@ class _ForgotPasswordScreenState extends State with Ticker borderRadius: BorderRadius.circular(12.0), ), child: Padding( - padding: const EdgeInsets.only(left: 20.0, right: 20.0, top: 10.0, bottom: 0.0), + padding: const EdgeInsets.only( + left: 20.0, right: 20.0, top: 10.0, bottom: 0.0), child: Column( mainAxisSize: MainAxisSize.max, crossAxisAlignment: CrossAxisAlignment.center, @@ -171,21 +175,25 @@ class _ForgotPasswordScreenState extends State with Ticker fontSize: 24.0, fontWeight: FontWeight.bold, letterSpacing: 0.0, - useGoogleFonts: GoogleFonts.asMap().containsKey('Nunito'), + useGoogleFonts: + GoogleFonts.asMap().containsKey('Nunito'), ), )), Align( alignment: const AlignmentDirectional(-1.0, 0.0), child: Padding( - padding: const EdgeInsetsDirectional.fromSTEB(20.0, 24.0, 0.0, 30.0), + padding: const EdgeInsetsDirectional.fromSTEB( + 20.0, 24.0, 0.0, 30.0), child: Text( message, textAlign: TextAlign.start, style: FlutterFlowTheme.of(context).bodyMedium.override( - fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily, + fontFamily: + FlutterFlowTheme.of(context).bodyMediumFamily, fontWeight: FontWeight.bold, - useGoogleFonts: - GoogleFonts.asMap().containsKey(FlutterFlowTheme.of(context).bodyMediumFamily), + useGoogleFonts: GoogleFonts.asMap().containsKey( + FlutterFlowTheme.of(context) + .bodyMediumFamily), ), ), ), @@ -201,32 +209,42 @@ class _ForgotPasswordScreenState extends State with Ticker controller: _model.passwordRegisterFormTextController, focusNode: _model.passwordRegisterFormFocusNode, visibility: _model.passwordRegisterFormVisibility, - onVisibilityToggle: () => setState( - () => _model.passwordRegisterFormVisibility = !_model.passwordRegisterFormVisibility), - label: - FFLocalizations.of(context).getVariableText(ptText: 'Nova Senha', enText: 'New Password'), - hint: FFLocalizations.of(context) - .getVariableText(ptText: 'Insira sua senha', enText: 'Enter your password'), - asValidator: _model.passwordRegisterFormTextControllerValidator.asValidator(context), + onVisibilityToggle: () => setState(() => + _model.passwordRegisterFormVisibility = + !_model.passwordRegisterFormVisibility), + label: FFLocalizations.of(context).getVariableText( + ptText: 'Nova Senha', enText: 'New Password'), + hint: FFLocalizations.of(context).getVariableText( + ptText: 'Insira sua senha', + enText: 'Enter your password'), + asValidator: _model + .passwordRegisterFormTextControllerValidator + .asValidator(context), ), _buildPasswordField( context, controller: _model.passwordConfirmFormTextController, focusNode: _model.passwordConfirmFormFocusNode, visibility: _model.passwordConfirmFormVisibility, - onVisibilityToggle: () => setState( - () => _model.passwordConfirmFormVisibility = !_model.passwordConfirmFormVisibility), - label: FFLocalizations.of(context) - .getVariableText(ptText: 'Confirme a Senha', enText: 'Confirm Password'), - hint: FFLocalizations.of(context) - .getVariableText(ptText: 'Confirme sua senha', enText: 'Confirm your password'), - asValidator: _model.passwordConfirmFormTextControllerValidator.asValidator(context), + onVisibilityToggle: () => setState(() => + _model.passwordConfirmFormVisibility = + !_model.passwordConfirmFormVisibility), + label: FFLocalizations.of(context).getVariableText( + ptText: 'Confirme a Senha', + enText: 'Confirm Password'), + hint: FFLocalizations.of(context).getVariableText( + ptText: 'Confirme sua senha', + enText: 'Confirm your password'), + asValidator: _model + .passwordConfirmFormTextControllerValidator + .asValidator(context), ), ], ), ), Padding( - padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0), + padding: const EdgeInsetsDirectional.fromSTEB( + 0.0, 0.0, 0.0, 16.0), child: FFButtonWidget( key: const ValueKey('SubmitButtonWidget'), onPressed: _model.isFormInvalid() @@ -248,16 +266,22 @@ class _ForgotPasswordScreenState extends State with Ticker width: double.infinity, height: 44.0, color: FlutterFlowTheme.of(context).accent1, - textStyle: FlutterFlowTheme.of(context).titleSmall.override( - fontFamily: 'Plus Jakarta Sans', - color: FlutterFlowTheme.of(context).secondaryText, - fontSize: 16.0, - fontWeight: FontWeight.w500, - useGoogleFonts: GoogleFonts.asMap().containsKey('Plus Jakarta Sans')), + textStyle: FlutterFlowTheme.of(context) + .titleSmall + .override( + fontFamily: 'Plus Jakarta Sans', + color: + FlutterFlowTheme.of(context).secondaryText, + fontSize: 16.0, + fontWeight: FontWeight.w500, + useGoogleFonts: GoogleFonts.asMap() + .containsKey('Plus Jakarta Sans')), elevation: 3.0, - borderSide: const BorderSide(color: Colors.transparent, width: 1.0), + borderSide: const BorderSide( + color: Colors.transparent, width: 1.0), borderRadius: BorderRadius.circular(12.0), - disabledColor: FlutterFlowTheme.of(context).customColor5, + disabledColor: + FlutterFlowTheme.of(context).customColor5, disabledTextColor: Colors.white, ), showLoadingIndicator: true, @@ -305,22 +329,28 @@ class _ForgotPasswordScreenState extends State with Ticker color: FlutterFlowTheme.of(context).primaryText, fontSize: 16.0, fontWeight: FontWeight.w500, - useGoogleFonts: GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), + useGoogleFonts: + GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), ), enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: FlutterFlowTheme.of(context).customColor1, width: 0.25), + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).customColor1, + width: 0.25), borderRadius: BorderRadius.circular(12.0), ), focusedBorder: OutlineInputBorder( - borderSide: const BorderSide(color: Color(0xFF1AAB5F), width: 0.25), + borderSide: + const BorderSide(color: Color(0xFF1AAB5F), width: 0.25), borderRadius: BorderRadius.circular(12.0), ), errorBorder: OutlineInputBorder( - borderSide: const BorderSide(color: Color(0xFFFF5963), width: 0.25), + borderSide: + const BorderSide(color: Color(0xFFFF5963), width: 0.25), borderRadius: BorderRadius.circular(12.0), ), focusedErrorBorder: OutlineInputBorder( - borderSide: const BorderSide(color: Color(0xFFFF5963), width: 0.25), + borderSide: + const BorderSide(color: Color(0xFFFF5963), width: 0.25), borderRadius: BorderRadius.circular(12.0), ), filled: true, @@ -330,7 +360,9 @@ class _ForgotPasswordScreenState extends State with Ticker onTap: onVisibilityToggle, focusNode: FocusNode(skipTraversal: true), child: Icon( - visibility ? Icons.visibility_outlined : Icons.visibility_off_outlined, + visibility + ? Icons.visibility_outlined + : Icons.visibility_off_outlined, color: FlutterFlowTheme.of(context).accent1, size: 24.0, ), @@ -341,7 +373,8 @@ class _ForgotPasswordScreenState extends State with Ticker color: FlutterFlowTheme.of(context).primaryText, fontSize: 16.0, fontWeight: FontWeight.w500, - useGoogleFonts: GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), + useGoogleFonts: + GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), ), validator: asValidator, ), diff --git a/lib/shared/constants/index.dart b/lib/shared/constants/index.dart index e69de29b..8b137891 100644 --- a/lib/shared/constants/index.dart +++ b/lib/shared/constants/index.dart @@ -0,0 +1 @@ + From a595e864444a2c9b9a7b5bd51022cd03c2a6cb84 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 29 Jan 2025 16:04:57 -0300 Subject: [PATCH 3/4] wip --- integration_test/auth_test.dart | 12 ++++++------ integration_test/locals_test.dart | 10 +++++----- integration_test/utils_test.dart | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/integration_test/auth_test.dart b/integration_test/auth_test.dart index 30d62340..4045cfc3 100644 --- a/integration_test/auth_test.dart +++ b/integration_test/auth_test.dart @@ -43,7 +43,7 @@ class AuthenticationTest { final credentials = fuzzer.fuzz(concat); - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); await _navigateToSignIn($); @@ -72,7 +72,7 @@ class AuthenticationTest { 'passwordTextFormField': '12345678', }; - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); await _navigateToSignIn($); await _auth(credentials, $, throwsException); @@ -94,7 +94,7 @@ class AuthenticationTest { 'emailTextFormField': 'email_app@exemplo.com', 'passwordTextFormField': '12345678', }; - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); await _navigateToSignUp($); await _auth(credentials, $, throwsException); @@ -151,7 +151,7 @@ class AuthenticationTest { final credentials = fuzzer.fuzz(concat); - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); @@ -177,7 +177,7 @@ class AuthenticationTest { $.tester.printToConsole( 'Authentication Test - Sign-Out: Deslogar da Conta'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidget(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -197,7 +197,7 @@ class AuthenticationTest { static void recovery() async { patrol('Open url in the app', ($) async { - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidget(const App()); await $.waitUntilVisible($(MenuStaggeredView)); diff --git a/integration_test/locals_test.dart b/integration_test/locals_test.dart index 1fe1a6cb..e2e605c9 100644 --- a/integration_test/locals_test.dart +++ b/integration_test/locals_test.dart @@ -52,7 +52,7 @@ class LocalsTest { $ = tester; $.tester.printToConsole('Locals Test - Selecionar um local disponível'); - await _loggedWithSomeoneLocalAccount($, false); + await _loggedWithSomeoneLocalAccount(false); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); await $.waitUntilVisible($(LocalProfileComponentWidget)); @@ -191,7 +191,7 @@ class LocalsTest { $.tester.printToConsole( 'Locals Test - Desvincular do local selecionado com multiplos locais disponiveis'); - await _loggedWithSomeoneLocalAccount($); + await _loggedWithSomeoneLocalAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -253,7 +253,7 @@ class LocalsTest { $ = tester; $.tester.printToConsole('Locals Test - Vincular um local desvinculado'); - await _loggedWithSomeoneLocalAccount($, false); + await _loggedWithSomeoneLocalAccount(false); await $.pumpWidget(const App()); final PatrolFinder bottomSheetFinder = @@ -306,7 +306,7 @@ class LocalsTest { 'Selecionar um local disponível com multíplos locais disponíveis', // (PatrolTester tester) async { $ = tester; - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidget(const App()); late Map credentials; final PatrolFinder throwsException = $(''); @@ -341,7 +341,7 @@ class LocalsTest { 'Selecionar um local disponível com somente um local disponível', // (PatrolTester tester) async { $ = tester; - await _loggedWithSomeoneLocalAccount($); + await _loggedWithSomeoneLocalAccount(); await $.pumpWidget(const App()); late Map credentials; final PatrolFinder throwsException = $(''); diff --git a/integration_test/utils_test.dart b/integration_test/utils_test.dart index 77eeb957..17c49545 100644 --- a/integration_test/utils_test.dart +++ b/integration_test/utils_test.dart @@ -1,8 +1,8 @@ part of 'app_test.dart'; -Future _loggedWithMultiLocalsAccount(PatrolTester $, +Future _loggedWithMultiLocalsAccount( [bool forceLinkedLocal = true]) async { - await _init($); + await _init(); await StorageHelper() // .set(SecureStorageKey.isLogged.value, 'true'); await StorageHelper() // @@ -29,9 +29,9 @@ Future _loggedWithMultiLocalsAccount(PatrolTester $, } } -Future _loggedWithSomeoneLocalAccount(PatrolTester $, +Future _loggedWithSomeoneLocalAccount( [bool forceLinkedLocal = true]) async { - await _init($); + await _init(); await StorageHelper() // .set(SecureStorageKey.isLogged.value, 'true'); await StorageHelper() // @@ -58,8 +58,8 @@ Future _loggedWithSomeoneLocalAccount(PatrolTester $, } } -Future _unlogged(PatrolTester $) async { - await _init($); +Future _unlogged() async { + await _init(); await StorageHelper() // .set(SecureStorageKey.isLogged.value, 'false'); await StorageHelper() // @@ -78,7 +78,7 @@ Future _unlogged(PatrolTester $) async { .set(LocalsStorageKey.isNewVersion.key, true); } -Future _init(PatrolTester $) async { +Future _init() async { WidgetsFlutterBinding.ensureInitialized(); await _initializeTracking(); await _initializeStorage(); From 3d0901697119d943690ccd6dad9dc3d336553b71 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 29 Jan 2025 16:05:52 -0300 Subject: [PATCH 4/4] WIP --- integration_test/menu_test.dart | 12 ++++++------ integration_test/module_test.dart | 6 +++--- integration_test/welcome_test.dart | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/integration_test/menu_test.dart b/integration_test/menu_test.dart index 092ca63c..10b0ab62 100644 --- a/integration_test/menu_test.dart +++ b/integration_test/menu_test.dart @@ -10,7 +10,7 @@ class MenuTest { $.tester.printToConsole( 'Menu Test - As labels dos menuItems correspondem aos títulos das AppBars?'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -102,7 +102,7 @@ class MenuTest { $ = tester; $.tester.printToConsole('Menu Test - HomeMenu contém seus itens?'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -141,7 +141,7 @@ class MenuTest { $ = tester; $.tester.printToConsole('Menu Test - HomeMenu contém seus itens?'); - await _loggedWithSomeoneLocalAccount($); + await _loggedWithSomeoneLocalAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -181,7 +181,7 @@ class MenuTest { $ = tester; $.tester.printToConsole('Menu Test - DrawerMenu contém seus itens?'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -228,7 +228,7 @@ class MenuTest { $ = tester; $.tester.printToConsole('Menu Test - DrawerMenu contém seus itens?'); - await _loggedWithSomeoneLocalAccount($); + await _loggedWithSomeoneLocalAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -278,7 +278,7 @@ class MenuTest { $ = tester; $.tester.printToConsole('Menu Test - Navegação entre items do Menu'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); diff --git a/integration_test/module_test.dart b/integration_test/module_test.dart index 3138f8e0..6377e474 100644 --- a/integration_test/module_test.dart +++ b/integration_test/module_test.dart @@ -9,7 +9,7 @@ class ModularizationTest { $.tester.printToConsole( 'Modularization Test - Os modulos de licença está sendo processados?'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -35,7 +35,7 @@ class ModularizationTest { $.tester.printToConsole( 'Modularization Test - Os modulos de licença está sendo processados?'); - await _loggedWithSomeoneLocalAccount($); + await _loggedWithSomeoneLocalAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); @@ -63,7 +63,7 @@ class ModularizationTest { $ = tester; $.tester.printToConsole('Licença está sendo atualizada?'); - await _loggedWithMultiLocalsAccount($); + await _loggedWithMultiLocalsAccount(); await $.pumpWidgetAndSettle(const App()); await $.waitUntilVisible($(MenuStaggeredView)); diff --git a/integration_test/welcome_test.dart b/integration_test/welcome_test.dart index e5d1a3f2..e3dc0316 100644 --- a/integration_test/welcome_test.dart +++ b/integration_test/welcome_test.dart @@ -7,7 +7,7 @@ class WelcomeTest { (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Welcome Test - Sign-In to Sign-Up'); - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); await _navigateToSignIn($); @@ -22,7 +22,7 @@ class WelcomeTest { (PatrolTester tester) async { $ = tester; $.tester.printToConsole('Welcome Test - Sign-Up to Sign-In'); - await _unlogged($); + await _unlogged(); await $.pumpWidgetAndSettle(const App()); await _navigateToSignUp($); await _navigateToSignIn($);