bug fix code
This commit is contained in:
parent
fb69475fe4
commit
eb4bfaf4da
@ -297,7 +297,9 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:uae_stat/config/sessionCheckScreen.dart';
|
||||
import 'package:uae_stat/presentation/Screens/Bottom%20Navigation%20Pages/UAE_Numbers/Social/marriages.dart';
|
||||
import 'package:uae_stat/presentation/Screens/auth_verification/privacy_policy.dart';
|
||||
import 'package:uae_stat/presentation/Screens/auth_verification/registration.dart';
|
||||
import 'package:uae_stat/presentation/Screens/auth_verification/terms&conditions.dart';
|
||||
import 'package:uae_stat/presentation/Screens/charts/chart.dart';
|
||||
import 'package:uae_stat/presentation/Screens/charts/screens/chart_screen.dart';
|
||||
import 'package:uae_stat/presentation/Screens/demo_home2.dart';
|
||||
@ -361,8 +363,8 @@ final GoRouter router = GoRouter(
|
||||
GoRoute(
|
||||
path: '/',
|
||||
//builder: (context, state) => LoginRoute(),
|
||||
// builder: (context, state) => SessionCheckScreen(),
|
||||
builder: (context, state) => MyHomePage(),
|
||||
builder: (context, state) => SessionCheckScreen(),
|
||||
|
||||
),
|
||||
// GoRoute(
|
||||
// path: '/',
|
||||
@ -462,6 +464,16 @@ final GoRouter router = GoRouter(
|
||||
userId: '',
|
||||
),
|
||||
),
|
||||
GoRoute(
|
||||
path: '/terms&conditions',
|
||||
builder: (context, state) => TermsOfUse(),
|
||||
//builder: (context, state) => LoginRoute(),
|
||||
),
|
||||
GoRoute(
|
||||
path: '/privacy_policy',
|
||||
builder: (context, state) => PrivacyPolicy(),
|
||||
//builder: (context, state) => LoginRoute(),
|
||||
),
|
||||
|
||||
// Drawer Routers
|
||||
GoRoute(
|
||||
|
||||
@ -1138,7 +1138,8 @@ class _RegisterScreenState extends ConsumerState<RegisterScreen> {
|
||||
'ar'
|
||||
? 12
|
||||
: 14,
|
||||
color: Colors.grey[600]),
|
||||
color: Color(0xFF898C81),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 15),
|
||||
Padding(
|
||||
|
||||
@ -644,6 +644,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
|
||||
hintText: _showHints[2] ? 'Enter the name' : null,
|
||||
hintStyle: TextStyle(color: Colors.grey),
|
||||
border: OutlineInputBorder(
|
||||
borderSide:BorderSide(color: Color(0xFF7296BE),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
counterText: '',
|
||||
@ -671,6 +673,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
|
||||
focusNode: _focusNodes[3],
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(
|
||||
borderSide:BorderSide(color: Color(0xFF7296BE),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
hintText: _showHints[3] ? 'DD/MM/YYYY' : null,
|
||||
@ -712,6 +716,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
|
||||
value: _selectedCountry,
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(
|
||||
borderSide:BorderSide(color: Color(0xFF7296BE),
|
||||
),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
),
|
||||
labelText: 'Select',
|
||||
|
||||
@ -562,7 +562,7 @@ class LoginRoute extends HookConsumerWidget {
|
||||
children: [
|
||||
TextSpan(
|
||||
text: context.translate(
|
||||
'Don\'t have an account?',
|
||||
'Don\'t have an account? ',
|
||||
'ليس لديك حساب؟',
|
||||
),
|
||||
style: const TextStyle(
|
||||
@ -578,6 +578,7 @@ class LoginRoute extends HookConsumerWidget {
|
||||
'سجل الان',
|
||||
),
|
||||
style: TextStyle(
|
||||
fontSize: locale?.languageCode == 'ar' ? 12 : 14,
|
||||
color: Color(0xFF985400),
|
||||
),
|
||||
),
|
||||
|
||||
@ -778,6 +778,8 @@ class _EditProfileState extends State<EditProfile> {
|
||||
value: _selectedCountry,
|
||||
decoration: InputDecoration(
|
||||
border: OutlineInputBorder(
|
||||
borderSide:BorderSide(color: Color(0xFF7296BE),
|
||||
),
|
||||
borderRadius:
|
||||
BorderRadius.circular(8),
|
||||
),
|
||||
|
||||
@ -299,6 +299,9 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
|
||||
),
|
||||
child: TextField(
|
||||
decoration: InputDecoration(
|
||||
labelStyle:TextStyle(
|
||||
color:Color(0xFFC3C6CB),
|
||||
),
|
||||
hintText: AppLocalizations.of(context)!.search,
|
||||
prefixIcon: Image.asset(
|
||||
MiscIconAssetPath.search,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user