diff --git a/lib/assets/images/bg_header.png b/lib/assets/images/bg_header.png new file mode 100644 index 0000000..c61e532 Binary files /dev/null and b/lib/assets/images/bg_header.png differ diff --git a/lib/assets/images/bg_header.svg b/lib/assets/images/bg_header.svg new file mode 100644 index 0000000..c9a6b19 --- /dev/null +++ b/lib/assets/images/bg_header.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/lib/assets/logos/logo_branca.png b/lib/assets/logos/logo_branca.png new file mode 100644 index 0000000..2c70150 Binary files /dev/null and b/lib/assets/logos/logo_branca.png differ diff --git a/lib/assets/logos/logo_letra_branca.png b/lib/assets/logos/logo_letra_branca.png new file mode 100644 index 0000000..98a0a59 Binary files /dev/null and b/lib/assets/logos/logo_letra_branca.png differ diff --git a/lib/assets/logos/logo_letra_primary.png b/lib/assets/logos/logo_letra_primary.png new file mode 100644 index 0000000..2022bbb Binary files /dev/null and b/lib/assets/logos/logo_letra_primary.png differ diff --git a/lib/assets/logos/logo_primary.png b/lib/assets/logos/logo_primary.png new file mode 100644 index 0000000..d053ac1 Binary files /dev/null and b/lib/assets/logos/logo_primary.png differ diff --git a/lib/assets/logos/old/logo_branca.png b/lib/assets/logos/old/logo_branca.png new file mode 100644 index 0000000..341f41a Binary files /dev/null and b/lib/assets/logos/old/logo_branca.png differ diff --git a/lib/assets/logos/old/logo_primary.png b/lib/assets/logos/old/logo_primary.png new file mode 100644 index 0000000..5255d6c Binary files /dev/null and b/lib/assets/logos/old/logo_primary.png differ diff --git a/lib/src/app/auth/screens/login.dart b/lib/src/app/auth/screens/login.dart index 4c0bcc9..0918753 100644 --- a/lib/src/app/auth/screens/login.dart +++ b/lib/src/app/auth/screens/login.dart @@ -51,9 +51,10 @@ class _LoginScreenState extends ConsumerState { appBar: const PreferredSize(child: SizedBox(), preferredSize: Size.fromHeight(0)), body: SingleChildScrollView( child: Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage('lib/assets/images/bg_ouside_login.png'), + decoration: BoxDecoration( + color: Theme.of(context).primaryColor, + image: const DecorationImage( + image: AssetImage('lib/assets/images/bg_header.png'), fit: BoxFit.cover, ) ), @@ -65,9 +66,9 @@ class _LoginScreenState extends ConsumerState { child: Center( child: SizedBox( child: Image.asset( - 'lib/assets/logos/splash_logo.png', + 'lib/assets/logos/logo_letra_branca.png', fit: BoxFit.fill, - width: 180 + width: 200 ) ) ), diff --git a/lib/src/app/base/screens/splash.dart b/lib/src/app/base/screens/splash.dart index f5b407b..21baaa0 100644 --- a/lib/src/app/base/screens/splash.dart +++ b/lib/src/app/base/screens/splash.dart @@ -19,7 +19,7 @@ class _SlapshScreenState extends ConsumerState { @override void initState() { - Future.delayed(const Duration(seconds: 2)).then((value)async{ + Future.delayed(const Duration(seconds: 3)).then((value)async{ context.go(LoginScreen.path); }); super.initState(); @@ -30,7 +30,13 @@ class _SlapshScreenState extends ConsumerState { return Scaffold( key: _scaffoldKey, backgroundColor: Theme.of(context).primaryColor, - body: SizedBox( + body: Container( + decoration: const BoxDecoration( + image: DecorationImage( + image: AssetImage('lib/assets/images/bg_header.png'), + fit: BoxFit.cover, + ) + ), width: MediaQuery.of(context).size.width, child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -40,12 +46,13 @@ class _SlapshScreenState extends ConsumerState { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - // SizedBox( - // child: Image.asset( - // 'lib/assets/logos/splash_logo.png', - // fit: BoxFit.fill - // ) - // ), + SizedBox( + child: Image.asset( + 'lib/assets/logos/logo_letra_branca.png', + width: 300, + fit: BoxFit.fill + ) + ), ] ) ], diff --git a/lib/src/shared/widgets/buttons/simple_button.dart b/lib/src/shared/widgets/buttons/simple_button.dart index 00d51e0..db671b0 100644 --- a/lib/src/shared/widgets/buttons/simple_button.dart +++ b/lib/src/shared/widgets/buttons/simple_button.dart @@ -98,35 +98,35 @@ class _ButtonWidgetState extends State { if((type == TypeButton.cancel)||(type == TypeButton.secondary) && disabled){ return BoxDecoration( border: Border.all(width: 2, color: AppColorLight.text04Color), - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ); } if(type == TypeButton.primary && disabled){ return BoxDecoration( color: AppColorLight.text04Color, - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ); } if(type == TypeButton.cancel){ return BoxDecoration( border: Border.all(width: 2, color: AppColorLight.text04Color), - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ); } if(type == TypeButton.secondary){ return BoxDecoration( border: Border.all(width: 2, color: widget.color ?? Theme.of(context).primaryColor), color: isHover ? widget.color ?? Theme.of(context).primaryColor : null, - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ); } // Default is primary return BoxDecoration( color: isHover ? widget.color?.withOpacity(.8) ?? Theme.of(context).primaryColor.withOpacity(.8) : widget.color ?? Theme.of(context).primaryColor, - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ); } } \ No newline at end of file diff --git a/lib/src/shared/widgets/inputs/password_input.dart b/lib/src/shared/widgets/inputs/password_input.dart index 3a25221..9f6bee2 100644 --- a/lib/src/shared/widgets/inputs/password_input.dart +++ b/lib/src/shared/widgets/inputs/password_input.dart @@ -43,7 +43,7 @@ class _PasswordInputState extends State { width: 2, color: InputUtils.getColorBorder(statusValided: statusValided, enabled: true) ), - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ), child: TextFormField( controller: widget.controller, diff --git a/lib/src/shared/widgets/inputs/simple_input.dart b/lib/src/shared/widgets/inputs/simple_input.dart index 795f16a..6df9bb4 100644 --- a/lib/src/shared/widgets/inputs/simple_input.dart +++ b/lib/src/shared/widgets/inputs/simple_input.dart @@ -65,7 +65,7 @@ class _SimpleInputState extends State { // color: widget.enabled == false ? AppColorLight.text05Color : isvalidate ? AppColorLight.text04Color : AppColorLight.erroColor ), color: widget.enabled == false ? AppColorLight.text05Color : null, - borderRadius: BorderRadius.circular(60) + borderRadius: BorderRadius.circular(10) ), child: TextFormField( controller: widget.controller,