Merge pull request #24 from FRE-Informatica/bugfix-relayout/fd-600

FIX: Ajuste no Switch de visita única e na formatação do Datetimepicker
This commit is contained in:
Ivan Antunes 2024-08-21 13:57:35 -03:00 committed by GitHub
commit 34d9524e35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 43 additions and 30 deletions

View File

@ -137,6 +137,9 @@ PODS:
- Flutter - Flutter
- flutter_secure_storage (6.0.0): - flutter_secure_storage (6.0.0):
- Flutter - Flutter
- fluttertoast (0.0.2):
- Flutter
- Toast
- GoogleAppMeasurement (10.27.0): - GoogleAppMeasurement (10.27.0):
- GoogleAppMeasurement/AdIdSupport (= 10.27.0) - GoogleAppMeasurement/AdIdSupport (= 10.27.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
@ -219,6 +222,7 @@ PODS:
- Flutter - Flutter
- FlutterMacOS - FlutterMacOS
- SwiftyGif (5.4.5) - SwiftyGif (5.4.5)
- Toast (4.1.1)
- url_launcher_ios (0.0.1): - url_launcher_ios (0.0.1):
- Flutter - Flutter
- video_player_avfoundation (0.0.1): - video_player_avfoundation (0.0.1):
@ -239,6 +243,7 @@ DEPENDENCIES:
- flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`) - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@ -273,6 +278,7 @@ SPEC REPOS:
- PromisesSwift - PromisesSwift
- SDWebImage - SDWebImage
- SwiftyGif - SwiftyGif
- Toast
EXTERNAL SOURCES: EXTERNAL SOURCES:
connectivity_plus: connectivity_plus:
@ -297,6 +303,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_local_notifications/ios" :path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_secure_storage: flutter_secure_storage:
:path: ".symlinks/plugins/flutter_secure_storage/ios" :path: ".symlinks/plugins/flutter_secure_storage/ios"
fluttertoast:
:path: ".symlinks/plugins/fluttertoast/ios"
image_picker_ios: image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios" :path: ".symlinks/plugins/image_picker_ios/ios"
local_auth_darwin: local_auth_darwin:
@ -342,6 +350,7 @@ SPEC CHECKSUMS:
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0 flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12 flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
GoogleAppMeasurement: f65fc137531af9ad647f1c0a42f3b6a4d3a98049 GoogleAppMeasurement: f65fc137531af9ad647f1c0a42f3b6a4d3a98049
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
@ -358,10 +367,11 @@ SPEC CHECKSUMS:
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
PODFILE CHECKSUM: d7f4d1b71f8c708247c1078c4aec33a28c763405 PODFILE CHECKSUM: d7f4d1b71f8c708247c1078c4aec33a28c763405
COCOAPODS: 1.15.2 COCOAPODS: 1.14.3

View File

@ -87,41 +87,41 @@ class _VisitorNotFoundComponentWidgetState
), ),
Padding( Padding(
padding: padding:
const EdgeInsetsDirectional.fromSTEB(0.0, 16.0, 0.0, 0.0), const EdgeInsetsDirectional.fromSTEB(5.0, 16.0, 5.0, 10.0),
child: Text( child: Text(
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'1p9mykbj' /* Usuário não encontrado */, '1p9mykbj' /* Usuário não encontrado */,
), ),
style: FlutterFlowTheme.of(context).headlineMedium.override( textAlign: TextAlign.center,
style: FlutterFlowTheme.of(context).headlineSmall.override(
fontFamily: fontFamily:
FlutterFlowTheme.of(context).headlineMediumFamily, FlutterFlowTheme.of(context).headlineSmallFamily,
letterSpacing: 0.0, letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).headlineMediumFamily), FlutterFlowTheme.of(context).headlineSmallFamily),
), ),
), ),
), ),
Padding( Padding(
padding: padding: const EdgeInsetsDirectional.fromSTEB(10, 0, 10, 10),
const EdgeInsetsDirectional.fromSTEB(20.0, 4.0, 20.0, 0.0),
child: Text( child: Text(
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'kt937sp6' /* O documento inserido não corre... */, 'kt937sp6' /* O documento inserido não corre... */,
), ),
style: FlutterFlowTheme.of(context).labelMedium.override( textAlign: TextAlign.center,
fontFamily: style: FlutterFlowTheme.of(context).labelSmall.override(
FlutterFlowTheme.of(context).labelMediumFamily, fontFamily: FlutterFlowTheme.of(context).labelSmallFamily,
color: FlutterFlowTheme.of(context).primaryText, color: FlutterFlowTheme.of(context).primaryText,
fontSize: 14.0, fontSize: 14.0,
letterSpacing: 0.0, letterSpacing: 0.0,
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).labelMediumFamily), FlutterFlowTheme.of(context).labelSmallFamily),
), ),
), ),
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 15),
child: Align( child: Align(
alignment: const AlignmentDirectional(0.0, 1.0), alignment: const AlignmentDirectional(0.0, 1.0),
child: FFButtonWidget( child: FFButtonWidget(
@ -157,13 +157,13 @@ class _VisitorNotFoundComponentWidgetState
iconPadding: const EdgeInsetsDirectional.fromSTEB( iconPadding: const EdgeInsetsDirectional.fromSTEB(
0.0, 0.0, 0.0, 0.0), 0.0, 0.0, 0.0, 0.0),
color: FlutterFlowTheme.of(context).primary, color: FlutterFlowTheme.of(context).primary,
textStyle: FlutterFlowTheme.of(context).titleSmall.override( textStyle: FlutterFlowTheme.of(context).labelSmall.override(
fontFamily: fontFamily:
FlutterFlowTheme.of(context).titleSmallFamily, FlutterFlowTheme.of(context).labelSmallFamily,
color: Colors.white, color: Colors.white,
letterSpacing: 0.0, letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).titleSmallFamily), FlutterFlowTheme.of(context).labelSmallFamily),
), ),
elevation: 3.0, elevation: 3.0,
borderSide: const BorderSide( borderSide: const BorderSide(
@ -171,10 +171,10 @@ class _VisitorNotFoundComponentWidgetState
width: 1.0, width: 1.0,
), ),
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
bottomLeft: Radius.circular(25.0), bottomLeft: Radius.circular(10.0),
bottomRight: Radius.circular(25.0), bottomRight: Radius.circular(10.0),
topLeft: Radius.circular(25.0), topLeft: Radius.circular(10.0),
topRight: Radius.circular(25.0), topRight: Radius.circular(10.0),
), ),
), ),
), ),

View File

@ -1,6 +1,7 @@
import 'dart:developer'; import 'dart:developer';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:hub/backend/api_requests/api_calls.dart'; import 'package:hub/backend/api_requests/api_calls.dart';
import 'package:hub/components/atomic_components/shared_components_atoms/toast.dart'; import 'package:hub/components/atomic_components/shared_components_atoms/toast.dart';
import 'package:hub/components/molecular_components/visitor_not_found_component/visitor_not_found_component_widget.dart'; import 'package:hub/components/molecular_components/visitor_not_found_component/visitor_not_found_component_widget.dart';
@ -103,7 +104,7 @@ class _VisitorSearchModalTemplateComponentWidgetState
textInputAction: TextInputAction.done, textInputAction: TextInputAction.done,
obscureText: false, obscureText: false,
decoration: InputDecoration( decoration: InputDecoration(
isDense: false, isDense: true,
labelText: FFLocalizations.of(context).getText( labelText: FFLocalizations.of(context).getText(
'cjlpru1m' /* Procure pelo documento do visi... */, 'cjlpru1m' /* Procure pelo documento do visi... */,
), ),
@ -176,7 +177,8 @@ class _VisitorSearchModalTemplateComponentWidgetState
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily), FlutterFlowTheme.of(context).bodyMediumFamily),
), ),
keyboardType: TextInputType.number, keyboardType:
const TextInputType.numberWithOptions(signed: true),
validator: _model.textControllerValidator.asValidator(context), validator: _model.textControllerValidator.asValidator(context),
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.allow(RegExp('[0-9]')), FilteringTextInputFormatter.allow(RegExp('[0-9]')),
@ -417,7 +419,7 @@ class _VisitorSearchModalTemplateComponentWidgetState
], ],
), ),
const SizedBox( const SizedBox(
height: 20.0, height: 30.0,
) )
], ],
), ),
@ -472,7 +474,9 @@ class _VisitorSearchModalTemplateComponentWidgetState
ToastUtil.showToast( ToastUtil.showToast(
message: FFLocalizations.of(context).getVariableText( message: FFLocalizations.of(context).getVariableText(
ptText: 'Visitante já adicionado!', ptText: 'Visitante já adicionado!',
enText: 'Visitor already added!')); enText: 'Visitor already added!'),
gravity: ToastGravity.TOP,
backgroundColor: Colors.red);
} }
} else { } else {
await showAdaptiveDialog( await showAdaptiveDialog(

View File

@ -690,8 +690,8 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
// visitorNotFoundComponent // visitorNotFoundComponent
{ {
'1p9mykbj': { '1p9mykbj': {
'pt': 'Usuário não encontrado', 'pt': 'Usuário Não Encontrado',
'en': 'User not found', 'en': 'User Not Found',
}, },
'kt937sp6': { 'kt937sp6': {
'pt': 'pt':

View File

@ -33,7 +33,7 @@ class ScheduleCompleteVisitPageModel
String convertDateFormat(String dateStr) { String convertDateFormat(String dateStr) {
try { try {
// Formato original // Formato original
DateFormat originalFormat = DateFormat('d/M/y H:mm:ss'); DateFormat originalFormat = DateFormat('dd/MM/yyyy HH:mm:ss');
// Novo formato // Novo formato
DateFormat newFormat = DateFormat('y-M-d H:mm:ss'); DateFormat newFormat = DateFormat('y-M-d H:mm:ss');
@ -197,7 +197,7 @@ class ScheduleCompleteVisitPageModel
textFieldFocusNode1 = FocusNode(); textFieldFocusNode1 = FocusNode();
textController1 = TextEditingController( textController1 = TextEditingController(
text: dateTimeFormat( text: dateTimeFormat(
'd/M/y H:mm:ss', 'dd/MM/yyyy HH:mm:ss',
DateTime.now().add(const Duration(minutes: 10)), DateTime.now().add(const Duration(minutes: 10)),
// locale: FFLocalizations.of(context).languageCode, // locale: FFLocalizations.of(context).languageCode,
)); ));
@ -206,7 +206,7 @@ class ScheduleCompleteVisitPageModel
textFieldFocusNode2 = FocusNode(); textFieldFocusNode2 = FocusNode();
textController2 = TextEditingController( textController2 = TextEditingController(
text: dateTimeFormat( text: dateTimeFormat(
'd/M/y H:mm:ss', 'dd/MM/yyyy HH:mm:ss',
DateTime.now().add(const Duration(days: 1)), DateTime.now().add(const Duration(days: 1)),
// locale: FFLocalizations.of(context).languageCode, // locale: FFLocalizations.of(context).languageCode,
)); ));

View File

@ -1435,12 +1435,11 @@ Widget scheduleVisit(BuildContext context,
), ),
), ),
), ),
Switch.adaptive( Switch(
value: _model.switchValue!, value: _model.switchValue!,
onChanged: (newValue) async { onChanged: (newValue) async {
safeSetState(() => _model.switchValue = newValue); safeSetState(() => _model.switchValue = newValue);
}, },
applyCupertinoTheme: false,
focusColor: FlutterFlowTheme.of(context).primary, focusColor: FlutterFlowTheme.of(context).primary,
trackColor: WidgetStateProperty.resolveWith( trackColor: WidgetStateProperty.resolveWith(
(states) { (states) {