BASE: Switch From EasyLocalization To GetX Localization.
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../../controllers/forgot_password_controller.dart';
|
||||
import '../../controllers/theme_controller.dart';
|
||||
import '../../themes/app_them_data.dart';
|
||||
@@ -38,7 +39,7 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.skip.tr(),
|
||||
ConstTexts.skip.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -74,7 +75,7 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.enterYourregisteredEmail.tr(),
|
||||
ConstTexts.enterYourregisteredEmail.tr,
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
@@ -85,14 +86,14 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.emailAddress.tr(),
|
||||
title: ConstTexts.emailAddress.tr,
|
||||
hintText: "abdusalom@gmail.com",
|
||||
controller: controller.emailEditingController.value,
|
||||
),
|
||||
const SizedBox(height: 30),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.sendLink.tr(),
|
||||
title: ConstTexts.sendLink.tr,
|
||||
onPress: controller.forgotPassword,
|
||||
color:
|
||||
isDark
|
||||
@@ -112,7 +113,7 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
child: Center(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: ConstTexts.rememberPassword.tr(),
|
||||
text: ConstTexts.rememberPassword.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -121,7 +122,7 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: ConstTexts.login.tr(),
|
||||
text: ConstTexts.login.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color: AppThemeData.ecommerce300,
|
||||
decoration: TextDecoration.underline,
|
||||
@@ -130,7 +131,7 @@ class ForgotPasswordScreen extends StatelessWidget {
|
||||
recognizer:
|
||||
TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
},
|
||||
),
|
||||
],
|
||||
|
||||
@@ -3,7 +3,8 @@ import 'dart:io';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
|
||||
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
@@ -13,7 +14,7 @@ import '../../controllers/theme_controller.dart';
|
||||
import '../../themes/app_them_data.dart';
|
||||
import '../../themes/round_button_fill.dart';
|
||||
import '../../themes/text_field_widget.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'forgot_password_screen.dart';
|
||||
import 'mobile_login_screen.dart';
|
||||
|
||||
@@ -38,7 +39,7 @@ class LoginScreen extends StatelessWidget {
|
||||
child: Row(
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.skip.tr(),
|
||||
ConstTexts.skip.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -72,7 +73,7 @@ class LoginScreen extends StatelessWidget {
|
||||
children: [
|
||||
const SizedBox(height: 20),
|
||||
Text(
|
||||
ConstTexts.loginToExplore.tr(),
|
||||
ConstTexts.loginToExplore.tr,
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
@@ -83,15 +84,15 @@ class LoginScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.emailAddress.tr(),
|
||||
title: ConstTexts.emailAddress.tr,
|
||||
hintText: "abdusalom@gmail.com",
|
||||
controller: controller.emailController.value,
|
||||
focusNode: controller.emailFocusNode,
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.password.tr(),
|
||||
hintText: ConstTexts.enterPassword.tr(),
|
||||
title: ConstTexts.password.tr,
|
||||
hintText: ConstTexts.enterPassword.tr,
|
||||
controller: controller.passwordController.value,
|
||||
obscureText: controller.passwordVisible.value,
|
||||
focusNode: controller.passwordFocusNode,
|
||||
@@ -133,7 +134,7 @@ class LoginScreen extends StatelessWidget {
|
||||
() => const ForgotPasswordScreen(),
|
||||
),
|
||||
child: Text(
|
||||
ConstTexts.forgotPassword.tr(),
|
||||
ConstTexts.forgotPassword.tr,
|
||||
style: AppThemeData.semiBoldTextStyle(
|
||||
color: AppThemeData.info400,
|
||||
),
|
||||
@@ -143,7 +144,7 @@ class LoginScreen extends StatelessWidget {
|
||||
const SizedBox(height: 20),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.login.tr(),
|
||||
title: ConstTexts.login.tr,
|
||||
onPress: controller.loginWithEmail,
|
||||
color:
|
||||
isDark
|
||||
@@ -168,7 +169,7 @@ class LoginScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
Text(
|
||||
ConstTexts.orContinueWith.tr(),
|
||||
ConstTexts.orContinueWith.tr,
|
||||
style: AppThemeData.regularTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -192,7 +193,7 @@ class LoginScreen extends StatelessWidget {
|
||||
const SizedBox(height: 25),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.mobileNumber.tr(),
|
||||
title: ConstTexts.mobileNumber.tr,
|
||||
onPress:
|
||||
() => Get.to(() => const MobileLoginScreen()),
|
||||
isRight: false,
|
||||
@@ -218,7 +219,7 @@ class LoginScreen extends StatelessWidget {
|
||||
Expanded(
|
||||
child: RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.withGoogle.tr(),
|
||||
title: ConstTexts.withGoogle.tr,
|
||||
textColor:
|
||||
isDark
|
||||
? AppThemeData.grey100
|
||||
@@ -242,7 +243,7 @@ class LoginScreen extends StatelessWidget {
|
||||
? Expanded(
|
||||
child: RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.withApple.tr(),
|
||||
title: ConstTexts.withApple.tr,
|
||||
isCenter: true,
|
||||
textColor:
|
||||
isDark
|
||||
@@ -273,7 +274,7 @@ class LoginScreen extends StatelessWidget {
|
||||
child: Center(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: "${ConstTexts.dontHaveAccount.tr()} ",
|
||||
text: "${ConstTexts.dontHaveAccount.tr} ",
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -282,7 +283,7 @@ class LoginScreen extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: ConstTexts.signUp.tr(),
|
||||
text: ConstTexts.signUp.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color: AppThemeData.ecommerce300,
|
||||
decoration: TextDecoration.underline,
|
||||
@@ -290,7 +291,7 @@ class LoginScreen extends StatelessWidget {
|
||||
recognizer:
|
||||
TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
Get.offAll(() => const SignUpScreen());
|
||||
Get.offAll(SignUpScreen());
|
||||
},
|
||||
),
|
||||
],
|
||||
|
||||
@@ -2,12 +2,13 @@ import 'package:country_code_picker/country_code_picker.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
|
||||
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import '../../constant/assets.dart';
|
||||
import '../../constant/constant.dart';
|
||||
import '../../controllers/mobile_login_controller.dart';
|
||||
@@ -55,7 +56,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.skip.tr(),
|
||||
ConstTexts.skip.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -91,7 +92,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.useYourMobileNumber.tr(),
|
||||
ConstTexts.useYourMobileNumber.tr,
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
@@ -102,8 +103,8 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 25),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.mobileNumber.tr(),
|
||||
hintText: ConstTexts.enterMobileNumber.tr(),
|
||||
title: ConstTexts.mobileNumber.tr,
|
||||
hintText: ConstTexts.enterMobileNumber.tr,
|
||||
controller: controller.mobileController.value,
|
||||
textInputType:
|
||||
const TextInputType.numberWithOptions(
|
||||
@@ -182,7 +183,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
const SizedBox(height: 30),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.sendCode.tr(),
|
||||
title: ConstTexts.sendCode.tr,
|
||||
onPress: controller.sendOtp,
|
||||
color:
|
||||
isDark
|
||||
@@ -207,7 +208,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
Text(
|
||||
ConstTexts.orContinueWith.tr(),
|
||||
ConstTexts.orContinueWith.tr,
|
||||
style: AppThemeData.regularTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -229,7 +230,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
const SizedBox(height: 25),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.emailAddress.tr(),
|
||||
title: ConstTexts.emailAddress.tr,
|
||||
onPress: () => Get.to(() => const SignUpScreen()),
|
||||
isRight: false,
|
||||
isCenter: true,
|
||||
@@ -257,7 +258,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
child: Center(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: "${ConstTexts.dontHaveAccount.tr()} ",
|
||||
text: "${ConstTexts.dontHaveAccount.tr} ",
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -266,7 +267,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: ConstTexts.signUp.tr(),
|
||||
text: ConstTexts.signUp.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color: AppThemeData.ecommerce300,
|
||||
decoration: TextDecoration.underline,
|
||||
@@ -276,7 +277,7 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
recognizer:
|
||||
TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
Get.offAll(() => const SignUpScreen());
|
||||
Get.offAll(SignUpScreen());
|
||||
},
|
||||
),
|
||||
],
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'package:pin_code_fields/pin_code_fields.dart';
|
||||
import '../../constant/assets.dart';
|
||||
import '../../controllers/otp_verification_controller.dart';
|
||||
@@ -51,7 +52,7 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.skip.tr(),
|
||||
ConstTexts.skip.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -87,7 +88,7 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"${ConstTexts.enterOtpSent.tr()} ${controller.countryCode} ${controller.maskPhoneNumber(controller.phoneNumber.value)}",
|
||||
"${ConstTexts.enterOtpSent.tr} ${controller.countryCode} ${controller.maskPhoneNumber(controller.phoneNumber.value)}",
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
@@ -165,7 +166,7 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
controller.sendOTP();
|
||||
},
|
||||
child: Text(
|
||||
ConstTexts.resendOTP.tr(),
|
||||
ConstTexts.resendOTP.tr,
|
||||
style: AppThemeData.semiBoldTextStyle(
|
||||
color: AppThemeData.info400,
|
||||
fontSize: 16,
|
||||
@@ -180,7 +181,7 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
/// Verify Button
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.verify.tr(),
|
||||
title: ConstTexts.verify.tr,
|
||||
onPress: controller.verifyOtp,
|
||||
color:
|
||||
isDark
|
||||
@@ -200,7 +201,7 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
child: Center(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: "${ConstTexts.dontHaveAccount.tr()} ",
|
||||
text: "${ConstTexts.dontHaveAccount.tr} ",
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -209,17 +210,14 @@ class OtpVerificationScreen extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: ConstTexts.signUp.tr(),
|
||||
text: ConstTexts.signUp.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color: AppThemeData.ecommerce300,
|
||||
decoration: TextDecoration.underline,
|
||||
),
|
||||
recognizer:
|
||||
TapGestureRecognizer()
|
||||
..onTap =
|
||||
() => Get.offAll(
|
||||
() => const SignUpScreen(),
|
||||
),
|
||||
..onTap = () => Get.offAll(SignUpScreen()),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import 'package:country_code_picker/country_code_picker.dart';
|
||||
import 'package:customer/constant/const_texts.dart';
|
||||
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:customer/utils/app_router.dart';
|
||||
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
@@ -13,7 +14,7 @@ import '../../controllers/theme_controller.dart';
|
||||
import '../../themes/app_them_data.dart';
|
||||
import '../../themes/round_button_fill.dart';
|
||||
import '../../themes/text_field_widget.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import 'package:get/get.dart';
|
||||
import 'login_screen.dart';
|
||||
import 'mobile_login_screen.dart';
|
||||
|
||||
@@ -45,7 +46,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.skip.tr(),
|
||||
ConstTexts.skip.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -78,7 +79,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
ConstTexts.signUpToExplore.tr(),
|
||||
ConstTexts.signUpToExplore.tr,
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
@@ -93,7 +94,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
children: [
|
||||
Expanded(
|
||||
child: TextFieldWidget(
|
||||
title: ConstTexts.firstName.tr(),
|
||||
title: ConstTexts.firstName.tr,
|
||||
hintText: "Abdusalom",
|
||||
controller: controller.firstNameController.value,
|
||||
),
|
||||
@@ -101,7 +102,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: TextFieldWidget(
|
||||
title: ConstTexts.lastName.tr(),
|
||||
title: ConstTexts.lastName.tr,
|
||||
hintText: "G'ayratov",
|
||||
controller: controller.lastNameController.value,
|
||||
),
|
||||
@@ -110,15 +111,15 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.emailAddress.tr(),
|
||||
title: ConstTexts.emailAddress.tr,
|
||||
hintText: "abdusalom@gmail.com",
|
||||
controller: controller.emailController.value,
|
||||
focusNode: controller.emailFocusNode,
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.mobileNumber.tr(),
|
||||
hintText: ConstTexts.enterMobileNumber.tr(),
|
||||
title: ConstTexts.mobileNumber.tr,
|
||||
hintText: ConstTexts.enterMobileNumber.tr,
|
||||
enable:
|
||||
controller.type.value == "mobileNumber"
|
||||
? false
|
||||
@@ -195,8 +196,8 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.password.tr(),
|
||||
hintText: ConstTexts.enterPassword.tr(),
|
||||
title: ConstTexts.password.tr,
|
||||
hintText: ConstTexts.enterPassword.tr,
|
||||
controller: controller.passwordController.value,
|
||||
obscureText: controller.passwordVisible.value,
|
||||
focusNode: controller.passwordFocusNode,
|
||||
@@ -232,8 +233,8 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.confirmPassword.tr(),
|
||||
hintText: ConstTexts.enterConfirmPassword.tr(),
|
||||
title: ConstTexts.confirmPassword.tr,
|
||||
hintText: ConstTexts.enterConfirmPassword.tr,
|
||||
controller: controller.confirmPasswordController.value,
|
||||
obscureText: controller.conformPasswordVisible.value,
|
||||
suffix: Padding(
|
||||
@@ -268,14 +269,14 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(height: 15),
|
||||
TextFieldWidget(
|
||||
title: ConstTexts.referralCode.tr(),
|
||||
hintText: ConstTexts.enterReferralCode.tr(),
|
||||
title: ConstTexts.referralCode.tr,
|
||||
hintText: ConstTexts.enterReferralCode.tr,
|
||||
controller: controller.referralController.value,
|
||||
),
|
||||
const SizedBox(height: 40),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.signUp.tr(),
|
||||
title: ConstTexts.signUp.tr,
|
||||
onPress: () => controller.signUp(),
|
||||
color:
|
||||
isDark
|
||||
@@ -300,7 +301,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
Text(
|
||||
ConstTexts.orContinueWith.tr(),
|
||||
ConstTexts.orContinueWith.tr,
|
||||
style: AppThemeData.regularTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -322,7 +323,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
const SizedBox(height: 25),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: ConstTexts.mobileNumber.tr(),
|
||||
title: ConstTexts.mobileNumber.tr,
|
||||
onPress: () => Get.to(() => const MobileLoginScreen()),
|
||||
isRight: false,
|
||||
isCenter: true,
|
||||
@@ -347,7 +348,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
child: Center(
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: ConstTexts.alreadyHaveAccount.tr(),
|
||||
text: ConstTexts.alreadyHaveAccount.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
@@ -356,7 +357,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: ConstTexts.login.tr(),
|
||||
text: ConstTexts.login.tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color: AppThemeData.ecommerce300,
|
||||
decoration: TextDecoration.underline,
|
||||
@@ -366,7 +367,7 @@ class SignUpScreen extends StatelessWidget {
|
||||
recognizer:
|
||||
TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
Get.offAll(() => const LoginScreen());
|
||||
Get.offAll(LoginScreen());
|
||||
},
|
||||
),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user