diff --git a/assets/images/png/apple.png b/assets/images/png/apple.png
new file mode 100644
index 0000000..21beb2b
Binary files /dev/null and b/assets/images/png/apple.png differ
diff --git a/assets/images/png/google.png b/assets/images/png/google.png
new file mode 100644
index 0000000..28cad7b
Binary files /dev/null and b/assets/images/png/google.png differ
diff --git a/assets/images/png/india.png b/assets/images/png/india.png
new file mode 100644
index 0000000..83a0810
Binary files /dev/null and b/assets/images/png/india.png differ
diff --git a/assets/images/svg/india.svg b/assets/images/svg/india.svg
new file mode 100644
index 0000000..38f4cda
--- /dev/null
+++ b/assets/images/svg/india.svg
@@ -0,0 +1,9 @@
+
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",
+ ),
+ ],
)
],
),