This commit is contained in:
J. A. Messias 2024-10-10 10:37:31 -03:00
parent d428f9379d
commit a92a34062c
3 changed files with 125 additions and 124 deletions

View File

@ -191,20 +191,20 @@ class _AppState extends State<App> {
if (isNotEmpty ) { if (isNotEmpty ) {
final BuildContext context = StorageUtil().context!; final BuildContext context = StorageUtil().context!;
final MediaQueryData mediaQuery = MediaQuery.of(context); final MediaQueryData mediaQuery = MediaQuery.of(context);
final double height = mediaQuery.size.height * 0.8; final double height = mediaQuery.size.height * 0.6;
final FlutterFlowTheme theme = FlutterFlowTheme.of(context); final FlutterFlowTheme theme = FlutterFlowTheme.of(context);
final Widget screen = ForgotPasswordScreen(email: email, token: token); final Widget screen = ForgotPasswordScreen(email: email, token: token);
builder(context) => screen; builder(context) => screen;
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
builder: (context) => SizedBox(height: height, child: builder(context)), builder: (context) => Padding(padding: MediaQuery.viewInsetsOf(context), child: builder(context)),
isScrollControlled: true, isScrollControlled: true,
barrierColor: theme.primaryBackground.withOpacity(0.2), // barrierColor: theme.primaryBackground.withOpacity(0.2),
backgroundColor: theme.primaryBackground, backgroundColor: theme.primaryBackground,
useSafeArea: true, useSafeArea: true,
enableDrag: true, enableDrag: true,
isDismissible: true, // isDismissible: true,
).then((_) => StorageUtil().isRecovered = false); ).whenComplete(() => StorageUtil().isRecovered = false);
} }
} }

View File

