From 382a2a42551427ba82831771dc6f3752cc70aece Mon Sep 17 00:00:00 2001 From: steeve Date: Sat, 27 Jan 2024 16:27:31 -0300 Subject: [PATCH] Changes to be committed: 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 --- lib/assets/theme/colors.dart | 2 +- lib/assets/theme/style.dart | 30 +++++++++---------- lib/src/app/auth/screens/login.dart | 13 ++++---- lib/src/app/base/screens/splash.dart | 4 +-- .../shared/widgets/buttons/simple_button.dart | 6 ++-- .../shared/widgets/inputs/password_input.dart | 6 ++-- .../shared/widgets/inputs/simple_input.dart | 6 ++-- .../widgets/inputs/theme/input_theme.dart | 10 +++---- 8 files changed, 40 insertions(+), 37 deletions(-) diff --git a/lib/assets/theme/colors.dart b/lib/assets/theme/colors.dart index 03a18e5..996846b 100644 --- a/lib/assets/theme/colors.dart +++ b/lib/assets/theme/colors.dart @@ -5,7 +5,7 @@ class AppColorLight { // Highlight 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 scaffoldBackgroundColor = const Color(0xffF5F8FA); static Color redExcluir = Colors.red; diff --git a/lib/assets/theme/style.dart b/lib/assets/theme/style.dart index d6ee91d..5a31740 100644 --- a/lib/assets/theme/style.dart +++ b/lib/assets/theme/style.dart @@ -26,75 +26,75 @@ class AppStyle{ highlightColor: Colors.transparent, hoverColor: Colors.transparent, textTheme: TextTheme( - headlineLarge: GoogleFonts.alegreyaSans( + headlineLarge: GoogleFonts.inter( fontSize: 96, fontWeight: FontWeight.w300, color: AppColorLight.text00Color, ), - displayLarge: GoogleFonts.alegreyaSans( + displayLarge: GoogleFonts.inter( fontSize: 60, fontWeight: FontWeight.w300, color: AppColorLight.text00Color, ), - displayMedium: GoogleFonts.alegreyaSans( + displayMedium: GoogleFonts.inter( fontSize: 48, fontWeight: FontWeight.w400, color: AppColorLight.text00Color, ), - displaySmall: GoogleFonts.alegreyaSans( + displaySmall: GoogleFonts.inter( fontSize: 32, fontWeight: FontWeight.w400, color: AppColorLight.text00Color, ), - headlineMedium: GoogleFonts.alegreyaSans( + headlineMedium: GoogleFonts.inter( fontSize: 24, fontWeight: FontWeight.w600, color: AppColorLight.text00Color, ), - headlineSmall: GoogleFonts.alegreyaSans( + headlineSmall: GoogleFonts.inter( fontSize: 20, fontWeight: FontWeight.w500, color: AppColorLight.text00Color, ), - titleLarge: GoogleFonts.alegreyaSans( + titleLarge: GoogleFonts.inter( fontSize: 16, fontWeight: FontWeight.w400, color: AppColorLight.text00Color, ), - titleMedium: GoogleFonts.alegreyaSans( + titleMedium: GoogleFonts.inter( fontSize: 16, fontWeight: FontWeight.w600, color: AppColorLight.text00Color, ), - titleSmall: GoogleFonts.alegreyaSans( + titleSmall: GoogleFonts.inter( fontSize: 13, fontWeight: FontWeight.w400, color: AppColorLight.text00Color, ), - bodyLarge: GoogleFonts.alegreyaSans( + bodyLarge: GoogleFonts.inter( fontSize: 17, fontWeight: FontWeight.w600, color: AppColorLight.text00Color, ), - bodyMedium: GoogleFonts.alegreyaSans( + bodyMedium: GoogleFonts.inter( fontSize: 14, fontWeight: FontWeight.w600, color: AppColorLight.text00Color, ), - bodySmall: GoogleFonts.alegreyaSans( + bodySmall: GoogleFonts.inter( fontSize: 12, color: AppColorLight.text00Color, ), - labelLarge: GoogleFonts.alegreyaSans( + labelLarge: GoogleFonts.inter( fontSize: 17, color: AppColorLight.text00Color, ), - labelMedium: GoogleFonts.alegreyaSans( + labelMedium: GoogleFonts.inter( fontSize: 14, fontWeight: FontWeight.w600, color: AppColorLight.text00Color, ), - labelSmall: GoogleFonts.alegreyaSans( + labelSmall: GoogleFonts.inter( fontSize: 11, color: AppColorLight.text00Color, ) diff --git a/lib/src/app/auth/screens/login.dart b/lib/src/app/auth/screens/login.dart index 0918753..4145bba 100644 --- a/lib/src/app/auth/screens/login.dart +++ b/lib/src/app/auth/screens/login.dart @@ -17,7 +17,7 @@ class LoginScreen extends ConsumerStatefulWidget { } class _LoginScreenState extends ConsumerState { - Radius radius = const Radius.circular(40); + final GlobalKey _scaffoldKey = GlobalKey(); bool showpass = false; @@ -41,6 +41,7 @@ class _LoginScreenState extends ConsumerState { @override Widget build(BuildContext context) { + Radius radius = const Radius.circular(20); return WillPopScope( onWillPop: () async { return Future.value(false); @@ -88,7 +89,7 @@ class _LoginScreenState extends ConsumerState { child: Center( child: Column( children: [ - const SizedBox(height: 50), + const SizedBox(height: 30), SizedBox( width: double.infinity, child: Text( @@ -97,11 +98,11 @@ class _LoginScreenState extends ConsumerState { style: Theme.of(context).textTheme.bodyMedium?.copyWith( fontWeight: FontWeight.w600, color: AppColorLight.text01Color, - fontSize: 21 + fontSize: 26 ) ) ), - const SizedBox(height: 30), + const SizedBox(height: 20), SimpleInput( title: 'Email', hintText: 'Informe seu email', @@ -128,11 +129,11 @@ class _LoginScreenState extends ConsumerState { child: Text( 'Esqueceu a senha?', textAlign: TextAlign.end, - style: Theme.of(context).textTheme.bodySmall?.copyWith( + style: Theme.of(context).textTheme.bodyLarge?.copyWith( fontWeight: FontWeight.w400, decoration: TextDecoration.underline, color: Theme.of(context).primaryColor, - fontSize: 13 + fontSize: AppFontSize.fontSize15 ) ) ), diff --git a/lib/src/app/base/screens/splash.dart b/lib/src/app/base/screens/splash.dart index 21baaa0..20b9c98 100644 --- a/lib/src/app/base/screens/splash.dart +++ b/lib/src/app/base/screens/splash.dart @@ -48,8 +48,8 @@ class _SlapshScreenState extends ConsumerState { children: [ SizedBox( child: Image.asset( - 'lib/assets/logos/logo_letra_branca.png', - width: 300, + 'lib/assets/logos/logo_branca.png', + width: 200, fit: BoxFit.fill ) ), diff --git a/lib/src/shared/widgets/buttons/simple_button.dart b/lib/src/shared/widgets/buttons/simple_button.dart index db671b0..f0aaa60 100644 --- a/lib/src/shared/widgets/buttons/simple_button.dart +++ b/lib/src/shared/widgets/buttons/simple_button.dart @@ -46,7 +46,8 @@ class _ButtonWidgetState extends State { if(widget.isloading) Text( ' 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) ) ), @@ -54,7 +55,8 @@ class _ButtonWidgetState extends State { if(!widget.isloading) Text( 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) ) ) diff --git a/lib/src/shared/widgets/inputs/password_input.dart b/lib/src/shared/widgets/inputs/password_input.dart index 9f6bee2..a736460 100644 --- a/lib/src/shared/widgets/inputs/password_input.dart +++ b/lib/src/shared/widgets/inputs/password_input.dart @@ -71,9 +71,9 @@ class _PasswordInputState extends State { return null; }, cursorHeight: AppFontSize.cursorHeight, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 14, - height: 1.9, + style: Theme.of(context).textTheme.bodyLarge?.copyWith( + height: 1.5, + fontSize: AppFontSize.fontSize15, fontWeight: FontWeight.w600, color: AppColorLight.text01Color ), diff --git a/lib/src/shared/widgets/inputs/simple_input.dart b/lib/src/shared/widgets/inputs/simple_input.dart index 6df9bb4..7c53aaa 100644 --- a/lib/src/shared/widgets/inputs/simple_input.dart +++ b/lib/src/shared/widgets/inputs/simple_input.dart @@ -85,9 +85,9 @@ class _SimpleInputState extends State { } return null; }, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 14, - height: 1.9, + style: Theme.of(context).textTheme.bodyLarge?.copyWith( + fontSize: AppFontSize.fontSize15, + height: 1.5, fontWeight: FontWeight.w600, color: InputUtils.getColorText(typInputText: widget.typeInput, enabled: widget.enabled!) ), diff --git a/lib/src/shared/widgets/inputs/theme/input_theme.dart b/lib/src/shared/widgets/inputs/theme/input_theme.dart index 2fca3ce..01fb302 100644 --- a/lib/src/shared/widgets/inputs/theme/input_theme.dart +++ b/lib/src/shared/widgets/inputs/theme/input_theme.dart @@ -14,7 +14,7 @@ InputDecoration inputThemeDecoration( }){ return InputDecoration( isDense: true, - contentPadding: const EdgeInsets.fromLTRB(10, 7, 10, 10), + contentPadding: const EdgeInsets.fromLTRB(0, 7, 0, 10), hintText: hintText, suffixIcon: suffixIcon, labelText: title, @@ -22,21 +22,21 @@ InputDecoration inputThemeDecoration( border: InputBorder.none, errorStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( fontSize: 0, - height: 1.3, + height: 1.2, color: AppColorLight.text03Color ), floatingLabelStyle: TextStyle( color: statusTextField == StatusTextField.desabilitado ? AppColorLight.text04Color : statusTextField != StatusTextField.valided ? AppColorLight.erroColor : AppColorLight.primaryColor ), - labelStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 14, + labelStyle: Theme.of(context).textTheme.bodyLarge?.copyWith( + fontSize: AppFontSize.fontSize15, height: 0.0, fontWeight: FontWeight.w600, color: AppColorLight.text02Color ), hintStyle: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontSize: 14, + fontSize: AppFontSize.fontSize15, height: 0.0, fontWeight: FontWeight.w600, color: AppColorLight.text02Color