diff --git a/android/app/.cxx/Debug/29y7472m/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/29y7472m/arm64-v8a/configure_fingerprint.bin index 6700fecf..68a976a1 100644 --- a/android/app/.cxx/Debug/29y7472m/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/29y7472m/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logo m kC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ו2  2l +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Θ2  2l j -hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\android_gradle_build.json  ו2 2q +hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\android_gradle_build.json  Ϙ2 2q o -mC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\android_gradle_build_mini.json  ו2 2^ +mC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\android_gradle_build_mini.json  Ϙ2 2^ \ -ZC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build.ninja  ו2 2b +ZC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build.ninja  Ϙ2 2b ` -^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build.ninja.txt  ו2g +^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build.ninja.txt  Ϙ2g e -cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build_file_index.txt  ו2 K 2h +cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\build_file_index.txt  Ϙ2 K 2h f -dC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\compile_commands.json  ו2l +dC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\compile_commands.json  Ϙ2l j -hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\compile_commands.json.bin  ו2 r +hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\compile_commands.json.bin  Ϙ2 r p -nC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\metadata_generation_command.txt  ו2 +nC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\metadata_generation_command.txt  Ϙ2  2e c -aC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\prefab_config.json  ו2  ( 2j +aC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\prefab_config.json  Ϙ2  ( 2j h -fC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\symbol_folder_index.txt  ו2  ] 2O +fC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\arm64-v8a\symbol_folder_index.txt  Ϙ2  ] 2O M -KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ו2  2 \ No newline at end of file +KC:\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/29y7472m/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/29y7472m/armeabi-v7a/configure_fingerprint.bin index fb76e419..634057c7 100644 --- a/android/app/.cxx/Debug/29y7472m/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/29y7472m/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logq o mC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ؕ2  Ǡ2n +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  Ǡ2n l -jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\android_gradle_build.json  ؕ2 Ǡ2s +jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\android_gradle_build.json  2 Ǡ2s q -oC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\android_gradle_build_mini.json  ؕ2 Ǡ2` +oC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\android_gradle_build_mini.json  2 Ǡ2` ^ -\C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build.ninja  ؕ2 Š2d +\C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build.ninja  2 Š2d b -`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build.ninja.txt  ؕ2i +`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build.ninja.txt  2i g -eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build_file_index.txt  ؕ2 K Ǡ2j +eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\build_file_index.txt  2 K Ǡ2j h -fC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\compile_commands.json  ؕ2n +fC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\compile_commands.json  2n l -jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\compile_commands.json.bin  ؕ2 t +jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\compile_commands.json.bin  2 t r -pC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\metadata_generation_command.txt  ؕ2 +pC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\metadata_generation_command.txt  2  Ǡ2g e -cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\prefab_config.json  ؕ2  ( Ǡ2l +cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\prefab_config.json  2  ( Ǡ2l j -hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\symbol_folder_index.txt  ؕ2  _ Ǡ2O +hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\armeabi-v7a\symbol_folder_index.txt  2  _ Ǡ2O M -KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ؕ2  2 \ No newline at end of file +KC:\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/29y7472m/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/29y7472m/x86/configure_fingerprint.bin index 890a34e9..c2b3fb0a 100644 --- a/android/app/.cxx/Debug/29y7472m/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/29y7472m/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logi g eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ؕ2  2f +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2f d -bC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\android_gradle_build.json  ؕ2 2k +bC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\android_gradle_build.json  2 2k i -gC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\android_gradle_build_mini.json  ؕ2 2X +gC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\android_gradle_build_mini.json  2 2X V -TC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build.ninja  ؕ2 2\ +TC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build.ninja  2 2\ Z -XC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build.ninja.txt  ؕ2a +XC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build.ninja.txt  2a _ -]C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build_file_index.txt  ؕ2 K 2b +]C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\build_file_index.txt  2 K 2b ` -^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\compile_commands.json  ؕ2f +^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\compile_commands.json  2f d -bC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\compile_commands.json.bin  ؕ2 l +bC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\compile_commands.json.bin  2 l j -hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\metadata_generation_command.txt  ؕ2 +hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\metadata_generation_command.txt  2  2_ ] -[C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\prefab_config.json  ؕ2  ( 2d +[C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\prefab_config.json  2  ( 2d b -`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\symbol_folder_index.txt  ؕ2  W 2O +`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86\symbol_folder_index.txt  2  W 2O M -KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ؕ2  2 \ No newline at end of file +KC:\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/29y7472m/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/29y7472m/x86_64/configure_fingerprint.bin index 5a461c32..9c4c231e 100644 --- a/android/app/.cxx/Debug/29y7472m/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/29y7472m/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logl j hC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ؕ2  2i +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  2  2i g -eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\android_gradle_build.json  ؕ2 2n +eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\android_gradle_build.json  2 2n l -jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\android_gradle_build_mini.json  ؕ2 2[ +jC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\android_gradle_build_mini.json  2 2[ Y -WC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build.ninja  ؕ2 2_ +WC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build.ninja  2 2_ ] -[C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build.ninja.txt  ؕ2d +[C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build.ninja.txt  2d b -`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build_file_index.txt  ؕ2 K 2e +`C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\build_file_index.txt  2 K 2e c -aC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\compile_commands.json  ؕ2i +aC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\compile_commands.json  2i g -eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\compile_commands.json.bin  ؕ2 o +eC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\compile_commands.json.bin  2 o m -kC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\metadata_generation_command.txt  ؕ2 +kC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\metadata_generation_command.txt  2  2b ` -^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\prefab_config.json  ؕ2  ( 2g +^C:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\prefab_config.json  2  ( 2g e -cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\symbol_folder_index.txt  ؕ2  Z 2O +cC:\Flutter Applications\Git_New\FCSC\android\app\.cxx\Debug\29y7472m\x86_64\symbol_folder_index.txt  2  Z 2O M -KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  ؕ2  2 \ No newline at end of file +KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txt  2  2 \ No newline at end of file diff --git a/assets/competitiveness/multi.png b/assets/competitiveness/multi.png new file mode 100644 index 00000000..534a48cf Binary files /dev/null and b/assets/competitiveness/multi.png differ diff --git a/lib/config/my_router.dart b/lib/config/my_router.dart index 946368d6..23f6a666 100644 --- a/lib/config/my_router.dart +++ b/lib/config/my_router.dart @@ -672,7 +672,9 @@ final GoRouter router = GoRouter( path: '/reportDetail', builder: (context, state) { final report = state.extra as Map; - return ReportDetailPage(); + return ReportDetailPage( + title:report['title']!, + ); }, ), diff --git a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart index f86bf21e..2e193b96 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart @@ -4,10 +4,61 @@ import 'package:uae_stat/domain/use_cases/language.dart'; import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart'; class ReportDetailPage extends StatelessWidget { - const ReportDetailPage({super.key}); + final String title; + ReportDetailPage({super.key, required this.title}); + + @override + Widget build(BuildContext context) { + late String rank; + late String edition; + late String para; + final List> contentData=[ + { + 'title':context.translate('Prosperity Index (2023)', 'تقرير مؤشر الازدهار (2023)',),'rank':'44' ,'edition':'41','content': context.translate( + 'The Legatum Prosperity Index is published annually by the Legatum Institute. It is a policy-focused report that measures the current state of prosperity since 2007. Using the Prosperity Index framework, nations around the world can assess their strengths and weaknesses in order to determine the economic and strategic choices that need to be made to further build inclusive societies, open economies, and empowered people to drive greater levels of prosperity.', + 'تم إصدار تقرير مؤشر الازدهار من قبل معهد ليجاتم لأول مرة في عام 2007 ويتم إصداره بشكل سنوي. يقيس التقرير جهود 167 دولة لتعزيز رفاه مواطنيها عبر 12 محور التي تضم 300 مؤشر (منقسمين إلى 192 بيانات إحصائية و108 استبيانات).', + ), + }, + { + 'title':context.translate('World Happiness Report (2023)', 'تقرير مؤشر الازدهار (2023)',),'rank':'24' ,'edition':'26','content': context.translate( + 'The World Happiness Report was first published in 2012, by the United Nations Sustainable Development Solutions Network (UNSDSN).', + 'تقرير السعادة العالمية يصدر سنوياً عن شبكة تنمية الحلول المستدامة التابعة للأمانة العامة للأمم المتحدة.', + ), + }, + { + 'title':context.translate('Logistics Performance Index (2023)', 'تقرير مؤشر الازدهار (2023)',),'rank':'7' ,'edition':'11','content': context.translate( + 'The Logistics Performance Index (LPI) report is a tool developed by the World Bank to measure a country\'s logistics performance. The report uses a range of indicators such as customs performance, infrastructure quality, and logistics competence to assess a countrys logistics strengths and weaknesses. The latest report highlights the importance of efficient logistics systems for economic growth and competitiveness, and emphasizes the need for investment in infrastructure and digitalization. The LPI report is a valuable resource for policymakers and businesses looking to understand a country\'s logistics performance and identify areas for improvement.', + 'تقرير مؤشر أداء الخدمات اللوجستية (LPI) هو أداة طورها البنك الدولي لقياس أداء الخدمات اللوجستية في بلد ما. يستخدم التقرير مجموعة من المؤشرات مثل أداء الجمارك ، وجودة البنية التحتية ، والكفاءة اللوجستية لتقييم نقاط القوة والضعف اللوجستية للبلد. يسلط التقرير الأخير الضوء على أهمية النظم اللوجستية الفعالة للنمو الاقتصادي والقدرة التنافسية ، ويؤكد على الحاجة إلى الاستثمار في البنية التحتية والرقمنة. يعد تقرير LPI مورداً قيماً لواضعي السياسات والشركات التي تتطلع إلى فهم الأداء اللوجستي للبلد وتحديد مجالات التحسين.' + ), + }, + + ]; + + void ContentChange(){ + rank = ''; + edition = ''; + para = ''; + for (var content in contentData){ + print('${content['title']} and $title are finout'); + if(content['title']==title){ + rank=content['rank']; + edition=content['edition']; + para=content['content']; + print('competiviness change $edition and $rank'); + }else { + rank='40'; + edition='41'; + para= context.translate( + 'The Legatum Prosperity Index is published annually by the Legatum Institute. It is a policy-focused report that measures the current state of prosperity since 2007. Using the Prosperity Index framework, nations around the world can assess their strengths and weaknesses in order to determine the economic and strategic choices that need to be made to further build inclusive societies, open economies, and empowered people to drive greater levels of prosperity.', + 'تم إصدار تقرير مؤشر الازدهار من قبل معهد ليجاتم لأول مرة في عام 2007 ويتم إصداره بشكل سنوي. يقيس التقرير جهود 167 دولة لتعزيز رفاه مواطنيها عبر 12 محور التي تضم 300 مؤشر (منقسمين إلى 192 بيانات إحصائية و108 استبيانات).', + ); + } + } + } + ContentChange(); return Theme( data: ThemeData( fontFamily: context.translate( @@ -32,7 +83,7 @@ class ReportDetailPage extends StatelessWidget { Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.grey.shade100, + color: Color(0xFFF5F5F5), borderRadius: BorderRadius.circular(12), ), child: Row( @@ -40,10 +91,11 @@ class ReportDetailPage extends StatelessWidget { children: [ Expanded( child: Text( - context.translate( - 'Prosperity Index (2023)', - 'تقرير مؤشر الازدهار (2023)', - ), + title, + // context.translate( + // 'Prosperity Index (2023)', + // 'تقرير مؤشر الازدهار (2023)', + // ), style: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, @@ -60,28 +112,28 @@ class ReportDetailPage extends StatelessWidget { ), const SizedBox(height: 24), - Text( - context.translate( - 'The Legatum Prosperity Index is published annually by the Legatum Institute. It is a policy-focused report that measures the current state of prosperity since 2007. Using the Prosperity Index framework, nations around the world can assess their strengths and weaknesses in order to determine the economic and strategic choices that need to be made to further build inclusive societies, open economies, and empowered people to drive greater levels of prosperity.', - 'تم إصدار تقرير مؤشر الازدهار من قبل معهد ليجاتم لأول مرة في عام 2007 ويتم إصداره بشكل سنوي. يقيس التقرير جهود 167 دولة لتعزيز رفاه مواطنيها عبر 12 محور التي تضم 300 مؤشر (منقسمين إلى 192 بيانات إحصائية و108 استبيانات).', + SizedBox( + height: MediaQuery.of(context).size.height*0.2, + child: Text( + para, + style: TextStyle(fontSize: 14), ), - style: TextStyle(fontSize: 14), ), const SizedBox(height: 24), // Ranking section Container( decoration: BoxDecoration( - color: Colors.grey[100], + color: Color(0xFFF5F5F5), borderRadius: BorderRadius.circular(12), ), - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), + padding: const EdgeInsets.symmetric(vertical: 3, horizontal: 8), child: Row( children: [ Expanded( child: _RankingCard( title: context.translate('Rank in 2023','تقرير مؤشر الازدهار (2023)'), - value: '44', + value: rank, icon: const Icon(Icons.arrow_downward, color: Colors.red, size: 25), ), ), @@ -95,7 +147,7 @@ class ReportDetailPage extends StatelessWidget { Expanded( child: _RankingCard( title: context.translate('vs. Previous Edition','مقابل الإصدار السابق'), - value: '41', + value: edition, icon: const SizedBox.shrink(), ), ), @@ -125,7 +177,7 @@ class ReportDetailPage extends StatelessWidget { _CountryRankingItem( title: 'First in GCC', country: context.translate('MULTIPLE COUNTRIES','دول متعددة'), - flagPath: 'assets/competitiveness/multi-frame.jpg', + flagPath: 'assets/competitiveness/multi.png', onTap: () => showDialog( context: context, builder: (context) => Dialog( @@ -190,7 +242,7 @@ class _RankingCard extends StatelessWidget { width: 160, padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.grey[100], + color: Color(0xFFF5F5F5), ), child: Column( children: [ @@ -249,7 +301,7 @@ class _CountryRankingItem extends StatelessWidget { children: [ Text( title, - style:TextStyle(fontSize: context.translate(14,11), color: Colors.black54), + style:TextStyle(fontSize: context.translate(14,11), color: Colors.black), ), const SizedBox(height: 4), Text( @@ -263,17 +315,29 @@ class _CountryRankingItem extends StatelessWidget { ), ), const SizedBox(width: 16), - ClipOval( - child: Container( - width: 50, - height: 50, - decoration: const BoxDecoration( - shape: BoxShape.circle, - color: Colors.transparent, - ), - child: Image.asset(flagPath, width: 50, height: 50, fit: BoxFit.cover), + + Container( + padding: EdgeInsets.zero, + decoration: BoxDecoration( + shape: BoxShape.circle, + border: Border.all(color: Colors.white, width: 3), + ), + child: CircleAvatar( + radius: 20, + backgroundImage: AssetImage(flagPath,), ), ), + // ClipOval( + // child: Container( + // width: 50, + // height: 50, + // decoration: const BoxDecoration( + // shape: BoxShape.circle, + // color: Colors.transparent, + // ), + // child: Image.asset(flagPath, width: 50, height: 50, fit: BoxFit.cover), + // ), + // ), ], ), ), diff --git a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart index a6530f07..29a2fcb4 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart @@ -125,7 +125,9 @@ class Competitiveness extends StatelessWidget { child: InkWell( onTap: () { // Navigate to detail page with arguments - context.push('/reportDetail', extra: report); + context.push('/reportDetail', extra:{ + 'title':context.translate(report['title'],report['title-ar']), + }); }, child: Container( decoration: BoxDecoration(