From b094117d5485ab73c71de6acf1112f3a385d9f6b Mon Sep 17 00:00:00 2001 From: FlutterFlow <140657486+FlutterFlowEng@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:59:12 +0000 Subject: [PATCH] fix scrollable column in liberation history page --- ios/Runner.xcodeproj/project.pbxproj | 8 +- .../liberation_history_widget.dart | 730 +++++++++--------- 2 files changed, 373 insertions(+), 365 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ef11715c..e7dc6083 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -44,8 +44,8 @@ 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 6436409F27A31CDD00820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = ""; }; - 6436409827A31CDC00820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 6436409E27A31CDF00820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = ""; }; + 6436409F27A31CD200820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -225,8 +225,8 @@ 6436409C27A31CD800820AF7 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 6436409F27A31CDD00820AF7 /* pt */, - 6436409827A31CDC00820AF7 /* en */, + 6436409E27A31CDF00820AF7 /* pt */, + 6436409F27A31CD200820AF7 /* en */, ); name = InfoPlist.strings; sourceTree = ""; diff --git a/lib/pages/liberation_history/liberation_history_widget.dart b/lib/pages/liberation_history/liberation_history_widget.dart index a2391b02..97036955 100644 --- a/lib/pages/liberation_history/liberation_history_widget.dart +++ b/lib/pages/liberation_history/liberation_history_widget.dart @@ -208,97 +208,132 @@ class _LiberationHistoryWidgetState extends State { ), ); } - final wrapGetLiberationsResponse = snapshot.data!; + final columnGetLiberationsResponse = snapshot.data!; return Builder( builder: (context) { final liberationHistory = PhpGroup.getLiberationsCall .rqList( - wrapGetLiberationsResponse.jsonBody, + columnGetLiberationsResponse.jsonBody, ) ?.toList() ?? []; - return Wrap( - spacing: 2.0, - runSpacing: 1.0, - alignment: WrapAlignment.start, - crossAxisAlignment: WrapCrossAlignment.start, - direction: Axis.horizontal, - runAlignment: WrapAlignment.start, - verticalDirection: VerticalDirection.down, - clipBehavior: Clip.none, - children: List.generate(liberationHistory.length, - (liberationHistoryIndex) { - final liberationHistoryItem = - liberationHistory[liberationHistoryIndex]; - return Align( - alignment: const AlignmentDirectional(0.0, 0.0), - child: Card( - clipBehavior: Clip.antiAliasWithSaveLayer, - color: FlutterFlowTheme.of(context) - .secondaryBackground, - elevation: 5.0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8.0), - ), - child: Container( - width: 350.0, - height: 115.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, + return SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + children: List.generate(liberationHistory.length, + (liberationHistoryIndex) { + final liberationHistoryItem = + liberationHistory[liberationHistoryIndex]; + return Align( + alignment: const AlignmentDirectional(0.0, 0.0), + child: Card( + clipBehavior: Clip.antiAliasWithSaveLayer, + color: FlutterFlowTheme.of(context) + .secondaryBackground, + elevation: 5.0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8.0), ), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: - const EdgeInsetsDirectional.fromSTEB( - 0.0, 0.0, 10.0, 0.0), - child: ClipRRect( - borderRadius: - BorderRadius.circular(100.0), - child: CachedNetworkImage( - fadeInDuration: - const Duration(milliseconds: 500), - fadeOutDuration: - const Duration(milliseconds: 500), - imageUrl: valueOrDefault( - 'https://freaccess.com.br/freaccess/getImage.php?&cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${getJsonField( - liberationHistoryItem, - r'''$.VTE_ID''', - ).toString()}&tipo=E', - 'https://storage.googleapis.com/flutterflow-io-6f20.appspot.com/projects/flutter-freaccess-hub-0xgz9q/assets/7ftdetkzc3s0/360_F_64676383_LdbmhiNM6Ypzb3FM4PPuFP9rHe7ri8Ju.jpg', + child: Container( + width: 350.0, + height: 115.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .secondaryBackground, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: + const EdgeInsetsDirectional.fromSTEB( + 0.0, 0.0, 10.0, 0.0), + child: ClipRRect( + borderRadius: + BorderRadius.circular(100.0), + child: CachedNetworkImage( + fadeInDuration: + const Duration(milliseconds: 500), + fadeOutDuration: + const Duration(milliseconds: 500), + imageUrl: + valueOrDefault( + 'https://freaccess.com.br/freaccess/getImage.php?&cliID=${FFAppState().cliUUID}&atividade=getFoto&Documento=${getJsonField( + liberationHistoryItem, + r'''$.VTE_ID''', + ).toString()}&tipo=E', + 'https://storage.googleapis.com/flutterflow-io-6f20.appspot.com/projects/flutter-freaccess-hub-0xgz9q/assets/7ftdetkzc3s0/360_F_64676383_LdbmhiNM6Ypzb3FM4PPuFP9rHe7ri8Ju.jpg', + ), + width: 80.0, + fit: BoxFit.cover, ), - width: 80.0, - fit: BoxFit.cover, ), ), - ), - Expanded( - child: Container( - width: 100.0, - height: 100.0, - decoration: const BoxDecoration(), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Align( - alignment: - const AlignmentDirectional( - -1.0, -1.0), - child: Text( - getJsonField( - liberationHistoryItem, - r'''$.VTE_NOME''', - ).toString(), + Expanded( + child: Container( + width: 100.0, + height: 100.0, + decoration: const BoxDecoration(), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Row( + mainAxisSize: + MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment + .center, + children: [ + Align( + alignment: + const AlignmentDirectional( + -1.0, -1.0), + child: Text( + getJsonField( + liberationHistoryItem, + r'''$.VTE_NOME''', + ).toString(), + 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), + ), + ), + ), + ] + .addToStart(const SizedBox( + width: 10.0)) + .addToEnd(const SizedBox( + width: 10.0)), + ), + Row( + mainAxisSize: + MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.start, + children: [ + Text( + FFLocalizations.of( + context) + .getText( + 'dkzewokx' /* Date: */, + ), style: FlutterFlowTheme.of( context) @@ -321,304 +356,277 @@ class _LiberationHistoryWidgetState extends State { .bodyMediumFamily), ), ), - ), - ] - .addToStart( - const SizedBox(width: 10.0)) - .addToEnd(const SizedBox( - width: 10.0)), - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - Text( - FFLocalizations.of( - context) - .getText( - 'dkzewokx' /* Date: */, + Text( + (functions.jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.NOT_STATUS''', + )) == + '\"L\"' + ? getJsonField( + liberationHistoryItem, + r'''$.NOT_DTRESPOSTA''', + ) + : getJsonField( + liberationHistoryItem, + r'''$.NOT_DTENVIO''', + )) + .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), + ), ), - style: - FlutterFlowTheme.of( - context) - .bodyMedium - .override( - fontFamily: FlutterFlowTheme.of( + ] + .divide(const SizedBox( + width: 10.0)) + .addToStart(const SizedBox( + width: 10.0)), + ), + Row( + mainAxisSize: + MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.start, + children: [ + Text( + FFLocalizations.of( + context) + .getText( + '2s9avwbq' /* Motivo: */, + ), + 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( + liberationHistoryItem, + r'''$.NOT_MOTIVO''', + ).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), + ), + ), + ] + .divide(const SizedBox( + width: 10.0)) + .addToStart(const SizedBox( + width: 10.0)), + ), + Align( + alignment: + const AlignmentDirectional( + -1.0, 0.0), + child: Padding( + padding: + const EdgeInsetsDirectional + .fromSTEB( + 10.0, + 0.0, + 0.0, + 0.0), + child: Container( + width: 200.0, + height: 27.0, + decoration: + BoxDecoration( + color: valueOrDefault< + Color>( + () { + if (functions + .jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.VAW_STATUS''', + )) == + '\"L\"') { + return FlutterFlowTheme.of( context) - .bodyMediumFamily, - fontSize: 12.5, - letterSpacing: - 0.0, - fontWeight: - FontWeight - .bold, - useGoogleFonts: GoogleFonts - .asMap() - .containsKey( - FlutterFlowTheme.of(context) - .bodyMediumFamily), - ), - ), - Text( - (functions.jsonToStr( - getJsonField( + .success; + } else if (functions + .jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.VAW_STATUS''', + )) == + '\"B\"') { + return FlutterFlowTheme.of( + context) + .error; + } else if (functions + .jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.VAW_STATUS''', + )) == + '\"S\"') { + return FlutterFlowTheme.of( + context) + .warning; + } else { + return FlutterFlowTheme.of( + context) + .primary; + } + }(), + FlutterFlowTheme.of( + context) + .primary, + ), + borderRadius: + BorderRadius + .circular( + 5.0), + ), + child: Align( + alignment: + const AlignmentDirectional( + 0.0, 0.0), + child: Text( + '${FFLocalizations.of(context).getVariableText( + ptText: + 'Liberação', + enText: + 'Liberation', + )}${() { + if (functions + .jsonToStr( + getJsonField( liberationHistoryItem, r'''$.NOT_STATUS''', )) == - '\"L\"' - ? getJsonField( - liberationHistoryItem, - r'''$.NOT_DTRESPOSTA''', - ) - : getJsonField( - liberationHistoryItem, - r'''$.NOT_DTENVIO''', - )) - .toString(), - style: - FlutterFlowTheme.of( - context) - .bodyMedium - .override( - fontFamily: FlutterFlowTheme.of( + '\"L\"') { + return FFLocalizations.of( context) - .bodyMediumFamily, - fontSize: 12.5, - letterSpacing: - 0.0, - useGoogleFonts: GoogleFonts - .asMap() - .containsKey( - FlutterFlowTheme.of(context) - .bodyMediumFamily), - ), - ), - ] - .divide( - const SizedBox(width: 10.0)) - .addToStart(const SizedBox( - width: 10.0)), - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - Text( - FFLocalizations.of( - context) - .getText( - '2s9avwbq' /* Motivo: */, - ), - style: - FlutterFlowTheme.of( - context) - .bodyMedium - .override( - fontFamily: FlutterFlowTheme.of( + .getVariableText( + ptText: + 'Ativa', + enText: + 'Active', + ); + } else if (functions + .jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.NOT_STATUS''', + )) == + '\"B\"') { + return FFLocalizations.of( context) - .bodyMediumFamily, - fontSize: 12.5, - letterSpacing: - 0.0, - fontWeight: - FontWeight - .bold, - useGoogleFonts: GoogleFonts - .asMap() - .containsKey( - FlutterFlowTheme.of(context) - .bodyMediumFamily), - ), - ), - Text( - getJsonField( - liberationHistoryItem, - r'''$.NOT_MOTIVO''', - ).toString(), - style: - FlutterFlowTheme.of( - context) - .bodyMedium - .override( - fontFamily: FlutterFlowTheme.of( + .getVariableText( + ptText: + 'Bloqueada', + enText: + 'Blocked', + ); + } else if (functions + .jsonToStr( + getJsonField( + liberationHistoryItem, + r'''$.NOT_STATUS''', + )) == + '\"S\"') { + return FFLocalizations.of( context) - .bodyMediumFamily, - fontSize: 12.5, - letterSpacing: - 0.0, - useGoogleFonts: GoogleFonts - .asMap() - .containsKey( - FlutterFlowTheme.of(context) - .bodyMediumFamily), - ), - ), - ] - .divide( - const SizedBox(width: 10.0)) - .addToStart(const SizedBox( - width: 10.0)), - ), - Align( - alignment: - const AlignmentDirectional( - -1.0, 0.0), - child: Padding( - padding: - const EdgeInsetsDirectional - .fromSTEB(10.0, 0.0, - 0.0, 0.0), - child: Container( - width: 200.0, - height: 27.0, - decoration: BoxDecoration( - color: valueOrDefault< - Color>( - () { - if (functions.jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.VAW_STATUS''', - )) == - '\"L\"') { - return FlutterFlowTheme - .of(context) - .success; - } else if (functions - .jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.VAW_STATUS''', - )) == - '\"B\"') { - return FlutterFlowTheme - .of(context) - .error; - } else if (functions - .jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.VAW_STATUS''', - )) == - '\"S\"') { - return FlutterFlowTheme - .of(context) - .warning; - } else { - return FlutterFlowTheme - .of(context) - .primary; - } - }(), - FlutterFlowTheme.of( - context) - .primary, - ), - borderRadius: - BorderRadius - .circular(5.0), - ), - child: Align( - alignment: - const AlignmentDirectional( - 0.0, 0.0), - child: Text( - '${FFLocalizations.of(context).getVariableText( - ptText: 'Liberação', - enText: - 'Liberation', - )}${() { - if (functions.jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.NOT_STATUS''', - )) == - '\"L\"') { - return FFLocalizations - .of(context) - .getVariableText( - ptText: 'Ativa', - enText: - 'Active', - ); - } else if (functions - .jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.NOT_STATUS''', - )) == - '\"B\"') { - return FFLocalizations - .of(context) - .getVariableText( - ptText: - 'Bloqueada', - enText: - 'Blocked', - ); - } else if (functions - .jsonToStr( - getJsonField( - liberationHistoryItem, - r'''$.NOT_STATUS''', - )) == - '\"S\"') { - return FFLocalizations - .of(context) - .getVariableText( - ptText: - 'Pendente', - enText: - 'Warning', - ); - } else { - return FFLocalizations - .of(context) - .getVariableText( - ptText: - 'Desconhecida', - enText: - 'Unknow', - ); - } - }()}', - style: FlutterFlowTheme - .of(context) - .bodyMedium - .override( - fontFamily: FlutterFlowTheme.of( + .getVariableText( + ptText: + 'Pendente', + enText: + 'Warning', + ); + } else { + return FFLocalizations.of( context) - .bodyMediumFamily, - color: FlutterFlowTheme.of( - context) - .info, - letterSpacing: - 0.0, - useGoogleFonts: GoogleFonts - .asMap() - .containsKey( - FlutterFlowTheme.of(context) - .bodyMediumFamily), - ), + .getVariableText( + ptText: + 'Desconhecida', + enText: + 'Unknow', + ); + } + }()}', + 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(height: 3.0)), + ].divide(const SizedBox(height: 3.0)), + ), ), ), - ), - ], + ], + ), ), ), - ), - ); - }), + ); + }), + ), ); }, );