Merge branch 'main' into meet

This commit is contained in:
meet2711
2024-06-03 15:25:41 +05:30
committed by GitHub
44 changed files with 802 additions and 57 deletions

View File

@@ -12,6 +12,7 @@ class RouteName {
//Register
static const String registerStepScreen = 'registerStepScreen';
static const String registerScreen = 'registerScreen';
static const String registerUserDetailsScreen = 'registerUserDetailsScreen';
//No Internet
static const String noInternetScreen = 'noInternet';
@@ -36,5 +37,4 @@ class RouteName {
//Biometric
static const String otpScreen = 'otpScreen';
}

View File

@@ -16,6 +16,7 @@ import 'package:tanami_app/features/register/presentation/pages/register_step_sc
import 'package:tanami_app/features/welcome/presentation/pages/weclome_screen.dart';
import '../../features/login/presentation/pages/login_screen.dart';
import '../../features/register/presentation/pages/register_user_details_screen.dart';
import '../../features/splash/presentation/pages/splash_screen.dart';
/* CREATED BY - JAYESH JAIN
@@ -110,7 +111,6 @@ final goRouter = GoRouter(
),
],
),
// GoRoute(
// path: '/profile/:userId',
// builder: (context, state) {

View File

@@ -41,4 +41,7 @@ class AppColor {
static const Color strokeColor = Color(0xFFB4B4B4);
static const Color otpTextColor = Color(0xFF191B1E);
static const Color fillColor = Color(0xFFF6F6F6);
//CheckBox Color
static const Color checkBoxActiveColor = Color(0xFF09622E);
}

View File

@@ -40,6 +40,8 @@ class AppText {
"Enter your country of residence and mobile number";
static const String enterNameEmailPassword =
"Enter your name, email and password";
static const String enterNameEmailUniquePassword =
"Enter your name and email and choose a unique password";
static const String enableBiometricAuthentication =
"Enable biometric authentication and select a unique pin code for easy access";
static const String getStarted = "Get started";
@@ -48,6 +50,17 @@ class AppText {
"Select your country of residence and enter your mobile number";
static const String nextText = "Next";
static const String backText = "Back";
static const String firstNameText = "First Name";
static const String lastNameText = "Last Name";
static const String emailText = "Email";
static const String repeatPasswordText = "Repeat Password";
static const String min8CharactersSpecialCharctersText =
"Min 8 characters, special characters required";
static const String enterFirstName = "Enter First Name";
static const String enterLastName = "Enter Last Name";
static const String enterEmail = "Enter Email";
static const String cantBeEmptyText = "Can't Be Empty";
static const String passwordMismatch = "Password Mismatch";
//Country Name
static const String bahrainCountryText = "Bahrain";
@@ -81,5 +94,6 @@ class AppText {
static const String referToSameOtpMessage =
"Please refer to the same OTP message shown below";
static const String resendSms = "Resend SMS";
static const String otpVerifiedSucessfully = "OTP Verified Successfully!";
static const String otpVerifiedFailed = "OTP Verification Failed:";
}