diff --git a/lib/assets/logos/banner-varejo.jpg b/lib/assets/logos/banner-varejo.jpg new file mode 100644 index 0000000..29c978c Binary files /dev/null and b/lib/assets/logos/banner-varejo.jpg differ diff --git a/lib/assets/logos/logo_tecban.png b/lib/assets/logos/logo_tecban.png new file mode 100644 index 0000000..e49549a Binary files /dev/null and b/lib/assets/logos/logo_tecban.png differ diff --git a/lib/assets/theme/colors.dart b/lib/assets/theme/colors.dart index 996846b..1fe0b75 100644 --- a/lib/assets/theme/colors.dart +++ b/lib/assets/theme/colors.dart @@ -4,8 +4,8 @@ import 'package:flutter/material.dart'; class AppColorLight { // Highlight - static Color primaryColor = Color(0xFF1D7773); - static Color secondaryColor = const Color(0xffF7941E); + static Color primaryColor = Color(0xFFE53935); + static Color secondaryColor = const Color(0xff5E6278); static Color backgroundColor = const Color(0xffffffff); static Color scaffoldBackgroundColor = const Color(0xffF5F8FA); static Color redExcluir = Colors.red; diff --git a/lib/src/app/auth/screens/login.dart b/lib/src/app/auth/screens/login.dart index c08c5c1..08aaf64 100644 --- a/lib/src/app/auth/screens/login.dart +++ b/lib/src/app/auth/screens/login.dart @@ -48,12 +48,11 @@ class _LoginScreenState extends ConsumerState { return Scaffold( key: _scaffoldKey, extendBodyBehindAppBar: true, - appBar: const PreferredSize(child: SizedBox(), preferredSize: Size.fromHeight(0)), + appBar: const PreferredSize(child: const SizedBox(), preferredSize: Size.fromHeight(0)), body: SingleChildScrollView( child: Container( - decoration: BoxDecoration( - color: Theme.of(context).primaryColor, - image: const DecorationImage( + decoration: const BoxDecoration( + image: DecorationImage( image: AssetImage('lib/assets/images/bg_header.png'), fit: BoxFit.cover, ) @@ -62,11 +61,11 @@ class _LoginScreenState extends ConsumerState { children: [ const SizedBox(height: 25), SizedBox( - height: Metrics.height(context)/3, + height: Metrics.height(context)/1.5, child: Center( child: SizedBox( child: Image.asset( - 'lib/assets/logos/logo_letra_branca.png', + 'lib/assets/logos/logo_tecban.png', fit: BoxFit.fill, width: 250 ) @@ -79,7 +78,7 @@ class _LoginScreenState extends ConsumerState { topRight: radius ), child: Container( - padding: const EdgeInsets.symmetric(horizontal: 35), + padding: const EdgeInsets.symmetric(horizontal: 20), decoration: BoxDecoration( color: Theme.of(context).scaffoldBackgroundColor ), @@ -88,11 +87,11 @@ class _LoginScreenState extends ConsumerState { child: Center( child: Column( children: [ - const SizedBox(height: 30), + const SizedBox(height: 15), SizedBox( width: double.infinity, child: Text( - "Fazer Login", + "Bem-vindo de volta", textAlign: TextAlign.start, style: Theme.of(context).textTheme.bodyMedium?.copyWith( fontWeight: FontWeight.w600, @@ -109,34 +108,6 @@ class _LoginScreenState extends ConsumerState { controller: emailController, validator: true, ), - const SizedBox(height: 30), - PasswordInput( - title: 'Senha', - hintText: 'Informe sua senha', - controller: senhaController, - validator: true, - onFieldSubmitted: (value) { - // onTapLogin(); - } - ), - const SizedBox(height: 20), - InkWell( - onTap: (){ - }, - child: SizedBox( - width: double.infinity, - child: Text( - 'Esqueceu a senha?', - textAlign: TextAlign.end, - style: Theme.of(context).textTheme.bodyLarge?.copyWith( - fontWeight: FontWeight.w400, - decoration: TextDecoration.underline, - color: Theme.of(context).primaryColor, - fontSize: AppFontSize.fontSize15 - ) - ) - ), - ), const SizedBox(height: 20), ButtonWidget( label: 'Fazer login', @@ -145,14 +116,6 @@ class _LoginScreenState extends ConsumerState { context.push(HomeScreen.path); } ), - const SizedBox(height: 20), - ButtonWidget( - label: 'Não possui conta? Cadastre-se', - type: TypeButton.secondary, - onTap: (){ - context.push(CadastroScreen.path); - } - ), const SizedBox(height: 30), ] ) diff --git a/lib/src/app/base/screens/splash.dart b/lib/src/app/base/screens/splash.dart index 02f53ab..02c0bc6 100644 --- a/lib/src/app/base/screens/splash.dart +++ b/lib/src/app/base/screens/splash.dart @@ -48,7 +48,7 @@ class _SlapshScreenState extends ConsumerState { children: [ SizedBox( child: Image.asset( - 'lib/assets/logos/logo_branca.png', + 'lib/assets/logos/logo_tecban.png', width: 200, fit: BoxFit.fill ) diff --git a/lib/src/app/home/screens/home_screen.dart b/lib/src/app/home/screens/home_screen.dart index d262494..02eb4eb 100644 --- a/lib/src/app/home/screens/home_screen.dart +++ b/lib/src/app/home/screens/home_screen.dart @@ -22,7 +22,7 @@ class _HomeScreenState extends State { @override Widget build(BuildContext context) { - Radius radius = const Radius.circular(30); + Radius radius = const Radius.circular(0); return Scaffold( key: _scaffoldKey, extendBodyBehindAppBar: true, @@ -115,18 +115,18 @@ class _HomeScreenState extends State { child: Column( children: [ const SizedBox(height: 15), - SizedBox( - width: double.infinity, - child: Text( - "Escolha o segmento desejado", - textAlign: TextAlign.start, - style: Theme.of(context).textTheme.bodyMedium?.copyWith( - fontWeight: FontWeight.w600, - color: AppColorLight.text02Color, - fontSize: 20 - ) - ) - ), + // SizedBox( + // width: double.infinity, + // child: Text( + // "Escolha o segmento desejado", + // textAlign: TextAlign.start, + // style: Theme.of(context).textTheme.bodyMedium?.copyWith( + // fontWeight: FontWeight.w600, + // color: AppColorLight.text02Color, + // fontSize: 20 + // ) + // ) + // ), // SizedBox( // width: double.infinity, // child: Text( @@ -140,41 +140,21 @@ class _HomeScreenState extends State { // ) // ), // const SizedBox(height: 20), - // SearchInput( - // hintText: 'Pesquisar', - // showIcon: true, - // prefixIcon: Feather.search, - // textInputType: TextInputType.text, - // textInputAction: TextInputAction.search, - // onFieldSubmitted: (value) async { - // } - // ), - const SizedBox(height: 20), - Row( - children: [ - CardInfoCardV2Widget( - svg: 'lib/assets/images/image_05.jpeg', - title: 'Inseticida', - onTap: (){ - context.push(CategoriaScreen.path, extra: 'Algodão'); - }, - ), - SizedBox(width: 20), - CardInfoCardWidget( - svg: 'lib/assets/images/masculino.png', - title: 'Herbicida', - onTap: (){ - context.push(CategoriaScreen.path, extra: 'Café'); - } - ) - ] + SearchInput( + hintText: 'Pesquisar', + showIcon: true, + prefixIcon: Feather.search, + textInputType: TextInputType.text, + textInputAction: TextInputAction.search, + onFieldSubmitted: (value) async { + } ), const SizedBox(height: 20), Row( children: [ CardInfoCardWidget( svg: 'lib/assets/images/masculino.png', - title: 'Fungicida', + title: 'Diebold', onTap: (){ context.push(CategoriaScreen.path, extra: 'Cana'); }, @@ -182,9 +162,9 @@ class _HomeScreenState extends State { SizedBox(width: 20), CardInfoCardWidget( svg: 'lib/assets/images/masculino.png', - title: 'Nutrição foliar', + title: 'NCR', onTap: (){ - context.push(CategoriaScreen.path, extra: 'Milho'); + // context.push(CategoriaScreen.path, extra: 'Café'); } ) ] @@ -194,22 +174,41 @@ class _HomeScreenState extends State { children: [ CardInfoCardWidget( svg: 'lib/assets/images/masculino.png', - title: 'Tecnologia de Aplicação', + title: 'Finger', onTap: (){ - context.push(CategoriaScreen.path, extra: 'Soja'); + context.push(CategoriaScreen.path, extra: 'Cana'); }, ), - // SizedBox(width: 20), - // CardInfoCardWidget( - // svg: 'lib/assets/images/trigo.png', - // title: 'Trigo', - // onTap: (){ - // context.push(CategoriaScreen.path, extra: 'Trijo'); - // } - // ) + SizedBox(width: 20), + CardInfoCardWidget( + svg: 'lib/assets/images/masculino.png', + title: 'Palm', + onTap: (){ + // context.push(CategoriaScreen.path, extra: 'Milho'); + } + ) ] ), const SizedBox(height: 20), + Row( + children: [ + CardInfoCardWidget( + svg: 'lib/assets/images/masculino.png', + title: 'Inoperante', + onTap: (){ + context.push(CategoriaScreen.path, extra: 'Cana'); + }, + ), + SizedBox(width: 20), + CardInfoCardWidget( + svg: 'lib/assets/images/masculino.png', + title: 'Inoperante', + onTap: (){ + // context.push(CategoriaScreen.path, extra: 'Milho'); + } + ) + ] + ), const SizedBox(height: 20), ] ), diff --git a/lib/src/app/home/widgets/card_info_card.dart b/lib/src/app/home/widgets/card_info_card.dart index c6fb58b..c037e5c 100644 --- a/lib/src/app/home/widgets/card_info_card.dart +++ b/lib/src/app/home/widgets/card_info_card.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_font_icons/flutter_font_icons.dart'; import 'package:tacban/assets/theme/colors.dart'; class CardInfoCardWidget extends StatelessWidget { @@ -14,7 +15,7 @@ class CardInfoCardWidget extends StatelessWidget { onTap: onTap, radius: 0, child: Container( - height: 200, + height: 150, decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(18), @@ -27,31 +28,39 @@ class CardInfoCardWidget extends StatelessWidget { ) ] ), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - child: Image.asset( - svg, - fit: BoxFit.fill - ) - ), - const SizedBox(height: 10), - Text(title, - style: Theme.of(context).textTheme.bodySmall?.copyWith( - fontWeight: FontWeight.bold, - color: AppColorLight.primaryColor, - fontSize: 15 + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CircleAvatar( + radius: 30, + child: Icon(Feather.key, color: Colors.white, size: 30,), ), - ), - const SizedBox(height: 5), - Text('Maurício P. Batistella Pasini', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - fontWeight: FontWeight.w200, - fontSize: 11 + // SizedBox( + // child: Image.asset( + // svg, + // fit: BoxFit.fill + // ) + // ), + const SizedBox(height: 20), + Text(title, + style: Theme.of(context).textTheme.bodySmall?.copyWith( + fontWeight: FontWeight.bold, + color: AppColorLight.primaryColor, + fontSize: 20 + ), ), - ) - ], + const SizedBox(height: 5), + // Text('Maurício P. Batistella Pasini', + // style: Theme.of(context).textTheme.bodySmall?.copyWith( + // fontWeight: FontWeight.w200, + // fontSize: 11 + // ), + // ) + ], + ), ), ), )