steevedevops/tecban_mobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to be committed:

Browse Source 
modified:   lib/assets/theme/colors.dart
	modified:   lib/assets/theme/style.dart
	modified:   lib/src/app/auth/screens/login.dart
	modified:   lib/src/app/base/screens/splash.dart
	modified:   lib/src/shared/widgets/buttons/simple_button.dart
	modified:   lib/src/shared/widgets/inputs/password_input.dart
	modified:   lib/src/shared/widgets/inputs/simple_input.dart
	modified:   lib/src/shared/widgets/inputs/theme/input_theme.dart
This commit is contained in:
steeve 2024-01-27 16:27:31 -03:00
parent 92159f330d
commit 382a2a4255
8 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/assets/theme/colors.dart
View File

@ -5,7 +5,7 @@ class AppColorLight {
// Highlight // Highlight
static Color primaryColor = Color(0xFF1D7773); static Color primaryColor = Color(0xFF1D7773);
static Color secondaryColor = const Color(0xff93A3A2); static Color secondaryColor = const Color(0xffF7941E);
static Color backgroundColor = const Color(0xffffffff); static Color backgroundColor = const Color(0xffffffff);
static Color scaffoldBackgroundColor = const Color(0xffF5F8FA); static Color scaffoldBackgroundColor = const Color(0xffF5F8FA);
static Color redExcluir = Colors.red; static Color redExcluir = Colors.red;

30
lib/assets/theme/style.dart
View File

@ -26,75 +26,75 @@ class AppStyle{
highlightColor: Colors.transparent, highlightColor: Colors.transparent,
hoverColor: Colors.transparent, hoverColor: Colors.transparent,
textTheme: TextTheme( textTheme: TextTheme(
headlineLarge: GoogleFonts.alegreyaSans( headlineLarge: GoogleFonts.inter(
fontSize: 96, fontSize: 96,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
displayLarge: GoogleFonts.alegreyaSans( displayLarge: GoogleFonts.inter(
fontSize: 60, fontSize: 60,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
displayMedium: GoogleFonts.alegreyaSans( displayMedium: GoogleFonts.inter(
fontSize: 48, fontSize: 48,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
displaySmall: GoogleFonts.alegreyaSans( displaySmall: GoogleFonts.inter(
fontSize: 32, fontSize: 32,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
headlineMedium: GoogleFonts.alegreyaSans( headlineMedium: GoogleFonts.inter(
fontSize: 24, fontSize: 24,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
headlineSmall: GoogleFonts.alegreyaSans( headlineSmall: GoogleFonts.inter(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
titleLarge: GoogleFonts.alegreyaSans( titleLarge: GoogleFonts.inter(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
titleMedium: GoogleFonts.alegreyaSans( titleMedium: GoogleFonts.inter(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
titleSmall: GoogleFonts.alegreyaSans( titleSmall: GoogleFonts.inter(
fontSize: 13, fontSize: 13,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
bodyLarge: GoogleFonts.alegreyaSans( bodyLarge: GoogleFonts.inter(
fontSize: 17, fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
bodyMedium: GoogleFonts.alegreyaSans( bodyMedium: GoogleFonts.inter(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
bodySmall: GoogleFonts.alegreyaSans( bodySmall: GoogleFonts.inter(
fontSize: 12, fontSize: 12,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
labelLarge: GoogleFonts.alegreyaSans( labelLarge: GoogleFonts.inter(
fontSize: 17, fontSize: 17,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
labelMedium: GoogleFonts.alegreyaSans( labelMedium: GoogleFonts.inter(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
), ),
labelSmall: GoogleFonts.alegreyaSans( labelSmall: GoogleFonts.inter(
fontSize: 11, fontSize: 11,
color: AppColorLight.text00Color, color: AppColorLight.text00Color,
) )

13
lib/src/app/auth/screens/login.dart
View File

@ -17,7 +17,7 @@ class LoginScreen extends ConsumerStatefulWidget {
} }
class _LoginScreenState extends ConsumerState<LoginScreen> { class _LoginScreenState extends ConsumerState<LoginScreen> {
Radius radius = const Radius.circular(40);
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
bool showpass = false; bool showpass = false;
@ -41,6 +41,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Radius radius = const Radius.circular(20);
return WillPopScope( return WillPopScope(
onWillPop: () async { onWillPop: () async {
return Future.value(false); return Future.value(false);
@ -88,7 +89,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
child: Center( child: Center(
child: Column( child: Column(
children: [ children: [
const SizedBox(height: 50), const SizedBox(height: 30),
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
child: Text( child: Text(
@ -97,11 +98,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
style: Theme.of(context).textTheme.bodyMedium?.copyWith( style: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text01Color, color: AppColorLight.text01Color,
fontSize: 21 fontSize: 26
) )
) )
), ),
const SizedBox(height: 30), const SizedBox(height: 20),
SimpleInput( SimpleInput(
title: 'Email', title: 'Email',
hintText: 'Informe seu email', hintText: 'Informe seu email',
@ -128,11 +129,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
child: Text( child: Text(
'Esqueceu a senha?', 'Esqueceu a senha?',
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: Theme.of(context).textTheme.bodySmall?.copyWith( style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
fontSize: 13 fontSize: AppFontSize.fontSize15
) )
) )
), ),

4
lib/src/app/base/screens/splash.dart
View File

@ -48,8 +48,8 @@ class _SlapshScreenState extends ConsumerState<SlapshScreen> {
children: [ children: [
SizedBox( SizedBox(
child: Image.asset( child: Image.asset(
'lib/assets/logos/logo_letra_branca.png', 'lib/assets/logos/logo_branca.png',
width: 300, width: 200,
fit: BoxFit.fill fit: BoxFit.fill
) )
), ),

6
lib/src/shared/widgets/buttons/simple_button.dart
View File

@ -46,7 +46,8 @@ class _ButtonWidgetState extends State<ButtonWidget> {
if(widget.isloading) if(widget.isloading)
Text( Text(
' Carregando...', ' Carregando...',
style: Theme.of(context).textTheme.bodyMedium?.copyWith( style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontSize: AppFontSize.fontSize15,
color: defineTextColor(context, type:widget.type, disabled: widget.onTap==null) color: defineTextColor(context, type:widget.type, disabled: widget.onTap==null)
) )
), ),
@ -54,7 +55,8 @@ class _ButtonWidgetState extends State<ButtonWidget> {
if(!widget.isloading) if(!widget.isloading)
Text( Text(
widget.label, widget.label,
style: Theme.of(context).textTheme.bodyMedium?.copyWith( style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontSize: AppFontSize.fontSize15,
color: defineTextColor(context, type:widget.type, disabled: widget.onTap==null) color: defineTextColor(context, type:widget.type, disabled: widget.onTap==null)
) )
) )

6
lib/src/shared/widgets/inputs/password_input.dart
View File

@ -71,9 +71,9 @@ class _PasswordInputState extends State<PasswordInput> {
return null; return null;
}, },
cursorHeight: AppFontSize.cursorHeight, cursorHeight: AppFontSize.cursorHeight,
style: Theme.of(context).textTheme.bodyMedium?.copyWith( style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontSize: 14, height: 1.5,
height: 1.9, fontSize: AppFontSize.fontSize15,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text01Color color: AppColorLight.text01Color
), ),

6
lib/src/shared/widgets/inputs/simple_input.dart
View File

@ -85,9 +85,9 @@ class _SimpleInputState extends State<SimpleInput> {
} }
return null; return null;
}, },
style: Theme.of(context).textTheme.bodyMedium?.copyWith( style: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontSize: 14, fontSize: AppFontSize.fontSize15,
height: 1.9, height: 1.5,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: InputUtils.getColorText(typInputText: widget.typeInput, enabled: widget.enabled!) color: InputUtils.getColorText(typInputText: widget.typeInput, enabled: widget.enabled!)
), ),

10
lib/src/shared/widgets/inputs/theme/input_theme.dart
View File

@ -14,7 +14,7 @@ InputDecoration inputThemeDecoration(
}){ }){
return InputDecoration( return InputDecoration(
isDense: true, isDense: true,
contentPadding: const EdgeInsets.fromLTRB(10, 7, 10, 10), contentPadding: const EdgeInsets.fromLTRB(0, 7, 0, 10),
hintText: hintText, hintText: hintText,
suffixIcon: suffixIcon, suffixIcon: suffixIcon,
labelText: title, labelText: title,
@ -22,21 +22,21 @@ InputDecoration inputThemeDecoration(
border: InputBorder.none, border: InputBorder.none,
errorStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( errorStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontSize: 0, fontSize: 0,
height: 1.3, height: 1.2,
color: AppColorLight.text03Color color: AppColorLight.text03Color
), ),
floatingLabelStyle: TextStyle( floatingLabelStyle: TextStyle(
color: statusTextField == StatusTextField.desabilitado ? AppColorLight.text04Color : color: statusTextField == StatusTextField.desabilitado ? AppColorLight.text04Color :
statusTextField != StatusTextField.valided ? AppColorLight.erroColor : AppColorLight.primaryColor statusTextField != StatusTextField.valided ? AppColorLight.erroColor : AppColorLight.primaryColor
), ),
labelStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( labelStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
fontSize: 14, fontSize: AppFontSize.fontSize15,
height: 0.0, height: 0.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text02Color color: AppColorLight.text02Color
), ),
hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
fontSize: 14, fontSize: AppFontSize.fontSize15,
height: 0.0, height: 0.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: AppColorLight.text02Color color: AppColorLight.text02Color