From 768dd3a7aed94f34fbcbe5b4e64ab2d9b1dcc052 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 15:31:20 -0300 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20responsividade=20dos=20bot=C3=B5es?= =?UTF-8?q?=20do=20pet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details_component_widget.dart | 1 + .../liberation_history_widget.dart | 73 ++++++++++--------- lib/pages/pets_page/pets_page_model.dart | 2 - 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/lib/components/templates_components/details_component/details_component_widget.dart b/lib/components/templates_components/details_component/details_component_widget.dart index a598eb13..2034458c 100644 --- a/lib/components/templates_components/details_component/details_component_widget.dart +++ b/lib/components/templates_components/details_component/details_component_widget.dart @@ -242,6 +242,7 @@ class _DetailsComponentWidgetState extends State { if (widget.buttons.isNotEmpty) // Adicione este SizedBox com a altura desejada OverflowBar( overflowAlignment: OverflowBarAlignment.center, + alignment: MainAxisAlignment.center, overflowSpacing: 2, spacing: 2, // mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/pages/liberation_history/liberation_history_widget.dart b/lib/pages/liberation_history/liberation_history_widget.dart index 8f688a59..2b39c940 100644 --- a/lib/pages/liberation_history/liberation_history_widget.dart +++ b/lib/pages/liberation_history/liberation_history_widget.dart @@ -12,6 +12,7 @@ import 'package:hub/pages/liberation_history/liberation_history_model.dart'; import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/limited_text_size.dart'; import 'package:hub/shared/utils/log_util.dart'; +import 'package:hub/shared/utils/snackbar_util.dart'; import 'package:hub/shared/utils/validator_util.dart'; class LiberationHistoryWidget extends StatefulWidget { @@ -219,7 +220,7 @@ class _LiberationHistoryWidgetState extends State { ), icon: const Icon(Icons.done), onPressed: () async { - _model.answersRequest + await _model.answersRequest .call( context: context, ref: liberationHistoryItem['NOT_ID'].toString(), @@ -229,26 +230,31 @@ class _LiberationHistoryWidgetState extends State { ) .then((value) { if (value) { - showSnackbar( - context, - FFLocalizations.of(context).getVariableText( - enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), - false); - } else { - showSnackbar( - context, - FFLocalizations.of(context).getVariableText( - enText: 'Error resolving visit', ptText: 'Erro ao resolver visita'), - true); - } - }).whenComplete(() { - safeSetState(() { - _requestWrap = []; - _requestFuture = _fetchRequests(); - }); + safeSetState(() { + _requestWrap = []; + _requestFuture = _fetchRequests(); + }); - context.pop(); - }); + context.pop(); + SnackBarUtil.showSnackBar( + context, + FFLocalizations.of(context).getVariableText( + enText: 'Successfully resolved visit', + ptText: 'Visita resolvida com sucesso', + ), + isError: false, + ); + } else { + SnackBarUtil.showSnackBar( + context, + FFLocalizations.of(context).getVariableText( + enText: 'Error resolving visit', + ptText: 'Erro ao resolver visita', + ), + isError: true, + ); + } + }).whenComplete(() {}); }, ), if (liberationHistoryItem['NOT_STATUS'] == 'S') @@ -268,7 +274,7 @@ class _LiberationHistoryWidgetState extends State { ), icon: const Icon(Icons.close), onPressed: () async { - return _model.answersRequest + await _model.answersRequest .call( context: context, ref: liberationHistoryItem['NOT_ID'].toString(), @@ -277,23 +283,24 @@ class _LiberationHistoryWidgetState extends State { id: liberationHistoryItem['VTE_ID'].toString(), ) .then((message) { - if (message.isEmpty) { - showSnackbar( - context, - FFLocalizations.of(context).getVariableText( - enText: 'Successfully resolved visit', ptText: 'Visita resolvida com sucesso'), - false); - } else { - showSnackbar(context, message, true); - } - safeSetState(() { _requestWrap = []; _requestFuture = _fetchRequests(); }); - context.pop(); - }); + if (message == null || message == '') { + showSnackbar( + context, + FFLocalizations.of(context).getVariableText( + enText: 'Successfully resolved visit', + ptText: 'Visita resolvida com sucesso', + ), + false, + ); + } else { + showSnackbar(context, message, true); + } + }).whenComplete(() {}); }, ) ], diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart index 4e62dbfd..d0e5b3f5 100644 --- a/lib/pages/pets_page/pets_page_model.dart +++ b/lib/pages/pets_page/pets_page_model.dart @@ -411,7 +411,6 @@ class PetsPageModel extends FlutterFlowModel { // model.safeSetState!(); }, options: FFButtonOptions( - width: 100, height: 40, color: FlutterFlowTheme.of(context).primaryBackground, elevation: 0, @@ -489,7 +488,6 @@ class PetsPageModel extends FlutterFlowModel { }); }, options: FFButtonOptions( - width: 100, height: 40, color: FlutterFlowTheme.of(context).primaryBackground, elevation: 0, From f5c1edcf6c759ca367243861c0db73cef2a0a4a5 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Tue, 12 Nov 2024 15:36:39 -0300 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20exibi=C3=A7=C3=A3o=20da=20snackbar?= =?UTF-8?q?=20e=20atualiza=C3=A7=C3=A3o=20da=20libera=C3=A7=C3=A3o=20ap?= =?UTF-8?q?=C3=B3s=20resolu=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liberation_history_widget.dart | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/lib/pages/liberation_history/liberation_history_widget.dart b/lib/pages/liberation_history/liberation_history_widget.dart index 2b39c940..4eba3c0a 100644 --- a/lib/pages/liberation_history/liberation_history_widget.dart +++ b/lib/pages/liberation_history/liberation_history_widget.dart @@ -230,12 +230,6 @@ class _LiberationHistoryWidgetState extends State { ) .then((value) { if (value) { - safeSetState(() { - _requestWrap = []; - _requestFuture = _fetchRequests(); - }); - - context.pop(); SnackBarUtil.showSnackBar( context, FFLocalizations.of(context).getVariableText( @@ -254,7 +248,14 @@ class _LiberationHistoryWidgetState extends State { isError: true, ); } - }).whenComplete(() {}); + }).whenComplete(() { + safeSetState(() { + _requestWrap = []; + _requestFuture = _fetchRequests(); + }); + + context.pop(); + }); }, ), if (liberationHistoryItem['NOT_STATUS'] == 'S') @@ -283,12 +284,7 @@ class _LiberationHistoryWidgetState extends State { id: liberationHistoryItem['VTE_ID'].toString(), ) .then((message) { - safeSetState(() { - _requestWrap = []; - _requestFuture = _fetchRequests(); - }); - context.pop(); - if (message == null || message == '') { + if (message != null || message != '') { showSnackbar( context, FFLocalizations.of(context).getVariableText( @@ -300,7 +296,13 @@ class _LiberationHistoryWidgetState extends State { } else { showSnackbar(context, message, true); } - }).whenComplete(() {}); + }).whenComplete(() { + safeSetState(() { + _requestWrap = []; + _requestFuture = _fetchRequests(); + }); + context.pop(); + }); }, ) ],