2026-04-15
This commit is contained in:
mageshwaran committed
1 parent
d01e5ba860
commit
96de59e9be
46 files changed
+1299
-1191
No files matched your search
@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:taxglide/consts/app_asstes.dart';
|
||||
import 'package:taxglide/consts/app_colors.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:taxglide/consts/comman_button.dart';
|
||||
import 'package:taxglide/consts/comman_container_auth.dart';
|
||||
import 'package:taxglide/consts/comman_textformfileds.dart';
|
||||
@@ -100,7 +101,13 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
final spacingMD = r.spacing(mobile: 20, tablet: 20, desktop: 24);
|
||||
final spacingLG = r.spacing(mobile: 20, tablet: 22, desktop: 28);
|
||||
|
||||
return Scaffold(
|
||||
return PopScope(
|
||||
canPop: false,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (didPop) return;
|
||||
Get.offAllNamed(ConstRouters.login);
|
||||
},
|
||||
child: Scaffold(
|
||||
resizeToAvoidBottomInset: true,
|
||||
body: Container(
|
||||
width: double.infinity,
|
||||
@@ -141,10 +148,8 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
Text(
|
||||
"Login",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: titleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.01 * titleFontSize,
|
||||
color: AppColors.authheading,
|
||||
@@ -156,10 +161,8 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
Text(
|
||||
"Enter your registered Mobile Number",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: subtitleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * subtitleFontSize,
|
||||
color: AppColors.authleading,
|
||||
@@ -180,9 +183,7 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: "By signing up, you agree to the ",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
@@ -191,9 +192,7 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Terms of Service ",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Bold',
|
||||
fontWeight: FontWeight.w700,
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
@@ -202,20 +201,16 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
),
|
||||
TextSpan(
|
||||
text: "and ",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: termsFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
),
|
||||
TextSpan(
|
||||
text: "Data Processing Agreement",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Bold',
|
||||
fontWeight: FontWeight.w700,
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
@@ -242,13 +237,11 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
Text(
|
||||
"Other Login",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Inter',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: otherLoginFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.13,
|
||||
color: const Color(0xFF6C7278),
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -257,14 +250,16 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: "User Login? ",
|
||||
style: TextStyle(fontSize: linkFontSize),
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: linkFontSize,
|
||||
color: AppColors.black,
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Click Here",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: linkFontSize,
|
||||
color: AppColors.authsignup,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
@@ -282,6 +277,7 @@ class _EmployeeLoginScreenState extends ConsumerState<EmployeeLoginScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -247,7 +247,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
"Enter OTP",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontSize: titleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.3,
|
||||
@@ -262,7 +262,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
"OTP has been sent to your registered mobile number",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontSize: subtitleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.4,
|
||||
@@ -277,7 +277,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
TextSpan(
|
||||
text: mobile,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: mobileFontSize,
|
||||
height: 1.8,
|
||||
@@ -288,7 +288,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
TextSpan(
|
||||
text: " ( Change Number )",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-ExtraBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w800,
|
||||
fontSize: mobileFontSize,
|
||||
height: 1.8,
|
||||
@@ -347,7 +347,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
maxLength: 1,
|
||||
enabled: !isLoading,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: otpFontSize,
|
||||
letterSpacing: 0.03 * otpFontSize,
|
||||
@@ -375,7 +375,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
"Resend",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: resendFontSize,
|
||||
height: 1.4,
|
||||
@@ -393,7 +393,7 @@ class _EmployeeOtpScreenState extends ConsumerState<EmployeeOtpScreen> {
|
||||
Text(
|
||||
_formatTime(_remainingSeconds),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: timerFontSize,
|
||||
color: _remainingSeconds > 0
|
||||
|
||||
+28
-20
@@ -12,6 +12,7 @@ import 'package:taxglide/consts/responsive_helper.dart';
|
||||
import 'package:taxglide/consts/validation_popup.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/router/consts_routers.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
|
||||
class LoginScreen extends ConsumerStatefulWidget {
|
||||
const LoginScreen({super.key});
|
||||
@@ -102,7 +103,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
final spacingMD = r.spacing(mobile: 20, tablet: 22, desktop: 26);
|
||||
final spacingLG = r.spacing(mobile: 20, tablet: 22, desktop: 28);
|
||||
|
||||
return Scaffold(
|
||||
return PopScope(
|
||||
canPop: true,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
// Handle custom behavior here if needed in the future
|
||||
},
|
||||
child: Scaffold(
|
||||
resizeToAvoidBottomInset: true,
|
||||
body: Container(
|
||||
width: double.infinity,
|
||||
@@ -141,10 +147,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
// Title
|
||||
Text(
|
||||
"Login",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: titleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: AppColors.authheading,
|
||||
),
|
||||
),
|
||||
@@ -154,8 +158,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Text(
|
||||
"Enter your Mobile Number",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: subtitleFontSize,
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
@@ -175,15 +178,14 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: "By signing up, you agree to the ",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Terms of Service ",
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.w700,
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: termsFontSize,
|
||||
color: AppColors.authtermsandcondition,
|
||||
),
|
||||
@@ -259,21 +261,26 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
),
|
||||
|
||||
SizedBox(height: spacingSM),
|
||||
const Text("Or"),
|
||||
Text("Or",style: AppTextStyles.medium.copyWith(
|
||||
fontSize: spacingSM,
|
||||
color: AppColors.authleading,
|
||||
),),
|
||||
SizedBox(height: spacingSM),
|
||||
|
||||
// Sign up
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: "Didn't Have account? ",
|
||||
style: TextStyle(fontSize: signupFontSize),
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: signupFontSize,
|
||||
color: AppColors.black,
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Sign Up",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: signupFontSize,
|
||||
color: AppColors.authsignup,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
@@ -298,13 +305,11 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Text(
|
||||
"Other Login",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Inter',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: otherLoginFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.13,
|
||||
color: const Color(0xFF6C7278),
|
||||
color: AppColors.authleading,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -313,14 +318,16 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: "Staff Login? ",
|
||||
style: TextStyle(fontSize: signupFontSize),
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: signupFontSize,
|
||||
color: AppColors.black,
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Click Here",
|
||||
style: TextStyle(
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
fontSize: signupFontSize,
|
||||
color: AppColors.authsignup,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
@@ -338,6 +345,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/router/consts_routers.dart';
|
||||
|
||||
import 'package:taxglide/view/Main_controller/main_controller.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
|
||||
class OtpScreen extends ConsumerStatefulWidget {
|
||||
const OtpScreen({super.key});
|
||||
@@ -248,10 +249,8 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
Text(
|
||||
"Enter OTP",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: titleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.01 * titleFontSize,
|
||||
color: AppColors.authheading,
|
||||
@@ -263,10 +262,8 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
Text(
|
||||
"OTP has been sent to your registered mobile number",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: subtitleFontSize,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * subtitleFontSize,
|
||||
color: AppColors.authleading,
|
||||
@@ -278,9 +275,7 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: mobile,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: mobileFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
@@ -289,9 +284,7 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: " ( Change Number )",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-ExtraBold',
|
||||
fontWeight: FontWeight.w800,
|
||||
style: AppTextStyles.extraBold.copyWith(
|
||||
fontSize: mobileFontSize,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.04,
|
||||
@@ -349,7 +342,7 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
maxLength: 1,
|
||||
enabled: !isLoading,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: otpFontSize,
|
||||
letterSpacing: 0.03 * otpFontSize,
|
||||
@@ -376,9 +369,7 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
child: Text(
|
||||
"Resend",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: resendFontSize,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.02 * resendFontSize,
|
||||
@@ -394,9 +385,7 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
|
||||
// Timer
|
||||
Text(
|
||||
_formatTime(_remainingSeconds),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: timerFontSize,
|
||||
color: _remainingSeconds > 0
|
||||
? AppColors.authheading
|
||||
|
||||
@@ -11,6 +11,7 @@ import 'package:taxglide/consts/validation_popup.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/router/consts_routers.dart';
|
||||
import 'package:taxglide/view/Main_controller/main_controller.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
|
||||
class RegisterOtpScreen extends ConsumerStatefulWidget {
|
||||
const RegisterOtpScreen({super.key});
|
||||
@@ -247,10 +248,8 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
Text(
|
||||
"Enter OTP",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 32,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.01 * 32,
|
||||
color: AppColors.authheading,
|
||||
@@ -260,10 +259,8 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
Text(
|
||||
"OTP has been sent to your registered mobile number",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.03 * 14,
|
||||
color: AppColors.authleading,
|
||||
@@ -273,9 +270,7 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
text: mobile,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: 13,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.01,
|
||||
@@ -284,9 +279,7 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: " ( Change Number )",
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-ExtraBold',
|
||||
fontWeight: FontWeight.w800,
|
||||
style: AppTextStyles.extraBold.copyWith(
|
||||
fontSize: 13,
|
||||
height: 1.8,
|
||||
letterSpacing: 0.04,
|
||||
@@ -346,7 +339,7 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
maxLength: 1,
|
||||
enabled: !isLoading,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 28,
|
||||
letterSpacing: 0.03 * 28,
|
||||
@@ -373,9 +366,7 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
child: Text(
|
||||
"Resend",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: 14,
|
||||
height: 1.4,
|
||||
letterSpacing: 0.02 * 14,
|
||||
@@ -391,9 +382,7 @@ class _RegisterOtpScreenState extends ConsumerState<RegisterOtpScreen> {
|
||||
// Timer Display
|
||||
Text(
|
||||
_formatTime(_remainingSeconds),
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 16,
|
||||
color: _remainingSeconds > 0
|
||||
? AppColors.authheading
|
||||
|
||||
+16
-13
@@ -9,6 +9,7 @@ import 'package:taxglide/consts/comman_textformfileds.dart';
|
||||
import 'package:taxglide/consts/validation_popup.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
import 'package:taxglide/router/consts_routers.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
|
||||
class SignupScreen extends ConsumerStatefulWidget {
|
||||
const SignupScreen({super.key});
|
||||
@@ -89,7 +90,13 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
);
|
||||
});
|
||||
|
||||
return Scaffold(
|
||||
return PopScope(
|
||||
canPop: false,
|
||||
onPopInvokedWithResult: (didPop, result) {
|
||||
if (didPop) return;
|
||||
Get.offAllNamed(ConstRouters.login);
|
||||
},
|
||||
child: Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
// 🌈 Background gradient
|
||||
@@ -131,10 +138,8 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
Text(
|
||||
"Sign Up",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 32,
|
||||
fontWeight: FontWeight.w600,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.01 * 32,
|
||||
color: AppColors.authheading,
|
||||
@@ -148,10 +153,9 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
"Name*",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 14,
|
||||
color: AppColors.authleading,
|
||||
color: AppColors.authheading,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -177,10 +181,9 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
"Contact Number *",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 14,
|
||||
color: AppColors.authleading,
|
||||
color: AppColors.authheading,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -206,10 +209,9 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
alignment: Alignment.centerLeft,
|
||||
child: Text(
|
||||
"Email *",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 14,
|
||||
color: AppColors.authleading,
|
||||
color: AppColors.authheading,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -247,6 +249,7 @@ class _SignupScreenState extends ConsumerState<SignupScreen> {
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user