jantunesmessias
/
flutter-freaccess-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajuste de responsividade, do modal e tratamento de erro

This commit is contained in:
Lucas 2024-08-09 11:25:25 -03:00
parent 4681e8a515
commit 5d6f4209d6
5 changed files with 320 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/components/molecular_components/message_opt_modal/opt_modal_widget.dart
View File

@ -1,3 +1,4 @@
import 'dart:ffi';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
@ -7,7 +8,6 @@ import 'package:hub/flutter_flow/flutter_flow_theme.dart';
import 'package:hub/flutter_flow/flutter_flow_util.dart';
import 'package:hub/flutter_flow/internationalization.dart';
class OptModalWidget extends StatefulWidget {
final String defaultPersonType;
final String defaultAccessType;
@ -89,7 +89,8 @@ class _OptModalWidgetState extends State<OptModalWidget> {
Navigator.pop(context, filterResult);
}
Widget _buildCheckboxListTile(String key, List<Map<String, String>> options) {
Widget _buildCheckboxListTile(
String key, List<Map<String, String>> options, double fontsize) {
return Column(
children: [
Row(
@ -97,14 +98,13 @@ class _OptModalWidgetState extends State<OptModalWidget> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding:
const EdgeInsetsDirectional.fromSTEB(0.0, 10.0, 0.0, 0.0),
padding: const EdgeInsetsDirectional.fromSTEB(0.0, 3.0, 0.0, 0.0),
child: Text(
FFLocalizations.of(context).getText('l7tw8b92'),
textAlign: TextAlign
.left, // Adiciona esta linha para alinhar o texto à esquerda
textAlign: TextAlign.left,
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: fontsize,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
@ -115,6 +115,7 @@ class _OptModalWidgetState extends State<OptModalWidget> {
],
),
ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: options.length,
itemBuilder: (context, index) {
@ -125,6 +126,7 @@ class _OptModalWidgetState extends State<OptModalWidget> {
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
letterSpacing: 0.0,
fontSize: fontsize,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
color: FlutterFlowTheme.of(context).primaryText,
@ -148,9 +150,10 @@ class _OptModalWidgetState extends State<OptModalWidget> {
checkboxShape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(100),
),
enableFeedback: true,
side: BorderSide(
width: 10,
width: 5,
color: FlutterFlowTheme.of(context).secondaryText,
),
controlAffinity:
@ -178,14 +181,13 @@ class _OptModalWidgetState extends State<OptModalWidget> {
@override
Widget build(BuildContext context) {
return SafeArea(
child: Align(
alignment: const AlignmentDirectional(1.0, -1.0),
child: Padding(
padding: const EdgeInsetsDirectional.fromSTEB(0.0, 50.0, 50.0, 0.0),
double screenWidth = MediaQuery.of(context).size.width;
double screenHeight = MediaQuery.of(context).size.height;
return Center(
child: Container(
width: 300.0,
height: 450.0,
width: screenWidth * 0.75,
height: screenHeight * 0.70,
decoration: BoxDecoration(
color: FlutterFlowTheme.of(context).primaryBackground,
borderRadius: BorderRadius.circular(24.0),
@ -204,14 +206,14 @@ class _OptModalWidgetState extends State<OptModalWidget> {
child: Text(
FFLocalizations.of(context)
.getText('yfj9pd6k'), // Filtros
style: FlutterFlowTheme.of(context)
.headlineMedium
.override(
style:
FlutterFlowTheme.of(context).headlineMedium.override(
fontFamily: FlutterFlowTheme.of(context)
.headlineMediumFamily,
color: FlutterFlowTheme.of(context).primaryText,
fontSize: 16.0,
fontSize: 18.0,
letterSpacing: 0.0,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context)
.headlineMediumFamily),
@ -221,8 +223,8 @@ class _OptModalWidgetState extends State<OptModalWidget> {
],
),
Padding(
padding: const EdgeInsetsDirectional.fromSTEB(
8.0, 0.0, 8.0, 0.0),
padding:
const EdgeInsetsDirectional.fromSTEB(8.0, 0.0, 8.0, 0.0),
child: TextFormField(
controller: _model.textController,
focusNode: _model.textFieldFocusNode,
@ -231,29 +233,27 @@ class _OptModalWidgetState extends State<OptModalWidget> {
decoration: InputDecoration(
isDense: true,
labelText: FFLocalizations.of(context).getText(
'0enrtljz' /* Pesquise aqui..... */,
'0enrtljz' /* Pesquise aqui... */,
),
labelStyle: FlutterFlowTheme.of(context)
.labelMedium
.override(
fontFamily: FlutterFlowTheme.of(context)
.labelMediumFamily,
fontFamily:
FlutterFlowTheme.of(context).labelMediumFamily,
color: FlutterFlowTheme.of(context).primaryText,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context)
.labelMediumFamily),
FlutterFlowTheme.of(context).labelMediumFamily),
),
hintStyle: FlutterFlowTheme.of(context)
.labelMedium
.override(
fontFamily: FlutterFlowTheme.of(context)
.labelMediumFamily,
fontFamily:
FlutterFlowTheme.of(context).labelMediumFamily,
color: FlutterFlowTheme.of(context).primaryText,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context)
.labelMediumFamily),
FlutterFlowTheme.of(context).labelMediumFamily),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
@ -300,35 +300,34 @@ class _OptModalWidgetState extends State<OptModalWidget> {
_model.textControllerValidator.asValidator(context),
),
),
SingleChildScrollView(
Expanded(
child: SingleChildScrollView(
child: Container(
padding: const EdgeInsets.all(20),
padding: const EdgeInsets.all(10),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
_buildCheckboxListTile(
'personType', personTypeOptions),
_buildCheckboxListTile(
'accessType', accessTypeOptions),
_buildCheckboxListTile('personType', personTypeOptions,
screenHeight * 0.025),
_buildCheckboxListTile('accessType', accessTypeOptions,
screenHeight * 0.025),
],
),
),
),
),
ElevatedButton(
onPressed: _applyFilter,
child:
Text(FFLocalizations.of(context).getText('88kshkph')),
style: ElevatedButton.styleFrom(
foregroundColor: FlutterFlowTheme.of(context).info,
backgroundColor: FlutterFlowTheme.of(context).primary,
),
child: Text(FFLocalizations.of(context).getText('88kshkph')),
),
],
),
),
),
),
),
);
}
}

63
lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart
View File

@ -1,6 +1,8 @@
import 'dart:collection';
import 'dart:developer';
import 'package:auto_size_text/auto_size_text.dart';
import '/flutter_flow/flutter_flow_theme.dart';
import '/flutter_flow/flutter_flow_util.dart';
import 'package:cached_network_image/cached_network_image.dart';
@ -12,8 +14,6 @@ export 'card_item_template_component_model.dart';
///
class CardItemTemplateComponentWidget extends StatefulWidget {
const CardItemTemplateComponentWidget({
super.key,
@ -40,7 +40,9 @@ class _CardItemTemplateComponentWidgetState
LinkedHashMap.from(widget.labelsHashMap ?? {});
List<LinkedHashMap<String, Color>> get statusLinkedHashMap =>
widget.statusHashMap.map((map) => LinkedHashMap<String, Color>.from(map ?? {})).toList();
widget.statusHashMap
.map((map) => LinkedHashMap<String, Color>.from(map ?? {}))
.toList();
@override
void setState(VoidCallback callback) {
@ -71,12 +73,18 @@ class _CardItemTemplateComponentWidgetState
}
}
String truncate(int cutoff, String mytext) {
return (mytext.length <= cutoff)
? mytext
: '${mytext.substring(0, cutoff)}...';
}
@override
Widget build(BuildContext context) {
double screenWidth = MediaQuery.of(context).size.width;
double screenHeight = MediaQuery.of(context).size.height;
context.watch<FFAppState>();
return InkWell(
splashColor: Colors.transparent,
focusColor: Colors.transparent,
@ -123,7 +131,8 @@ class _CardItemTemplateComponentWidgetState
labelsLinkedHashMap.keys.elementAt(index);
String value = labelsLinkedHashMap[key]!;
return Padding(
padding: const EdgeInsets.only(bottom: 5.0),
padding:
const EdgeInsets.fromLTRB(0, 5, 0, 3),
child: Padding(
padding:
const EdgeInsets.fromLTRB(20, 0, 0, 0),
@ -140,7 +149,7 @@ class _CardItemTemplateComponentWidgetState
fontFamily:
FlutterFlowTheme.of(context)
.bodyMediumFamily,
fontSize: 12.5,
fontSize: screenWidth * 0.025,
letterSpacing: 0.0,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts
@ -151,21 +160,23 @@ class _CardItemTemplateComponentWidgetState
.bodyMediumFamily),
color:
FlutterFlowTheme.of(context)
.primaryText,
.customColor6,
),
),
const SizedBox(
width:
5.0), // Espaçamento entre o label e o valor
Text(
value,
truncate(20, value),
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily:
FlutterFlowTheme.of(context)
.bodyMediumFamily,
fontSize: 12.5,
fontSize: screenWidth * 0.030,
letterSpacing: 0.0,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts
@ -183,30 +194,41 @@ class _CardItemTemplateComponentWidgetState
},
),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
Padding(
padding: const EdgeInsets.fromLTRB(20, 0, 0, 0),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: statusLinkedHashMap.expand((linkedHashMap) {
return linkedHashMap.entries.map((MapEntry<String, Color> item) {
children:
statusLinkedHashMap.expand((linkedHashMap) {
return linkedHashMap.entries
.map((MapEntry<String, Color> item) {
return Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 1.0, vertical: 3.0),
padding: const EdgeInsets.symmetric(
horizontal: 1.0, vertical: 3.0),
child: Container(
width: 100.0,
width: screenWidth * 0.20,
height: 27.0,
decoration: BoxDecoration(
color: item.value, // Usa a cor do item atual
borderRadius: BorderRadius.circular(5.0),
color: item
.value, // Usa a cor do item atual
borderRadius:
BorderRadius.circular(5.0),
),
child: Align(
alignment: Alignment.center,
child: Text(
item.key, // Usa a chave do item atual como texto
style: TextStyle(
color: FlutterFlowTheme.of(context).info, // Ajuste conforme necessário
fontSize: screenWidth * 0.03,
color: FlutterFlowTheme.of(
context)
.info, // Ajuste conforme necessário
),
),
),
@ -218,6 +240,7 @@ class _CardItemTemplateComponentWidgetState
}).toList();
}).toList(),
),
),
]),
),
),

4
lib/flutter_flow/internationalization.dart
View File

@ -518,8 +518,8 @@ final kTranslationsMap = <Map<String, Map<String, String>>>[
// optModal
{
'0enrtljz': {
'pt': 'Pesquise aqui.....',
'en': 'Search here.....',
'pt': 'Pesquise aqui...',
'en': 'Search here...',
},
'l7tw8b92': {
'pt': 'Tipo de Pessoa',

1
lib/main.dart
View File

@ -1,4 +1,3 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:hub/app_state.dart';

236
lib/pages/acess_history_page/acess_history_page_widget.dart
View File

@ -19,9 +19,6 @@ import 'package:hub/flutter_flow/internationalization.dart';
import 'package:hub/pages/acess_history_page/acess_history_page_model.dart';
import 'package:rxdart/rxdart.dart';
@immutable
class AcessHistoryPageWidget extends StatefulWidget {
late Map<String, String> opt = {
@ -43,8 +40,8 @@ class AccessHistoryItemWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
return const Padding(
padding: EdgeInsets.all(8.0),
child: Column(),
);
}
@ -66,6 +63,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
@override
void initState() {
super.initState();
_model = createModel(context, () => AcessHistoryPageModel());
log("initState called in _AcessHistoryPageWidgetState");
}
@ -138,22 +136,37 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
return Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 10, 0),
child: IconButton(
icon: const Icon(Icons.filter_list),
padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
onPressed: () async {
final Map<String, String>? selectedFilter =
await showModalBottomSheet<Map<String, String>>(
isScrollControlled: true,
backgroundColor: Colors.transparent,
context: context,
builder: (context) => OptModalWidget(
builder: (context) {
return GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Container(
color: Colors.transparent,
child: GestureDetector(
onTap: () {},
child: OptModalWidget(
defaultAccessType:
selectedTypeSubject.value['accessType'] ?? '.*',
selectedTypeSubject.value['accessType'] ??
'.*',
defaultPersonType:
selectedTypeSubject.value['personType'] ?? '.*',
selectedTypeSubject.value['personType'] ??
'.*',
),
),
),
);
});
if (selectedFilter != null) {
log('Selected Filter: $selectedFilter');
@ -161,6 +174,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
}
},
),
),
],
);
}
@ -227,7 +241,8 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
}
Widget _accessHistoryListOrganismWidget(BuildContext context) {
return SingleChildScrollView(
return Center(
child: SingleChildScrollView(
child: Column(
children: [
StreamBuilder<Map<String, String>>(
@ -242,6 +257,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
),
],
),
),
);
}
@ -253,8 +269,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
log('Response: ${response.jsonBody}');
final List<dynamic> accessHistory = response.jsonBody['acessos'] ?? [];
log('Access History Before Filtering: $accessHistory');
log(
'Filtering for: Person Type - ${select['personType']}, Access Type - ${select['accessType']}, Search - ${select['search']}');
log('Filtering for: Person Type - ${select['personType']}, Access Type - ${select['accessType']}, Search - ${select['search']}');
return accessHistory.where((item) {
final personTypeMatches = select['personType'] == '.*' ||
@ -272,8 +287,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
}
Widget _cardListViewOrganismWidget(Map<String, String> selected) {
log(
'Selected types in Card: ${selected['personType']}, ${selected['accessType']}');
log('Selected types in Card: ${selected['personType']}, ${selected['accessType']}');
log('_buildAccessHistoryList called');
return FutureBuilder<List<dynamic>>(
future: fetchCardListViewService(selected),
@ -290,8 +304,18 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
),
),
);
} else if (snapshot.hasData && snapshot.data!.isEmpty) {
return Center(
child: Text(FFLocalizations.of(context).getVariableText(
ptText: "Nenhum histórico encontrado!",
enText: "No history found!")),
);
} else if (snapshot.hasError) {
return Text('Error: ${snapshot.error}');
return Center(
child: Text(FFLocalizations.of(context).getVariableText(
ptText: "Falha ao efetuar operação!",
enText: "Failed to perform operation!")),
);
} else {
final accessHistory = snapshot.data!;
log('Access History: $accessHistory');
@ -301,8 +325,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
itemCount: accessHistory.length,
itemBuilder: (context, index) {
final accessHistoryItem = accessHistory[index];
log(
'Access History Item: ${accessHistoryItem['PES_TIPO']}');
log('Access History Item: ${accessHistoryItem['PES_TIPO']}');
return _accessHistoryCardMoleculeWidget(
context, accessHistoryItem);
},
@ -371,183 +394,6 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget> {
}
}
Widget _cardHeaderAtomWidget(BuildContext context, String urlImagem,
String tipoPessoa, Color corFundoTipo, accessHistoryItem) {
return Row(
mainAxisSize: MainAxisSize.max,
children: [
Padding(
padding: const EdgeInsets.all(10.0),
child: ClipRRect(
borderRadius: BorderRadius.circular(100.0),
child: Image.network(
urlImagem,
width: 60.0,
height: 60.0,
fit: BoxFit.cover,
),
),
),
Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
getJsonField(
accessHistoryItem,
r'''$.PES_NOME''',
).toString(),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
Container(
width: 100.0,
height: 25.0,
decoration: BoxDecoration(
color: (() {
// Extrai o valor de PES_TIPO, converte para String, remove espaços em branco e aspas
final pesTipo =
jsonToStr(getJsonField(
accessHistoryItem,
r'''$.PES_TIPO''',
))
.trim()
.replaceAll('"', ''); // Remove aspas
// Debug: Imprime o valor de PES_TIPO ajustado
log('PES_TIPO FOR COLORING: $pesTipo');
// Retorna a cor baseada na condição ajustada
return pesTipo == 'E'
? FlutterFlowTheme.of(context).warning
: FlutterFlowTheme.of(context).primary;
})(),
borderRadius: BorderRadius.circular(24.0),
),
child: Align(
alignment: const AlignmentDirectional(0.0, 0.0),
child: Text(
getJsonField(
accessHistoryItem,
r'''$.PES_TIPO''',
).toString() ==
'E'
? FFLocalizations.of(context).getText(
'zok7lu4w',
)
: FFLocalizations.of(context).getText(
'oonqk812',
),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: FlutterFlowTheme.of(context).bodyMediumFamily,
color: FlutterFlowTheme.of(context).info,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
),
),
],
),
]
.divide(const SizedBox(width: 20.0))
.addToStart(const SizedBox(width: 5.0))
.addToEnd(const SizedBox(width: 5.0)),
);
}
Widget _cardDetailsMoleculeWidget(
BuildContext context, dynamic accessHistoryItem) {
return Row(
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
FFLocalizations.of(context).getText(
'2odgr6hg',
),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: 12.5,
letterSpacing: 0.0,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
Text(
getJsonField(
accessHistoryItem,
r'''$.ACE_DATAHORA''',
).toString(),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: 12.5,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
].addToStart(const SizedBox(width: 10.0)),
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
FFLocalizations.of(context).getText(
'zrde3fke',
),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: 12.5,
letterSpacing: 0.0,
fontWeight: FontWeight.bold,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
Text(
getJsonField(
accessHistoryItem,
r'''$.ACI_DESCRICAO''',
).toString(),
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily,
fontSize: 12.5,
letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context).bodyMediumFamily),
),
),
].addToStart(const SizedBox(width: 10.0)),
),
].divide(const SizedBox(height: 3.0)),
),
),
]
.addToStart(const SizedBox(width: 5.0))
.addToEnd(const SizedBox(width: 5.0)),
);
}
String imageUrlAtomWidget(String document, String type) {
return valueOrDefault<String>(
"https://freaccess.com.br/freaccess/getImage.php?&cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=$document&tipo=$type",