From eb4bfaf4da728de719bee67c0ead7122b2148c87 Mon Sep 17 00:00:00 2001 From: Juki-shiba Date: Tue, 11 Feb 2025 16:09:30 +0530 Subject: [PATCH] bug fix code --- lib/config/my_router.dart | 16 ++++++++++++++-- .../Screens/auth_verification/registration.dart | 3 ++- lib/presentation/Screens/profilepage.dart | 6 ++++++ .../routes/auth_routes/login_route.dart | 3 ++- .../drawer_routes/Drawer Items/edit_profile.dart | 2 ++ .../drawer_routes/Drawer Items/manage_users.dart | 3 +++ 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/lib/config/my_router.dart b/lib/config/my_router.dart index 9b421498..1130fe03 100644 --- a/lib/config/my_router.dart +++ b/lib/config/my_router.dart @@ -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( diff --git a/lib/presentation/Screens/auth_verification/registration.dart b/lib/presentation/Screens/auth_verification/registration.dart index e1212d9d..928cfa73 100644 --- a/lib/presentation/Screens/auth_verification/registration.dart +++ b/lib/presentation/Screens/auth_verification/registration.dart @@ -1138,7 +1138,8 @@ class _RegisterScreenState extends ConsumerState { 'ar' ? 12 : 14, - color: Colors.grey[600]), + color: Color(0xFF898C81), + ), ), SizedBox(height: 15), Padding( diff --git a/lib/presentation/Screens/profilepage.dart b/lib/presentation/Screens/profilepage.dart index f2b51200..3de32b0e 100644 --- a/lib/presentation/Screens/profilepage.dart +++ b/lib/presentation/Screens/profilepage.dart @@ -644,6 +644,8 @@ class _ProfileScreenState extends State { 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 { 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 { value: _selectedCountry, decoration: InputDecoration( border: OutlineInputBorder( + borderSide:BorderSide(color: Color(0xFF7296BE), + ), borderRadius: BorderRadius.circular(8), ), labelText: 'Select', diff --git a/lib/presentation/routes/auth_routes/login_route.dart b/lib/presentation/routes/auth_routes/login_route.dart index f961aae6..790a60e0 100644 --- a/lib/presentation/routes/auth_routes/login_route.dart +++ b/lib/presentation/routes/auth_routes/login_route.dart @@ -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), ), ), diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart b/lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart index 3ce783aa..096ef0bf 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart @@ -778,6 +778,8 @@ class _EditProfileState extends State { value: _selectedCountry, decoration: InputDecoration( border: OutlineInputBorder( + borderSide:BorderSide(color: Color(0xFF7296BE), + ), borderRadius: BorderRadius.circular(8), ), diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart b/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart index a588779c..390e2371 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart @@ -299,6 +299,9 @@ class _ManageUserRouterState extends State { ), child: TextField( decoration: InputDecoration( + labelStyle:TextStyle( + color:Color(0xFFC3C6CB), + ), hintText: AppLocalizations.of(context)!.search, prefixIcon: Image.asset( MiscIconAssetPath.search,