From b2a1869ec3712f45fb365724d8547409ec2cf9e1 Mon Sep 17 00:00:00 2001 From: Juki-shiba Date: Thu, 17 Apr 2025 17:10:20 +0530 Subject: [PATCH 1/3] bug fix --- .../arm64-v8a/configure_fingerprint.bin | 24 +- .../armeabi-v7a/configure_fingerprint.bin | 24 +- .../2d1206wq/x86/configure_fingerprint.bin | 24 +- .../2d1206wq/x86_64/configure_fingerprint.bin | 24 +- .../routes/auth_routes/login_route.dart | 7 + .../Drawer Items/manage_users.dart | 24 + .../notification/notification.dart | 2 +- .../notification/notification_details.dart | 18 +- .../user_guide/KeyFeatures/EditMyProfile.dart | 1046 ++++++++--------- .../Drawer Items/user_guide/userguide.dart | 2 +- 10 files changed, 619 insertions(+), 576 deletions(-) diff --git a/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin index a2c4366b..1f3be7d8 100644 --- a/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  瘝2` +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ޔ2  瘝2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  2 2e +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  ޔ2 2e c -aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  2 ث2R +aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  ޔ2 ث2R P -NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  2 ̨2V +NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  ޔ2 ̨2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  2[ +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  ޔ2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  2 S 諤2\ +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  ޔ2 S 諤2\ Z -XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  2` +XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  ޔ2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  2 f +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  ޔ2 f d -bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  2 +bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  ޔ2  ޫ2Y W -UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  2  ( 櫤2^ +UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  ޔ2  ( 櫤2^ \ -ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  2  Q 諤2W +ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  ޔ2  Q 諤2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ޔ2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin index 301541cc..db285fc0 100644 --- a/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Loge c aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2b +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߔ2  2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  2 2g +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  ߔ2 2g e -cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  2 2T +cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  ߔ2 2T R -PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  2 2X +PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  ߔ2 2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  2] +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  ߔ2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  2 S 2^ +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  ߔ2 S 2^ \ -ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  2b +ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  ߔ2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  2 h +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  ߔ2 h f -dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  2 +dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  ߔ2  2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  2  ( 2` +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  ߔ2  ( 2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  2  S 2W +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  ߔ2  S 2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ߔ2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin index a8629597..1a753bae 100644 --- a/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log] [ YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ͽ2  2Z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߔ2  2Z X -VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  ͽ2 2_ +VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  ߔ2 2_ ] -[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  ͽ2 2L +[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  ߔ2 2L J -HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  ͽ2 2P +HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  ߔ2 2P N -LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  ͽ2U +LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  ߔ2U S -QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  ν2 S 2V +QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  ߔ2 S 2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  ν2Z +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  ߔ2Z X -VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  ν2 ` +VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  ߔ2 ` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  ν2 +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  ߔ2  2S Q -OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  ν2  ( 2X +OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  ߔ2  ( 2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  ν2  K 2W +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  ߔ2  K 2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  Ͻ2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ߔ2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin index d4ac4f18..7d38fff1 100644 --- a/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log` ^ \C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ئ2  צ2] +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  צ2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  ئ2 ئ2b +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  2 ئ2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  ئ2 ئ2O +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  2 ئ2O M -KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  ئ2 ֦2S +KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  2 ֦2S Q -OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  ئ2X +OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  ئ2 S ئ2Y +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  2 S ئ2Y W -UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  ئ2] +UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  ئ2 c +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  2 c a -_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  ئ2 +_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  2  ئ2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  ئ2  ( ئ2[ +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  2  ( ئ2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  ئ2  N ئ2W +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  2  N ئ2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ئ2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/lib/presentation/routes/auth_routes/login_route.dart b/lib/presentation/routes/auth_routes/login_route.dart index b89cab20..86c450cc 100644 --- a/lib/presentation/routes/auth_routes/login_route.dart +++ b/lib/presentation/routes/auth_routes/login_route.dart @@ -269,6 +269,13 @@ class LoginRoute extends HookConsumerWidget { final locale = ref.watch(localeProvider); final emailCtl = useTextEditingController(); final pwCtl = useTextEditingController(); + useEffect(() { + // Clear controllers when the widget is built + emailCtl.clear(); + pwCtl.clear(); + formKey.currentState?.reset(); + return null; // No cleanup needed + }, const []); final forgotPwBtn = TextButton( onPressed: () async { final forgotPwFormKey = GlobalKey(); 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 3b3a2487..b4902632 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart @@ -517,6 +517,12 @@ class _ManageUserRouterState extends ConsumerState { DataColumn( label: Text( AppLocalizations.of(context)!.user_name, + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ), ), onSort: (columnIndex, ascending) { _sort( @@ -529,6 +535,12 @@ class _ManageUserRouterState extends ConsumerState { DataColumn( label: Text( AppLocalizations.of(context)!.email_id, + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ), ), onSort: (columnIndex, ascending) { _sort( @@ -541,6 +553,12 @@ class _ManageUserRouterState extends ConsumerState { DataColumn( label: Text( AppLocalizations.of(context)!.reg_date, + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ), ), onSort: (columnIndex, ascending) { _sort( @@ -554,6 +572,12 @@ class _ManageUserRouterState extends ConsumerState { DataColumn( label: Text( AppLocalizations.of(context)!.status, + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ), ), onSort: (columnIndex, ascending) { _sort( diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart b/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart index 273cfd6a..4a691f5b 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart @@ -71,7 +71,7 @@ class _NotificationPageState extends ConsumerState { } print('count is $count'); if(count>0){ - notificationCount='{$count}';} + notificationCount='($count)';} else{notificationCount='';} } diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification_details.dart b/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification_details.dart index c8a74f98..a2e60e1e 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification_details.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification_details.dart @@ -171,7 +171,11 @@ class _NotificationDetailsState extends ConsumerState { children: [ Text( notification?['title'] ?? '', - style: const TextStyle( + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize: 18, fontWeight: FontWeight.w500, color: Color(0xFF414042)), @@ -194,7 +198,11 @@ class _NotificationDetailsState extends ConsumerState { Text( notification?['message'] ?? "No additional details available.", - style: const TextStyle( + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize: 14, fontWeight: FontWeight.w400, color: Color(0xFF414042)), @@ -202,7 +210,11 @@ class _NotificationDetailsState extends ConsumerState { const SizedBox(height: 10), Text( "Date: ${notification != null ? formatDate(notification!['created'] ?? '') : 'N/A'}", - style: const TextStyle( + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize: 12, fontWeight: FontWeight.w400, color: Color(0xFF8E8E8E), diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart b/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart index ae40e2b3..d8f6c47c 100755 --- a/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart @@ -1,557 +1,557 @@ -import 'package:flutter/material.dart'; -import 'package:uae_stat/domain/use_cases/language.dart'; + import 'package:flutter/material.dart'; + import 'package:uae_stat/domain/use_cases/language.dart'; -import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart'; + import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart'; -class EditMyProfile extends StatelessWidget { - const EditMyProfile({super.key}); + class EditMyProfile extends StatelessWidget { + const EditMyProfile({super.key}); - @override - Widget build(BuildContext context) { - return Theme( - data: ThemeData( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), // Set default font family for this page - textTheme: TextTheme( - bodyMedium: TextStyle(fontSize: 16, color: Color(0xFF898C81),fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - ), - ), - child: BaseScaffold( - showDivider: true, - showBackButton: true, - bottomColor: Colors.white, - dividerColor: Colors.grey[300], - appbarColor: Colors.white, - mycenterTitle: true, - title: Text( - context.translate('Key Features','الميزات الرئيسية'), - style: TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', + @override + Widget build(BuildContext context) { + return Theme( + data: ThemeData( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), // Set default font family for this page + textTheme: TextTheme( + bodyMedium: TextStyle(fontSize: 16, color: Color(0xFF898C81),fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + ), ), - fontSize: 22, - color: Color(0xFF7DAFBC), - fontWeight: FontWeight.w500, - // fontWeight: FontWeight.w500, - ), - ), - body: Container( - width: double.infinity, - color: Colors.white, - padding: EdgeInsets.all(16), - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Align( - alignment: Alignment.topLeft, - child: Text( - context.translate('How to Edit My Profile','كيفية تعديل ملفي الشخصي'), - style: - TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:20, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ),), - ), - SizedBox( - width:MediaQuery.of(context).size.width, - height:MediaQuery.of(context).size.height * 0.36, - child: Image.asset( - 'assets/user_guide/editProfile.png', - fit: BoxFit.contain, + child: BaseScaffold( + showDivider: true, + showBackButton: true, + bottomColor: Colors.white, + dividerColor: Colors.grey[300], + appbarColor: Colors.white, + mycenterTitle: true, + title: Text( + context.translate('Key Features','الميزات الرئيسية'), + style: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), + fontSize: 22, + color: Color(0xFF7DAFBC), + fontWeight: FontWeight.w500, + // fontWeight: FontWeight.w500, ), - Text(context.translate( - 'Editing your profile allows you to update specific information while ensuring that critical details remain secure. Follow the steps below to update your profile:', - 'يتيح لك تعديل ملف التعريف الخاص بك بتحديث معلومات معينة مع ضمان أن تبقى البيانات الحساسة آمنة. اتبع الخطوات التالية لتحديث ملفك الشخصي:',), - ), - SizedBox(height: 12), - Text( - context.translate('Steps to Edit Profile','خطوات تعديل الملف الشخصي '), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:22, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Text(context.translate( - '1. Access the Profile Page:', - '1. الوصول إلى صفحة الملف الشخصي:',), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:16, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Padding( - padding: const EdgeInsets.only(left: 8.0), + ), + body: Container( + width: double.infinity, + color: Colors.white, + padding: EdgeInsets.all(16), + child: SingleChildScrollView( child: Column( - children: [ Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - text: context.translate('Tap on the ','انقر على خيار "الملف الشخصي" من شريط التنقل في الزاوية العلوية اليسرى من الشاشة.'), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: context.translate('"Profile"',''), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text: context.translate(' option from the navigation bar at the top left corner of the screen.','')) - ], - ), - ) + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Align( + alignment: Alignment.topLeft, + child: Text( + context.translate('How to Edit My Profile','كيفية تعديل ملفي الشخصي'), + style: + TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + fontSize:20, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ),), + ), + SizedBox( + width:MediaQuery.of(context).size.width, + height:MediaQuery.of(context).size.height * 0.36, + child: Image.asset( + 'assets/user_guide/editProfile.png', + fit: BoxFit.contain, ), - ], - ),], - ), - ), - - SizedBox(height: 8), - Text( - context.translate('2. Editable Fields:','2. الحقول القابلة للتعديل:'), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:16, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Padding( - padding: const EdgeInsets.only(left: 8.0), - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: - context.translate('Full Name:','الاسم الكامل: '), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate( - ' Tap the text box to enter your name (up to 40 alphanumeric characters).', - 'اضغط على مربع النص لإدخال اسمك (حتى 40 حرفًا أبجديًا رقميًا).',),) - ], - ), - ) + ), + Text(context.translate( + 'Editing your profile allows you to update specific information while ensuring that critical details remain secure. Follow the steps below to update your profile:', + 'يتيح لك تعديل ملف التعريف الخاص بك بتحديث معلومات معينة مع ضمان أن تبقى البيانات الحساسة آمنة. اتبع الخطوات التالية لتحديث ملفك الشخصي:',), + ), + SizedBox(height: 12), + Text( + context.translate('Steps to Edit Profile','خطوات تعديل الملف الشخصي '), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), - ], + fontSize:22, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), ), SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan( - text: context.translate('Date of Birth: ','تاريخ الميلاد: '), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan( - text:context.translate( - ' Use the calendar dropdown to select your date of birth.', - 'استخدم القائمة المنسدلة لاختيار تاريخ ميلادك.',), - ) - ], - ), - ) + Text(context.translate( + '1. Access the Profile Page:', + '1. الوصول إلى صفحة الملف الشخصي:',), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), - ], + fontSize:16, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), ), SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text:context.translate( - 'Country/Region: ', - 'البلد/المنطقة:',), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate( - ' Choose your current location from the dropdown menu.', - 'اختر موقعك الحالي من القائمة المنسدلة.',), - ), - ], - ), - ) - ), - ], - ), - SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: - context.translate('User Image: ', 'الصورة الشخصية:'), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate( - 'Tap on the avatar icon to upload or change your profile picture.', - 'اضغط على أيقونة رمزالصورة لتحميل أو تغيير صورة الملف الشخصي.',), - ), - ], - ), - ) - ), - ], - ), - ], - ), - ), - - SizedBox(height: 8), - Text( - context.translate('3. Non-Editable Fields:','3. الحقول غير القابلة للتعديل:'), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:16, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Padding( - padding: const EdgeInsets.only(left: 8.0), - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: context.translate('Username ','اسم المستخدم وعنوان البريد الإلكتروني: '), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate('and ',''),), - TextSpan(text: context.translate('Email Id: ',''), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate( - 'These fields cannot be edited to ensure the integrity of your account.', - 'لا يمكن تعديل هذين الحقلين لضمان سلامة حسابك.',), - ), - ], - ), - ) - ), - ], - ), - ], - ), - ), - - SizedBox(height: 8), - Text( - context.translate('4. Agree to Terms and Conditions:','4. الموافقة على الشروط والأحكام:'), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:16, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Padding( - padding: const EdgeInsets.only(left: 8.0), - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: Text( - context.translate( - 'Ensure that the checkbox for "I agree to Terms & Conditions and Privacy Policy" is selected before saving changes.', - 'تأكد من تحديد خانة "أوافق على الشروط والأحكام وسياسة الخصوصية" قبل حفظ التغييرات.',), - textAlign: TextAlign.justify, // Align the text - softWrap: true, - ), - ), - ], - ), - ], - ), - ), - - SizedBox(height: 8), - Text( - context.translate('5. Save Your Changes:','5. حفظ التغييرات:'), - style:TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - fontSize:16, - color: Color(0xFF414042), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 8), - Padding( - padding: const EdgeInsets.only(left: 8.0), - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: RichText( - text: TextSpan( - text: context.translate('Tap the ','اضغط على زر '), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: - context.translate('Save','"حفظ" '), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Column( + children: [ Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + text: context.translate('Tap on the ','انقر على خيار "الملف الشخصي" من شريط التنقل في الزاوية العلوية اليسرى من الشاشة.'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( 'Roboto', 'NotoKufi', - ), - ),), - TextSpan(text: - context.translate( - ' button at the bottom of the screen.', - 'أسفل الشاشة.',), + ),), + children: [ + TextSpan(text: context.translate('"Profile"',''), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text: context.translate(' option from the navigation bar at the top left corner of the screen.','')) + ], + ), ) - ], ), - ), + ], + ),], + ), + ), + + SizedBox(height: 8), + Text( + context.translate('2. Editable Fields:','2. الحقول القابلة للتعديل:'), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), - ], + fontSize:16, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), ), SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child: Text(context.translate( - 'A confirmation dialog will appear with the message: “Are you sure you want to save this page? Once saved, you will not be able to change your name or date of birth.”', - 'ستظهر نافذة تأكيد برسالة:"هل أنت متأكد أنك تريد حفظ هذه الصفحة؟ بمجرد الحفظ، لن تتمكن من تغيير اسمك أو تاريخ ميلادك."', + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text: + context.translate('Full Name:','الاسم الكامل: '), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate( + ' Tap the text box to enter your name (up to 40 alphanumeric characters).', + 'اضغط على مربع النص لإدخال اسمك (حتى 40 حرفًا أبجديًا رقميًا).',),) + ], + ), + ) + ), + ], ), - textAlign: TextAlign.justify, // Align the text - softWrap: true, + SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan( + text: context.translate('Date of Birth: ','تاريخ الميلاد: '), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan( + text:context.translate( + ' Use the calendar dropdown to select your date of birth.', + 'استخدم القائمة المنسدلة لاختيار تاريخ ميلادك.',), + ) + ], + ), + ) + ), + ], ), + SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text:context.translate( + 'Country/Region: ', + 'البلد/المنطقة:',), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate( + ' Choose your current location from the dropdown menu.', + 'اختر موقعك الحالي من القائمة المنسدلة.',), + ), + ], + ), + ) + ), + ], + ), + SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text: + context.translate('User Image: ', 'الصورة الشخصية:'), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate( + 'Tap on the avatar icon to upload or change your profile picture.', + 'اضغط على أيقونة رمزالصورة لتحميل أو تغيير صورة الملف الشخصي.',), + ), + ], + ), + ) + ), + ], + ), + ], + ), + ), + + SizedBox(height: 8), + Text( + context.translate('3. Non-Editable Fields:','3. الحقول غير القابلة للتعديل:'), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), - ], + fontSize:16, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), ), SizedBox(height: 8), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(top : 8.0), - child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), - ), // Bullet point - SizedBox(width: 8), // Space between bullet and text - Expanded( - child:RichText( - text: TextSpan( - text: context.translate('Select ','اختر "تأكيد" لحفظ التغييرات أو "إلغاء" للرجوع.'), - style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ),), - children: [ - TextSpan(text: context.translate('Confirm',''), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text: context.translate('Username ','اسم المستخدم وعنوان البريد الإلكتروني: '), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate('and ',''),), + TextSpan(text: context.translate('Email Id: ',''), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate( + 'These fields cannot be edited to ensure the integrity of your account.', + 'لا يمكن تعديل هذين الحقلين لضمان سلامة حسابك.',), + ), + ], ), - ),), - TextSpan(text:context.translate(' to save the changes',''),), - TextSpan(text:context.translate(' Cancel',''), - style: TextStyle( - fontWeight: FontWeight.w600, - color: Color(0xFF414042), - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), - ),), - TextSpan(text:context.translate(' to go back.','')), - ], - ), + ) + ), + ], ), - ), - ], + ], + ), ), + + SizedBox(height: 8), + Text( + context.translate('4. Agree to Terms and Conditions:','4. الموافقة على الشروط والأحكام:'), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + fontSize:16, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), + ), + SizedBox(height: 8), + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: Text( + context.translate( + 'Ensure that the checkbox for "I agree to Terms & Conditions and Privacy Policy" is selected before saving changes.', + 'تأكد من تحديد خانة "أوافق على الشروط والأحكام وسياسة الخصوصية" قبل حفظ التغييرات.',), + textAlign: TextAlign.justify, // Align the text + softWrap: true, + ), + ), + ], + ), + ], + ), + ), + + SizedBox(height: 8), + Text( + context.translate('5. Save Your Changes:','5. حفظ التغييرات:'), + style:TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + fontSize:16, + color: Color(0xFF414042), + fontWeight: FontWeight.w600, + ), + ), + SizedBox(height: 8), + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: RichText( + text: TextSpan( + text: context.translate('Tap the ','اضغط على زر '), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text: + context.translate('Save','"حفظ" '), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text: + context.translate( + ' button at the bottom of the screen.', + 'أسفل الشاشة.',), + ) + ], + ), + ), + ), + ], + ), + SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child: Text(context.translate( + 'A confirmation dialog will appear with the message: “Are you sure you want to save this page? Once saved, you will not be able to change your name or date of birth.”', + 'ستظهر نافذة تأكيد برسالة:"هل أنت متأكد أنك تريد حفظ هذه الصفحة؟ بمجرد الحفظ، لن تتمكن من تغيير اسمك أو تاريخ ميلادك."', + ), + textAlign: TextAlign.justify, // Align the text + softWrap: true, + ), + ), + ], + ), + SizedBox(height: 8), + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top : 8.0), + child: Icon(Icons.brightness_1, size: 5, color: Color(0xFF414042),), + ), // Bullet point + SizedBox(width: 8), // Space between bullet and text + Expanded( + child:RichText( + text: TextSpan( + text: context.translate('Select ','اختر "تأكيد" لحفظ التغييرات أو "إلغاء" للرجوع.'), + style: TextStyle(fontSize: 16, color: Color(0xFF898C81), fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),), + children: [ + TextSpan(text: context.translate('Confirm',''), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate(' to save the changes',''),), + TextSpan(text:context.translate(' Cancel',''), + style: TextStyle( + fontWeight: FontWeight.w600, + color: Color(0xFF414042), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), + ),), + TextSpan(text:context.translate(' to go back.','')), + ], + ), + ), + ), + ], + ), + ], + ), + ), + SizedBox(height: 20,), ], + ), ), - SizedBox(height: 20,), - ], - + ), ), - ), - ), - ), - ); - } -} + ); + } + } diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/userguide.dart b/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/userguide.dart index 68580ba7..c2f6f0a5 100755 --- a/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/userguide.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/user_guide/userguide.dart @@ -38,7 +38,7 @@ class _UserguideState extends State { ), // fontFamily: 'Handel', fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: 18, letterSpacing: 1.6, color: color, // Apply color dynamically ), From 46a85432836ba1e7334e3a03c7ffe1044b11b435 Mon Sep 17 00:00:00 2001 From: Juki-shiba Date: Thu, 17 Apr 2025 17:48:27 +0530 Subject: [PATCH 2/3] bug fix UAE Page --- .../tab_routes/uae_numbers_routes/list_uae_numbers_route.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/presentation/routes/bottom_bar_routes/tab_routes/uae_numbers_routes/list_uae_numbers_route.dart b/lib/presentation/routes/bottom_bar_routes/tab_routes/uae_numbers_routes/list_uae_numbers_route.dart index fa0ad859..cfeba542 100644 --- a/lib/presentation/routes/bottom_bar_routes/tab_routes/uae_numbers_routes/list_uae_numbers_route.dart +++ b/lib/presentation/routes/bottom_bar_routes/tab_routes/uae_numbers_routes/list_uae_numbers_route.dart @@ -347,6 +347,10 @@ class _PerSubtopicBody extends ConsumerWidget { color: _titleColor, fontWeight: FontWeight.w600, fontSize: 16, + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ), ); final shownIds = ids.where( From 243e8f278e66c100d5ee14516e5133e8f17026dc Mon Sep 17 00:00:00 2001 From: Juki-shiba Date: Thu, 17 Apr 2025 18:57:51 +0530 Subject: [PATCH 3/3] bug fix --- .../arm64-v8a/configure_fingerprint.bin | 24 +++++++++--------- .../armeabi-v7a/configure_fingerprint.bin | 24 +++++++++--------- .../2d1206wq/x86/configure_fingerprint.bin | 24 +++++++++--------- .../2d1206wq/x86_64/configure_fingerprint.bin | 24 +++++++++--------- .../UAE_Numbers/uae_numbers.dart | 4 +-- .../Screens/charts/widgets/chart_widget.dart | 17 +++++++++---- .../components/constant/constant.dart | 25 +++++++++---------- 7 files changed, 74 insertions(+), 68 deletions(-) diff --git a/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin index 1f3be7d8..716680b4 100644 --- a/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logc a _C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ޔ2  瘝2` +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  綻2  瘝2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  ޔ2 2e +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build.json  綻2 2e c -aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  ޔ2 ث2R +aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\android_gradle_build_mini.json  綻2 ث2R P -NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  ޔ2 ̨2V +NC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja  綻2 ̨2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  ޔ2[ +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build.ninja.txt  綻2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  ޔ2 S 諤2\ +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\build_file_index.txt  趻2 S 諤2\ Z -XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  ޔ2` +XC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json  趻2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  ޔ2 f +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\compile_commands.json.bin  趻2 f d -bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  ޔ2 +bC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\metadata_generation_command.txt  趻2  ޫ2Y W -UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  ޔ2  ( 櫤2^ +UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\prefab_config.json  趻2  ( 櫤2^ \ -ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  ޔ2  Q 諤2W +ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\arm64-v8a\symbol_folder_index.txt  趻2  Q 諤2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ޔ2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  趻2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin index db285fc0..541a3c0f 100644 --- a/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Loge c aC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߔ2  2b +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  ߔ2 2g +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build.json  2 2g e -cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  ߔ2 2T +cC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\android_gradle_build_mini.json  2 2T R -PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  ߔ2 2X +PC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja  2 2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  ߔ2] +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build.ninja.txt  2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  ߔ2 S 2^ +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\build_file_index.txt  2 S 2^ \ -ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  ߔ2b +ZC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json  2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  ߔ2 h +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\compile_commands.json.bin  2 h f -dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  ߔ2 +dC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\metadata_generation_command.txt  2  2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  ߔ2  ( 2` +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\prefab_config.json  2  ( 2` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  ߔ2  S 2W +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\armeabi-v7a\symbol_folder_index.txt  2  S 2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ߔ2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin index 1a753bae..de2029e9 100644 --- a/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log] [ YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ߔ2  2Z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2Z X -VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  ߔ2 2_ +VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build.json  2 2_ ] -[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  ߔ2 2L +[C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\android_gradle_build_mini.json  2 2L J -HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  ߔ2 2P +HC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja  2 2P N -LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  ߔ2U +LC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build.ninja.txt  2U S -QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  ߔ2 S 2V +QC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\build_file_index.txt  2 S 2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  ߔ2Z +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json  2Z X -VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  ߔ2 ` +VC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\compile_commands.json.bin  2 ` ^ -\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  ߔ2 +\C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\metadata_generation_command.txt  2  2S Q -OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  ߔ2  ( 2X +OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\prefab_config.json  2  ( 2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  ߔ2  K 2W +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86\symbol_folder_index.txt  2  K 2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ߔ2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin index 7d38fff1..e4570b67 100644 --- a/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/2d1206wq/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log` ^ \C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  צ2] +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ䷻2  צ2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  2 ئ2b +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build.json  ䷻2 ئ2b ` -^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  2 ئ2O +^C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\android_gradle_build_mini.json  ䷻2 ئ2O M -KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  2 ֦2S +KC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja  ䷻2 ֦2S Q -OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  2X +OC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build.ninja.txt  ䷻2X V -TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  2 S ئ2Y +TC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\build_file_index.txt  ䷻2 S ئ2Y W -UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  2] +UC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json  ䷻2] [ -YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  2 c +YC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\compile_commands.json.bin  ䷻2 c a -_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  2 +_C:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\metadata_generation_command.txt  ䷻2  ئ2V T -RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  2  ( ئ2[ +RC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\prefab_config.json  ䷻2  ( ئ2[ Y -WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  2  N ئ2W +WC:\flutter code\new\FCSC\android\app\.cxx\Debug\2d1206wq\x86_64\symbol_folder_index.txt  ䷻2  N ئ2W U -SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file +SC:\flutter\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ䷻2  2 \ No newline at end of file diff --git a/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart b/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart index 141cf56f..c1191978 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart @@ -462,10 +462,10 @@ class _UaenumberWidgetState extends ConsumerState { Text( title, textAlign: TextAlign.center, - style: robotoRegular11, + style: robotoRegular11(context), ), SizedBox(height: 0.1), - Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle), + Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle(context)), SizedBox(height: 0.3), Row( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/presentation/Screens/charts/widgets/chart_widget.dart b/lib/presentation/Screens/charts/widgets/chart_widget.dart index ff777e65..bd6ea63c 100644 --- a/lib/presentation/Screens/charts/widgets/chart_widget.dart +++ b/lib/presentation/Screens/charts/widgets/chart_widget.dart @@ -272,7 +272,7 @@ class ChartWidget extends StatelessWidget { List parsePieChartData( dynamic chartData, double totalValue, - int? touchedIndex, + int? touchedIndex,BuildContext context ) { debugPrint('Chart Data: ${jsonEncode(chartData)}'); @@ -320,6 +320,10 @@ class ChartWidget extends StatelessWidget { // Increase size when touched titleStyle: TextStyle( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), fontSize: isTouched ? 12 : (percentage < 1 ? 10 : 11), fontWeight: FontWeight.bold, color: Colors.black, @@ -710,7 +714,7 @@ class ChartWidget extends StatelessWidget { sections: parsePieChartData( chartData, totalValue, - touchedIndex.value, + touchedIndex.value,context ), borderData: FlBorderData(show: false), sectionsSpace: 2, @@ -908,7 +912,7 @@ class ChartWidget extends StatelessWidget { showTitles: true, reservedSize: 28, getTitlesWidget: (double value, TitleMeta meta) { - return _generateXTitles(chartData)[value.toInt()]; + return _generateXTitles(chartData,context)[value.toInt()]; }, ), ), @@ -3667,13 +3671,16 @@ class ChartWidget extends StatelessWidget { } // Function to dynamically generate titles for the x-axis (time periods) - List _generateXTitles(dynamic chartData) { + List _generateXTitles(dynamic chartData,BuildContext context) { Set timePeriods = {}; for (var entry in chartData['response']) { timePeriods.add(entry['ObsKey']['TIME_PERIOD']); } return timePeriods.map((period) { - return Text(period, style: TextStyle(fontSize: 12)); + return Text(period, style: TextStyle(fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ),fontSize: 12)); }).toList(); } diff --git a/lib/presentation/components/constant/constant.dart b/lib/presentation/components/constant/constant.dart index 55e3e055..b5422547 100644 --- a/lib/presentation/components/constant/constant.dart +++ b/lib/presentation/components/constant/constant.dart @@ -1,20 +1,19 @@ import 'package:flutter/material.dart'; +import 'package:uae_stat/domain/use_cases/language.dart'; const Color economyColor = Color(0xFF90B0D5); const Color socialColor = Color(0xFFAA8E83); const Color environmentColor = Color(0xFF7DAFBC); const Color environmentboldColor = Color(0xFF90B0D5); -const TextStyle subtitleStyle = TextStyle( - fontFamily: 'Roboto', // Font family set to Roboto - fontWeight: FontWeight.w400, // Regular weight (w400) -// fontSize: 11, - fontSize: 11 * 1.2, // Increase by 20% - color: Color(0xFF8E8E8E) // Font size 11 - ); -const TextStyle robotoRegular11 = TextStyle( - fontFamily: 'Roboto', // Font family set to Roboto - fontWeight: FontWeight.w400, // Regular weight (w400) - fontSize: 11 * 1.1, - color: Color(0xFF000000) // Font size 11 - +TextStyle subtitleStyle(BuildContext context) { + return TextStyle( + fontFamily: context.translate('Roboto', 'NotoKufi'), + fontWeight: FontWeight.w400, + fontSize: 11 * 1.2, + color: const Color(0xFF8E8E8E), ); +} +TextStyle robotoRegular11(BuildContext context) +{return TextStyle(fontFamily: context.translate('Roboto', 'NotoKufi'), + fontWeight: FontWeight.w400, + fontSize: 11 * 1.1,color: Color(0xFF000000),);}