Merge branch 'flutterflow' into bugfix/fd-597

This commit is contained in:
Lucas 2024-08-02 08:24:44 -03:00
commit 5e1211b44e
5 changed files with 68 additions and 61 deletions

View File

@ -51,8 +51,8 @@
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6436409227A31CD800820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6436409727A31CDC00820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6436409127A31CDB00820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6436409027A31CD400820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C1B4A503715BC7B0F8826983 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; }; C1B4A503715BC7B0F8826983 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -301,8 +301,8 @@
6436409C27A31CD800820AF7 /* InfoPlist.strings */ = { 6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
6436409227A31CD800820AF7 /* pt */, 6436409727A31CDC00820AF7 /* pt */,
6436409127A31CDB00820AF7 /* en */, 6436409027A31CD400820AF7 /* en */,
); );
name = InfoPlist.strings; name = InfoPlist.strings;
sourceTree = "<group>"; sourceTree = "<group>";

View File

@ -21,9 +21,6 @@ class SignUpTemplateComponentModel
); );
} }
if (!RegExp(kTextValidatorUsernameRegex).hasMatch(val)) {
return 'Must start with a letter and can only contain letters, digits and - or _.';
}
return null; return null;
} }
@ -41,7 +38,9 @@ class SignUpTemplateComponentModel
} }
if (!RegExp(kTextValidatorEmailRegex).hasMatch(val)) { if (!RegExp(kTextValidatorEmailRegex).hasMatch(val)) {
return 'Has to be a valid email address.'; return FFLocalizations.of(context).getText(
'vobnktrz' /* Insira um email valido. */,
);
} }
return null; return null;
} }
@ -60,6 +59,12 @@ class SignUpTemplateComponentModel
); );
} }
if (val.length < 8) {
return FFLocalizations.of(context).getText(
'duq5gpp6' /* A senha deve ter pelo menos 8 ... */,
);
}
return null; return null;
} }

View File

@ -351,8 +351,6 @@ class _SignUpTemplateComponentWidgetState
.containsKey( .containsKey(
'Plus Jakarta Sans'), 'Plus Jakarta Sans'),
), ),
keyboardType:
TextInputType.name,
validator: _model validator: _model
.nameRegisterFormTextControllerValidator .nameRegisterFormTextControllerValidator
.asValidator(context), .asValidator(context),

View File

@ -218,8 +218,7 @@ class _FlutterFlowDropDownState<T> extends State<FlutterFlowDropDown<T>> {
child: Padding( child: Padding(
padding: _useDropdown2() ? horizontalMargin : EdgeInsets.zero, padding: _useDropdown2() ? horizontalMargin : EdgeInsets.zero,
child: Text(optionLabels[option] ?? '', style: widget.textStyle), child: Text(optionLabels[option] ?? '', style: widget.textStyle),
), )),
),
) )
.toList(); .toList();
@ -263,8 +262,7 @@ class _FlutterFlowDropDownState<T> extends State<FlutterFlowDropDown<T>> {
), ),
], ],
), ),
), ));
);
}, },
), ),
), ),
@ -307,8 +305,7 @@ class _FlutterFlowDropDownState<T> extends State<FlutterFlowDropDown<T>> {
: (isMultiSelect ? (_) {} : (val) => widget.controller!.value = val), : (isMultiSelect ? (_) {} : (val) => widget.controller!.value = val),
isExpanded: true, isExpanded: true,
selectedItemBuilder: (context) => widget.options selectedItemBuilder: (context) => widget.options
.map( .map((item) => Align(
(item) => Align(
alignment: AlignmentDirectional.centerStart, alignment: AlignmentDirectional.centerStart,
child: Text( child: Text(
isMultiSelect isMultiSelect
@ -320,8 +317,7 @@ class _FlutterFlowDropDownState<T> extends State<FlutterFlowDropDown<T>> {
style: widget.textStyle, style: widget.textStyle,
maxLines: 1, maxLines: 1,
), ),
), ))
)
.toList(), .toList(),
dropdownSearchData: widget.isSearchable dropdownSearchData: widget.isSearchable
? DropdownSearchData<T>( ? DropdownSearchData<T>(

View File

@ -963,6 +963,10 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
'pt': 'Campo é necessário', 'pt': 'Campo é necessário',
'en': 'Field is required', 'en': 'Field is required',
}, },
'vobnktrz': {
'pt': 'Insira um email valido.',
'en': '',
},
'z0bv6wi2': { 'z0bv6wi2': {
'pt': 'Please choose an option from the dropdown', 'pt': 'Please choose an option from the dropdown',
'en': '', 'en': '',
@ -971,6 +975,10 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
'pt': 'Campo é necessário', 'pt': 'Campo é necessário',
'en': 'Field is required', 'en': 'Field is required',
}, },
'duq5gpp6': {
'pt': 'A senha deve ter pelo menos 8 caracteres.',
'en': '',
},
'rcikqhf1': { 'rcikqhf1': {
'pt': 'Please choose an option from the dropdown', 'pt': 'Please choose an option from the dropdown',
'en': '', 'en': '',