@ -13,8 +13,14 @@ class ForgotPasswordScreenModel extends FlutterFlowModel<ForgotPasswordScreen> {
String? Function(BuildContext, String?)? passwordRegisterFormTextControllerValidator; String? Function(BuildContext, String?)? passwordRegisterFormTextControllerValidator;
String? _passwordRegisterFormTextControllerValidator(BuildContext context, String? val) { String? _passwordRegisterFormTextControllerValidator(BuildContext context, String? val) {
if (val == null || val.isEmpty) { if (val == null || val.isEmpty) {
return FFLocalizations.of(context).getVariableText(
ptText: 'Campo é necessário',
enText: 'Field is required',
);
}
if (val.length < 8) {
return FFLocalizations.of(context).getText( return FFLocalizations.of(context).getText(
'6nn79lmh' /* Campo é necessário */, 'duq5gpp6' /* A senha deve ter pelo menos 8 ... */,
); );
} }
return null; return null;

View File

@ -88,11 +88,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
super.dispose(); super.dispose();
} }
@override Widget build(BuildContext context) => Scaffold( @override Widget build(BuildContext context) => buildBody(context);
appBar: buildAppBar(context),
body: buildBody(context),
backgroundColor: FlutterFlowTheme.of(context).primaryBackground,
);
AppBar buildAppBar(BuildContext context) { AppBar buildAppBar(BuildContext context) {
@ -130,130 +126,129 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
elevation: 0.0, elevation: 0.0,
); );
} }
SafeArea buildBody(BuildContext context) { Widget buildBody(BuildContext context) {
late final String title = FFLocalizations.of(context).getVariableText(
ptText: 'Recuperar Senha',
enText: 'Recover Password',
);
late final String message = FFLocalizations.of(context).getVariableText( late final String message = FFLocalizations.of(context).getVariableText(
ptText: 'Qual será a sua nova senha? Insira abaixo e confirme.', ptText: 'Qual será a sua nova senha? Insira abaixo e confirme.',
enText: 'What will be your new password? Enter it below and confirm.', enText: 'What will be your new password? Enter it below and confirm.',
); );
return SafeArea( return SizedBox(
child: SingleChildScrollView( height: 400,
child: Padding( width: MediaQuery.of(context).size.width,
padding: const EdgeInsets.only(bottom: 20.0), // Adiciona espaçamento inferior child: SingleChildScrollView(
child: Column( child: Padding(
mainAxisSize: MainAxisSize.max, padding: const EdgeInsets.only(left: 15.0, right: 15.0, top: 10.0, bottom: 0.0),
children: [ child: Material(
Container( child: Container(
width: 291.0, width: double.infinity,
height: 167.0, constraints: const BoxConstraints(maxWidth: 570.0),
decoration: const BoxDecoration(), decoration: BoxDecoration(
child: ClipRRect( color: FlutterFlowTheme.of(context).primaryBackground,
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(12.0),
child: const AtomImageSvgTheme(filename: 'register', width: 600, height: 155), ),
), child: Padding(
), padding: const EdgeInsets.only(left: 20.0, right: 20.0, top: 10.0, bottom: 0.0),
Padding( child: Column(
padding: const EdgeInsets.all(34.0), mainAxisSize: MainAxisSize.max,
child: Material( crossAxisAlignment: CrossAxisAlignment.center,
child: Container( children: [
width: double.infinity, Center(child: Text(title, style: FlutterFlowTheme.of(context).title1.override(
constraints: const BoxConstraints(maxWidth: 570.0), fontFamily: 'Nunito',
decoration: BoxDecoration( color: FlutterFlowTheme.of(context).primaryText,
color: FlutterFlowTheme.of(context).primaryBackground, fontSize: 24.0,
borderRadius: BorderRadius.circular(12.0), fontWeight: FontWeight.bold,
), letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey('Nunito'),
),)),
Align(
alignment: const AlignmentDirectional(-1.0, 0.0),
child: Padding( child: Padding(
padding: const EdgeInsets.all(32.0), padding: const EdgeInsetsDirectional.fromSTEB(20.0, 24.0, 0.0, 30.0),
child: Column( child: Text(
mainAxisSize: MainAxisSize.max, message,
crossAxisAlignment: CrossAxisAlignment.center, textAlign: TextAlign.start,
children: [ style: FlutterFlowTheme.of(context).bodyMedium.override(
Align( fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
alignment: const AlignmentDirectional(-1.0, 0.0), fontWeight: FontWeight.bold,
child: Padding( useGoogleFonts: GoogleFonts.asMap().containsKey(
padding: const EdgeInsetsDirectional.fromSTEB(20.0, 24.0, 0.0, 30.0), FlutterFlowTheme.of(context).bodyMediumFamily),
child: Text( ),
message,
textAlign: TextAlign.start,
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
),
),
Form(
key: _model.formKey,
autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column(
mainAxisSize: MainAxisSize.max,
children: [
_buildPasswordField(
context,
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'),
),
_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'),
),
],
),
),
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0),
child: FFButtonWidget(
key: const ValueKey<String>('SubmitButtonWidget'),
onPressed: _model.isFormInvalid() ? null : () async {
await AuthenticationService.changePassword(context, widget.email, _model.passwordRegisterFormTextController!.text, widget.token);
setState(() {});
},
text: FFLocalizations.of(context).getVariableText(
ptText: 'Enviar',
enText: 'Submit',
),
options: FFButtonOptions(
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')),
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,
),
showLoadingIndicator: true,
),
),
],
), ),
), ),
).animateOnPageLoad(animationsMap['containerOnPageLoadAnimation']!), ),
), Form(
key: _model.formKey,
autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column(
mainAxisSize: MainAxisSize.max,
children: [
_buildPasswordField(
context,
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),
),
_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),
),
],
),
),
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0),
child: FFButtonWidget(
key: const ValueKey<String>('SubmitButtonWidget'),
onPressed: _model.isFormInvalid() ? null : () async {
await AuthenticationService.changePassword(context, widget.email, _model.passwordConfirmFormTextController!.text, widget.token);
setState(() {});
},
text: FFLocalizations.of(context).getVariableText(
ptText: 'Enviar',
enText: 'Submit',
),
options: FFButtonOptions(
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')),
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,
),
showLoadingIndicator: true,
),
),
],
), ),
], ),
), ).animateOnPageLoad(animationsMap['containerOnPageLoadAnimation']!),
), ),
), ),
),
); );
} }
Widget _buildPasswordField(BuildContext context, {required TextEditingController? controller, required FocusNode? focusNode, required bool visibility, required VoidCallback onVisibilityToggle, required String hint, required String label,}) { Widget _buildPasswordField(BuildContext context, {required TextEditingController? controller, required FocusNode? focusNode, required bool visibility, required VoidCallback onVisibilityToggle, required String hint, required String label, required String? Function(String?)? asValidator}) {
return Padding( return 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( child: SizedBox(
@ -317,7 +312,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
useGoogleFonts: GoogleFonts.asMap().containsKey('Plus Jakarta Sans'), useGoogleFonts: GoogleFonts.asMap().containsKey('Plus Jakarta Sans'),
), ),
validator: _model.passwordRegisterFormTextControllerValidator.asValidator(context), validator: asValidator,
), ),
), ),
); );