Merge branch 'flutterflow' into feature/access

This commit is contained in:
Jonatas Antunes Messias 2024-06-26 09:33:43 -03:00
commit 47c8cc1b3b
3 changed files with 255 additions and 243 deletions

View File

@ -44,8 +44,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>"; };
6436409527A31CD700820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6436409627A31CD100820AF7 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6436409A27A31CD400820AF7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 6436409B27A31CDD00820AF7 /* 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>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@ -225,8 +225,8 @@
6436409C27A31CD800820AF7 /* InfoPlist.strings */ = { 6436409C27A31CD800820AF7 /* InfoPlist.strings */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
6436409527A31CD700820AF7 /* pt */, 6436409627A31CD100820AF7 /* pt */,
6436409A27A31CD400820AF7 /* en */, 6436409B27A31CDD00820AF7 /* en */,
); );
name = InfoPlist.strings; name = InfoPlist.strings;
sourceTree = "<group>"; sourceTree = "<group>";

View File

@ -44,6 +44,8 @@ class _OptModalWidgetState extends State<OptModalWidget> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Align( return Align(
alignment: const AlignmentDirectional(1.0, -1.0), alignment: const AlignmentDirectional(1.0, -1.0),
child: Padding(
padding: const EdgeInsetsDirectional.fromSTEB(0.0, 50.0, 20.0, 0.0),
child: Container( child: Container(
width: 300.0, width: 300.0,
height: 400.0, height: 400.0,
@ -158,9 +160,11 @@ class _OptModalWidgetState extends State<OptModalWidget> {
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'l7tw8b92' /* Tipo de Pessoa */, 'l7tw8b92' /* Tipo de Pessoa */,
), ),
style: FlutterFlowTheme.of(context).bodyMedium.override( style: FlutterFlowTheme.of(context)
fontFamily: .bodyMedium
FlutterFlowTheme.of(context).bodyMediumFamily, .override(
fontFamily: FlutterFlowTheme.of(context)
.bodyMediumFamily,
letterSpacing: 0.0, letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context) FlutterFlowTheme.of(context)
@ -196,7 +200,9 @@ class _OptModalWidgetState extends State<OptModalWidget> {
checkColor: FlutterFlowTheme.of(context).info, checkColor: FlutterFlowTheme.of(context).info,
checkboxBorderColor: checkboxBorderColor:
FlutterFlowTheme.of(context).secondaryText, FlutterFlowTheme.of(context).secondaryText,
textStyle: FlutterFlowTheme.of(context).bodyMedium.override( textStyle: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily, FlutterFlowTheme.of(context).bodyMediumFamily,
letterSpacing: 0.0, letterSpacing: 0.0,
@ -220,9 +226,11 @@ class _OptModalWidgetState extends State<OptModalWidget> {
FFLocalizations.of(context).getText( FFLocalizations.of(context).getText(
'pepv7gl9' /* Tipo de Acesso */, 'pepv7gl9' /* Tipo de Acesso */,
), ),
style: FlutterFlowTheme.of(context).bodyMedium.override( style: FlutterFlowTheme.of(context)
fontFamily: .bodyMedium
FlutterFlowTheme.of(context).bodyMediumFamily, .override(
fontFamily: FlutterFlowTheme.of(context)
.bodyMediumFamily,
letterSpacing: 0.0, letterSpacing: 0.0,
useGoogleFonts: GoogleFonts.asMap().containsKey( useGoogleFonts: GoogleFonts.asMap().containsKey(
FlutterFlowTheme.of(context) FlutterFlowTheme.of(context)
@ -258,7 +266,9 @@ class _OptModalWidgetState extends State<OptModalWidget> {
checkColor: FlutterFlowTheme.of(context).info, checkColor: FlutterFlowTheme.of(context).info,
checkboxBorderColor: checkboxBorderColor:
FlutterFlowTheme.of(context).secondaryText, FlutterFlowTheme.of(context).secondaryText,
textStyle: FlutterFlowTheme.of(context).bodyMedium.override( textStyle: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: fontFamily:
FlutterFlowTheme.of(context).bodyMediumFamily, FlutterFlowTheme.of(context).bodyMediumFamily,
letterSpacing: 0.0, letterSpacing: 0.0,
@ -281,7 +291,8 @@ class _OptModalWidgetState extends State<OptModalWidget> {
), ),
options: FFButtonOptions( options: FFButtonOptions(
height: 40.0, height: 40.0,
padding: const EdgeInsetsDirectional.fromSTEB(24.0, 0.0, 24.0, 0.0), padding:
const EdgeInsetsDirectional.fromSTEB(24.0, 0.0, 24.0, 0.0),
iconPadding: iconPadding:
const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0), const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 0.0),
color: FlutterFlowTheme.of(context).primary, color: FlutterFlowTheme.of(context).primary,
@ -306,6 +317,7 @@ class _OptModalWidgetState extends State<OptModalWidget> {
), ),
), ),
), ),
),
); );
} }
} }

View File

@ -86,7 +86,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget>
), ),
actions: const [], actions: const [],
centerTitle: true, centerTitle: true,
elevation: 2.0, elevation: 0.0,
), ),
body: SafeArea( body: SafeArea(
top: true, top: true,
@ -619,7 +619,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget>
decoration: BoxDecoration( decoration: BoxDecoration(
color: FlutterFlowTheme color: FlutterFlowTheme
.of(context) .of(context)
.secondaryBackground, .primaryBackground,
), ),
child: Column( child: Column(
mainAxisSize: mainAxisSize:
@ -968,7 +968,7 @@ class _AcessHistoryPageWidgetState extends State<AcessHistoryPageWidget>
decoration: BoxDecoration( decoration: BoxDecoration(
color: FlutterFlowTheme color: FlutterFlowTheme
.of(context) .of(context)
.secondaryBackground, .primaryBackground,
), ),
child: Column( child: Column(
mainAxisSize: mainAxisSize: