ajustes de layout

This commit is contained in:
Reginaldo
2023-08-08 09:35:23 -03:00
parent f077fdd580
commit d5aef78f06
6 changed files with 48 additions and 46 deletions

View File

@@ -189,7 +189,6 @@ class _HomeScreenState extends State<HomeScreen> {
text: showEscola?'Cadastrar Pais':'Cadastrar Usuários', text: showEscola?'Cadastrar Pais':'Cadastrar Usuários',
fontSize: 15, fontSize: 15,
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorButton: PaletteColors.primaryColor, colorButton: PaletteColors.primaryColor,
colorText: PaletteColors.white, colorText: PaletteColors.white,
colorBorder: PaletteColors.white colorBorder: PaletteColors.white
@@ -218,7 +217,7 @@ class _HomeScreenState extends State<HomeScreen> {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05), padding: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
InputText( InputText(
hint: 'Pesquisar por login do usuário'.toUpperCase(), hint: 'Pesquisar por login do usuário'.toUpperCase(),
@@ -228,9 +227,9 @@ class _HomeScreenState extends State<HomeScreen> {
fontSize: 14, fontSize: 14,
colorBackground: Colors.white, colorBackground: Colors.white,
), ),
SizedBox(width: 10,),
ButtonCustom( ButtonCustom(
widthCustom: 0.05, widthCustom: 0.05,
heightCustom: 0.063,
text: "PESQUISAR", text: "PESQUISAR",
fontSize: 10.0, fontSize: 10.0,
colorText: PaletteColors.white, colorText: PaletteColors.white,
@@ -248,9 +247,9 @@ class _HomeScreenState extends State<HomeScreen> {
} }
}, },
), ),
SizedBox(width: 10,),
ButtonCustom( ButtonCustom(
widthCustom: 0.05, widthCustom: 0.05,
heightCustom: 0.063,
text: "LIMPAR", text: "LIMPAR",
fontSize: 10.0, fontSize: 10.0,
colorText: PaletteColors.white, colorText: PaletteColors.white,
@@ -334,7 +333,7 @@ class _HomeScreenState extends State<HomeScreen> {
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05), padding: EdgeInsets.symmetric(horizontal: width>900?width*0.1:width*0.05),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
InputText( InputText(
hint: 'Pesquisar por nome do aluno(a)'.toUpperCase(), hint: 'Pesquisar por nome do aluno(a)'.toUpperCase(),
@@ -344,9 +343,9 @@ class _HomeScreenState extends State<HomeScreen> {
fontSize: 14, fontSize: 14,
colorBackground: Colors.white, colorBackground: Colors.white,
), ),
SizedBox(width: 10,),
ButtonCustom( ButtonCustom(
widthCustom: 0.05, widthCustom: 0.05,
heightCustom: 0.063,
text: "PESQUISAR", text: "PESQUISAR",
fontSize: 10.0, fontSize: 10.0,
colorText: PaletteColors.white, colorText: PaletteColors.white,
@@ -363,9 +362,9 @@ class _HomeScreenState extends State<HomeScreen> {
} }
}, },
), ),
SizedBox(width: 10,),
ButtonCustom( ButtonCustom(
widthCustom: 0.05, widthCustom: 0.05,
heightCustom: 0.063,
text: "LIMPAR", text: "LIMPAR",
fontSize: 10.0, fontSize: 10.0,
colorText: PaletteColors.white, colorText: PaletteColors.white,

View File

@@ -24,11 +24,11 @@ class _LoginScreenState extends State<LoginScreen> {
//las1594@@ //las1594@@
//SENHAS CRIPTOGRAFADAS PORQUE FORMA ALTERADAS, SENHAS NOVAS USUÁRIO E SENHA SÃO IGUAIS //SENHAS CRIPTOGRAFADAS PORQUE FORMA ALTERADAS, SENHAS NOVAS USUÁRIO E SENHA SÃO IGUAIS
//ibueno //ibueno
// final inputLogin = TextEditingController(text: 'admin'); final inputLogin = TextEditingController(text: 'admin');
// final inputSenha = TextEditingController(text: 'las1594@@'); final inputSenha = TextEditingController(text: 'las1594@@');
// final inputCodigo = TextEditingController(text: 'e003'); // final inputCodigo = TextEditingController(text: 'e003');
final inputLogin = TextEditingController(); // final inputLogin = TextEditingController();
final inputSenha = TextEditingController(); // final inputSenha = TextEditingController();
final inputCodigo = TextEditingController(); final inputCodigo = TextEditingController();
bool carregando = false; bool carregando = false;
List listCodigo = []; List listCodigo = [];
@@ -221,7 +221,6 @@ class _LoginScreenState extends State<LoginScreen> {
], ],
):ButtonCustom( ):ButtonCustom(
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.07,
text: "ENTRAR", text: "ENTRAR",
fontSize: 14.0, fontSize: 14.0,
colorText: PaletteColors.white, colorText: PaletteColors.white,

View File

@@ -386,7 +386,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
}), }),
text: 'Cancelar', text: 'Cancelar',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.primaryColor, colorBorder: PaletteColors.primaryColor,
colorButton: PaletteColors.primaryColor, colorButton: PaletteColors.primaryColor,
@@ -400,7 +399,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
}, },
text: 'Salvar', text: 'Salvar',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.green, colorBorder: PaletteColors.green,
colorButton: PaletteColors.green, colorButton: PaletteColors.green,
@@ -452,7 +450,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
onPressed:()=>Navigator.pop(context), onPressed:()=>Navigator.pop(context),
text: 'NÃO', text: 'NÃO',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.bgColor, colorBorder: PaletteColors.bgColor,
colorButton: PaletteColors.bgColor, colorButton: PaletteColors.bgColor,
@@ -462,7 +459,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
onPressed:()=>excluirResponsavel(index, responsaveis[index].CPF), onPressed:()=>excluirResponsavel(index, responsaveis[index].CPF),
text: 'SIM', text: 'SIM',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.primaryColor, colorBorder: PaletteColors.primaryColor,
colorButton: PaletteColors.primaryColor, colorButton: PaletteColors.primaryColor,
@@ -484,7 +480,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
onPressed:()=>Navigator.pop(context), onPressed:()=>Navigator.pop(context),
text: 'NÃO', text: 'NÃO',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.bgColor, colorBorder: PaletteColors.bgColor,
colorButton: PaletteColors.bgColor, colorButton: PaletteColors.bgColor,
@@ -501,7 +496,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
}, },
text: 'SIM', text: 'SIM',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.primaryColor, colorBorder: PaletteColors.primaryColor,
colorButton: PaletteColors.primaryColor, colorButton: PaletteColors.primaryColor,
@@ -523,7 +517,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
onPressed:()=>Navigator.pop(context), onPressed:()=>Navigator.pop(context),
text: 'NÃO', text: 'NÃO',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.bgColor, colorBorder: PaletteColors.bgColor,
colorButton: PaletteColors.bgColor, colorButton: PaletteColors.bgColor,
@@ -539,7 +532,6 @@ class _ResponsibleRegisterScreenState extends State<ResponsibleRegisterScreen> {
}, },
text: 'SIM', text: 'SIM',
widthCustom: 0.1, widthCustom: 0.1,
heightCustom: 0.05,
colorText: Colors.white, colorText: Colors.white,
colorBorder: PaletteColors.primaryColor, colorBorder: PaletteColors.primaryColor,
colorButton: PaletteColors.primaryColor, colorButton: PaletteColors.primaryColor,

