From daa3f5f1c6b4868178777e54925fc0e87bd934e4 Mon Sep 17 00:00:00 2001 From: Rajshinde046 Date: Mon, 18 Mar 2024 14:40:29 +0530 Subject: [PATCH] login screen --- assets/images/png/apple.png | Bin 0 -> 1378 bytes assets/images/png/google.png | Bin 0 -> 2915 bytes assets/images/png/india.png | Bin 0 -> 1629 bytes assets/images/svg/india.svg | 9 ++ lib/Utils/Common/CustomTextFormField.dart | 2 +- lib/Utils/Common/text.dart | 54 ++++++- lib/view/login/LoginScreen.dart | 179 ++++++++++++++++++++-- 7 files changed, 222 insertions(+), 22 deletions(-) create mode 100644 assets/images/png/apple.png create mode 100644 assets/images/png/google.png create mode 100644 assets/images/png/india.png create mode 100644 assets/images/svg/india.svg diff --git a/assets/images/png/apple.png b/assets/images/png/apple.png new file mode 100644 index 0000000000000000000000000000000000000000..21beb2b985a497c90351df0e20e6a99b03ddf8d2 GIT binary patch literal 1378 zcmV-o1)chdP)@~0drDELIAGL9O(c600d`2O+f$vv5yPDfDl3mA%qY@2qATafaRelu0KVQ3x$5_-;q#g&nU<{D?R4hKHJRePpOgDpl#jRMaHJh#P& z#jTP7?eA)=VYzBlw2KFXwVACGkZ~gSkAGM6+L3dIz~-@U)rNMyM!_hO?)2u{8f_EJ z{(hqNuiBN`rFMd@2E5lizEAhs77t(B#Qy=Gd*JqZd)-Gh8y~+P`Z=n{govK?P@5_7 zIcKt`MSyti*D`!U2}fK)w1kAU26gjF#dXih zOdg`6_co}T(;VU&$vs#?9qkk?;AZOBE>JU9g-7IrwWTy7u+Qaif zZh=#KaLq%b?A~i66IenLo9B9KX%tZ;p3;M>p4d?D{SyU1fzz-?A*2-eDe9$|EtXOW zTyy(dOn!7qfg99Ii$dT|cN2#KPaF!Ih6aT|fzwdT2!aBqp_n;@+(m z1#VF{KcWCq3j7guQ$+rEN`Ws?H}ew0G(&V+vU_o|j1J~wU1J^1qeOH93UvgpNMlDxz;$5w{);?E>6 z5YLfSNiPn#6o}{AZI)i_w7o;Fyy#=poebc%y+am(4Qs}yvkd98MVwt2D*!B1H<%_X z71!N+jUviN9rFwLQpCIA0|OcYZe9K+W!riEp)JfHGzvxCqZVQuj%OoQy=8pT!k z$4=MSd)A$}*~j_C9uTb^uM>UPS9)oSFsWh(Q(BwY)h;&(V{kkCd5-;1jJU;PH9fLB zD?5m5NNTEt<7St#`!Towh(jvuq_7(%{m=I`VIF+~w}kVI7t-(a@&DESQ?p#>;%4NE z4biuWqAd`@X;Sgc$jv%vm-{|&DthD#gb;3jKe_Smwc6iy?U~a-SA-Bk2qAn`PxXHwA*6q-Bme*a07*qoM6N<$g3g?c>;M1& literal 0 HcmV?d00001 diff --git a/assets/images/png/google.png b/assets/images/png/google.png new file mode 100644 index 0000000000000000000000000000000000000000..28cad7bc01c87d5b4426139dca359e406d72e650 GIT binary patch literal 2915 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 + + + + + + + + diff --git a/lib/Utils/Common/CustomTextFormField.dart b/lib/Utils/Common/CustomTextFormField.dart index bca2da0..d7156b2 100644 --- a/lib/Utils/Common/CustomTextFormField.dart +++ b/lib/Utils/Common/CustomTextFormField.dart @@ -56,7 +56,7 @@ class _CustomTextFormFieldState extends State { borderRadius: 8, blur: 10, alignment: Alignment.bottomCenter, - border: 2, + border: 0.8, linearGradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/Utils/Common/text.dart b/lib/Utils/Common/text.dart index db4b0da..631d1bc 100644 --- a/lib/Utils/Common/text.dart +++ b/lib/Utils/Common/text.dart @@ -1,13 +1,57 @@ -import 'package:flutter/widgets.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -Widget textgray14W400cambria(String text) { +Widget text18W800(String text) { + return Text( + text, + style: TextStyle( + fontSize: 18.sp, + color: Colors.white, + fontWeight: FontWeight.w800, + fontFamily: 'manrope'), + ); +} + +Widget text18W600(String text) { + return Text( + text, + style: TextStyle( + fontSize: 18.sp, + color: Colors.white, + fontWeight: FontWeight.w600, + fontFamily: 'manrope'), + ); +} + +Widget text16W400(String text) { + return Text( + text, + style: TextStyle( + fontSize: 16.sp, + color: Colors.white, + fontWeight: FontWeight.w400, + fontFamily: 'manrope'), + ); +} + +Widget text16W700(String text) { + return Text( + text, + style: TextStyle( + fontSize: 16.sp, + color: Colors.white, + fontWeight: FontWeight.w700, + fontFamily: 'manrope'), + ); +} + +Widget text14W300(String text) { return Text( text, style: TextStyle( fontSize: 14.sp, - color: const Color(0xffA1A1A1), - fontWeight: FontWeight.w400, - fontFamily: 'Cambria'), + color: Colors.white, + fontWeight: FontWeight.w300, + fontFamily: 'manrope'), ); } diff --git a/lib/view/login/LoginScreen.dart b/lib/view/login/LoginScreen.dart index db88916..026edda 100644 --- a/lib/view/login/LoginScreen.dart +++ b/lib/view/login/LoginScreen.dart @@ -2,9 +2,12 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:glassmorphism/glassmorphism.dart'; import 'package:traderscircuit/Utils/Common/CustomTextFormField.dart'; import 'package:traderscircuit/Utils/Common/commonBotton.dart'; +import 'package:traderscircuit/Utils/Common/text.dart'; +import 'package:traderscircuit/main.dart'; import 'package:traderscircuit/view/onBoarding/splashScreen1.dart'; class LoginScreen extends StatefulWidget { @@ -34,7 +37,7 @@ class _LoginScreenState extends State { // crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( - height: 70.h, + height: 20.h, ), const Row( mainAxisAlignment: MainAxisAlignment.center, @@ -61,13 +64,7 @@ class _LoginScreenState extends State { SizedBox( height: 10.h, ), - const Text( - "Enter your mobile number to get otp", - style: TextStyle( - color: Colors.white, - fontSize: 18, - fontWeight: FontWeight.w800), - ), + text18W800("Enter your mobile number to get otp"), SizedBox( height: 35.h, ), @@ -79,7 +76,7 @@ class _LoginScreenState extends State { borderRadius: 8, blur: 10, alignment: Alignment.center, - border: 2, + border: 0.8, linearGradient: LinearGradient( begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -103,7 +100,15 @@ class _LoginScreenState extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.flag), + // SvgPicture.asset("assets/images/svg/india.svg"), + Image.asset( + "assets/images/png/india.png", + height: 25.h, + width: 25.h, + ), + SizedBox( + width: 2, + ), Text( "+91", style: TextStyle( @@ -118,7 +123,7 @@ class _LoginScreenState extends State { width: 10, ), Container( - width: 250, + width: 285.w, child: CustomTextFormField(), ) ], @@ -126,12 +131,154 @@ class _LoginScreenState extends State { SizedBox( height: 10, ), - Text( - "We’ll send six digit code to the registered number. Standard data rates may apply", - style: TextStyle( - color: Colors.white, - fontSize: 14, + text14W300( + "We’ll send six digit code to the registered number. Standard data rates may apply"), + SizedBox( + height: 65.h, + ), + CommonBtn(text: "Login/Signup", onTap: () {}), + SizedBox( + height: 10.h, + ), + text14W300( + "By continuing, you agree to our Terms & Conditions"), + SizedBox( + height: 45.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + height: 0.2.h, + width: 108.w, + color: Colors.white, + ), + SizedBox( + width: 22.w, + ), + text18W600("OR"), + SizedBox( + width: 22.w, + ), + Container( + height: 0.2.h, + width: 108.w, + color: Colors.white, + ), + ], + ), + SizedBox( + height: 40.h, + ), + GlassmorphicContainer( + width: double.infinity, + height: 55.h, + borderRadius: 8, + linearGradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xFFffffff).withOpacity(0.1), + Color(0xFFFFFFFF).withOpacity(0.05), + ], + stops: [ + 0.1, + 1, + ]), + border: 0.3, + blur: 10, + borderGradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xFFAF2E89).withOpacity(0.2), + Color(0xFFA23E31).withOpacity(0.2), + Color(0xFF0000).withOpacity(0.2), + ], + stops: [ + 0.3, + 0.6, + 1, + ]), + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + "assets/images/png/apple.png", + height: 30.h, + width: 30.w, + ), + SizedBox( + width: 7.h, + ), + text16W400("Continue with apple"), + ], + ), ), + ), + SizedBox( + height: 15.h, + ), + GlassmorphicContainer( + width: double.infinity, + height: 55.h, + borderRadius: 8, + linearGradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xFFffffff).withOpacity(0.1), + Color(0xFFFFFFFF).withOpacity(0.05), + ], + stops: [ + 0.1, + 1, + ]), + border: 0.5, + blur: 10, + borderGradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + Color(0xFFAF2E89).withOpacity(0.2), + Color(0xFFA23E31).withOpacity(0.2), + Color(0xFF0000).withOpacity(0.2), + ], + stops: [ + 0.3, + 0.6, + 1, + ]), + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + "assets/images/png/google.png", + height: 30.h, + width: 30.w, + ), + SizedBox( + width: 7.h, + ), + text16W400( + "Continue with google", + ), + ], + ), + ), + ), + SizedBox( + height: 45.h, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + text16W700( + "Continue as guest", + ), + ], ) ], ),