View File

@@ -8,7 +8,7 @@ class ButtonCustom extends StatelessWidget{
final Color colorText; final Color colorText;
final Color colorBorder; final Color colorBorder;
final widthCustom; final widthCustom;
final heightCustom; final double height;
ButtonCustom({ ButtonCustom({
required this.onPressed, required this.onPressed,
@@ -18,17 +18,16 @@ ButtonCustom({
required this.colorText, required this.colorText,
required this.colorBorder, required this.colorBorder,
this.widthCustom = 1.0, this.widthCustom = 1.0,
this.heightCustom = 1.0 this.height = 42.0,
}); });
@override @override
Widget build (BuildContext context) { Widget build (BuildContext context) {
double width =MediaQuery.of(context).size.width; double width =MediaQuery.of(context).size.width;
double height =MediaQuery.of(context).size.height;
return ElevatedButton( return ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: colorButton, primary: colorButton,
minimumSize: Size(width*widthCustom! , height*heightCustom!), minimumSize: Size(width*widthCustom! , height),
side: BorderSide(width: 2,color : colorBorder,), side: BorderSide(width: 2,color : colorBorder,),
), ),
onPressed: onPressed, onPressed: onPressed,

View File

@@ -45,30 +45,41 @@ class DadosResponsaveisContainer extends StatelessWidget {
CaixaTextoContainer(texto: responsavelModel.NOME,titulo: 'Nome',widthCustom: 0.15), CaixaTextoContainer(texto: responsavelModel.NOME,titulo: 'Nome',widthCustom: 0.15),
CaixaTextoContainer(texto: responsavelModel.PARENTESCO,titulo: 'Parentesco',widthCustom: 0.1,), CaixaTextoContainer(texto: responsavelModel.PARENTESCO,titulo: 'Parentesco',widthCustom: 0.1,),
responsavelModel.CPF!='' && responsavelModel.SENHA!=''?Container( responsavelModel.CPF!='' && responsavelModel.SENHA!=''?Container(
alignment: Alignment.bottomCenter, height: 12,
alignment: Alignment.center,
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: Icon(Icons.check_circle,color: Colors.green,), child: Icon(Icons.check_circle,color: Colors.green,),
):Container(), ):Container(height: 12,width: 30,),
ButtonCustom( Column(
text: 'Resetar Senha', children: [
fontSize: 14.0, SizedBox(height: 12,),
colorButton: PaletteColors.grey, ButtonCustom(
colorText: PaletteColors.white, text: 'Resetar Senha',
colorBorder: PaletteColors.grey, fontSize: 14.0,
onPressed:resetarSenha, colorButton: PaletteColors.grey,
heightCustom: 0.05, colorText: PaletteColors.white,
widthCustom: 0.05, colorBorder: PaletteColors.grey,
onPressed:resetarSenha,
widthCustom: 0.05,
height: 39,
),
],
), ),
SizedBox(width: 10,), SizedBox(width: 15,),
responsavelModel.CPF!='' && responsavelModel.SENHA!=''?ButtonCustom( responsavelModel.CPF!='' && responsavelModel.SENHA!=''?Column(
text: 'Bloquear Responsável', children: [
fontSize: 14.0, SizedBox(height: 12,),
colorButton: PaletteColors.primaryColor, ButtonCustom(
colorText: PaletteColors.white, text: 'Bloquear Responsável',
colorBorder: PaletteColors.primaryColor, fontSize: 14.0,
onPressed:bloquearSenha, colorButton: PaletteColors.primaryColor,
heightCustom: 0.05, colorText: PaletteColors.white,
widthCustom: 0.05, colorBorder: PaletteColors.primaryColor,
onPressed:bloquearSenha,
widthCustom: 0.05,
height: 39,
),
],
):Container() ):Container()
], ],
), ),

View File

@@ -43,7 +43,8 @@ class InputText extends StatelessWidget {
Container( Container(
color:colorBackground, color:colorBackground,
width: width, width: width,
margin: EdgeInsets.only(bottom: 5), height: 35,
margin: EdgeInsets.only(bottom: 0),
child: TextFormField( child: TextFormField(
inputFormatters: inputFormatters, inputFormatters: inputFormatters,
keyboardType: textInputType, keyboardType: textInputType,
@@ -52,6 +53,7 @@ class InputText extends StatelessWidget {
obscureText: this.obscure, obscureText: this.obscure,
controller: this.controller, controller: this.controller,
enabled: enable, enabled: enable,
textAlignVertical: TextAlignVertical.bottom,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: this.fontSize, fontSize: this.fontSize,