From 4ed46d5d54ec5a4851f08851e0252b386e43c45c Mon Sep 17 00:00:00 2001 From: Kalonkarthik Date: Tue, 1 Jul 2025 16:55:03 +0530 Subject: [PATCH] competitvness arabic --- .../arm64-v8a/configure_fingerprint.bin | 24 +- .../armeabi-v7a/configure_fingerprint.bin | 24 +- .../29y7472m/x86/configure_fingerprint.bin | 24 +- .../29y7472m/x86_64/configure_fingerprint.bin | 24 +- android/app/build.gradle | 2 +- .../Detailedcompetitiveness.dart | 291 +++++++++--------- .../Competitiveness/competitiveness.dart | 54 +++- 7 files changed, 239 insertions(+), 204 deletions(-) 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 fcf06373..79508265 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 ff41ca69..1e7843d8 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 4d9777d9..8a6f28eb 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 b3ed8ace..9dedf771 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/android/app/build.gradle b/android/app/build.gradle index 59a83dd5..89e91db4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -70,7 +70,7 @@ android { release { // TODO: Add your own signing config for the release build. // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.release +// signingConfig signingConfigs.release minifyEnabled true // Enable code shrinking for smaller APKs shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart index 7ff17113..f86bf21e 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/Detailedcompetitiveness.dart @@ -8,153 +8,164 @@ class ReportDetailPage extends StatelessWidget { @override Widget build(BuildContext context) { - return BaseScaffold( - title: Text( - context.translate( - 'UAE Competitiveness', - 'التقارير التنافسيه لدولة الامارات', - ), - style: TextStyle( - fontFamily: context.translate('Roboto', 'NotoKufi'), + return Theme( + data: ThemeData( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), ), - showBackButton: true, - body: SingleChildScrollView( - padding: const EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - // Header - Container( - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: Colors.grey.shade100, - borderRadius: BorderRadius.circular(12), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - 'Prosperity Index (2023)', - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.bold, + child: BaseScaffold( + title: Text( + context.translate( + 'UAE Competitiveness', + 'التقارير التنافسيه لدولة الامارات', + ), + ), + showBackButton: true, + body: SingleChildScrollView( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Header + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.grey.shade100, + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + context.translate( + 'Prosperity Index (2023)', + 'تقرير مؤشر الازدهار (2023)', + ), + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + ), ), ), - ), - Image.asset( - 'assets/competitiveness/solo.png', - height: 71, - width: 84, - ), - ], - ), - ), - const SizedBox(height: 24), - - const Text( - '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.', - style: TextStyle(fontSize: 14), - ), - const SizedBox(height: 24), - - // Ranking section - Container( - decoration: BoxDecoration( - color: Colors.grey[100], - borderRadius: BorderRadius.circular(12), - ), - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), - child: Row( - children: [ - Expanded( - child: _RankingCard( - title: 'Rank in 2023', - value: '44', - icon: const Icon(Icons.arrow_downward, color: Colors.red, size: 25), + Image.asset( + 'assets/competitiveness/solo.png', + height: 71, + width: 84, ), - ), - SizedBox( - height: 60, - width: 1, - child: CustomPaint( - painter: DottedLinePainter(), - ), - ), - Expanded( - child: _RankingCard( - title: 'vs. Previous Edition', - value: '41', - icon: const SizedBox.shrink(), - ), - ), - ], + ], + ), ), - ), - const SizedBox(height: 24), + const SizedBox(height: 24), - // Country ranking section - Container( - decoration: BoxDecoration( - color: const Color(0xFFF5F5F5), - borderRadius: BorderRadius.circular(12), + 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 استبيانات).', + ), + style: TextStyle(fontSize: 14), ), - padding: const EdgeInsets.symmetric(vertical: 8), - child: Column( - children: [ - _CountryRankingItem( - title: 'First Globally', - country: 'DENMARK', - flagPath: 'assets/country_flags/de.png', - ), - const Padding( - padding: EdgeInsets.symmetric(horizontal: 8), - child: DottedDivider(), - ), - _CountryRankingItem( - title: 'First in GCC', - country: 'MULTIPLE COUNTRIES', - flagPath: 'assets/competitiveness/multi-frame.jpg', - onTap: () => showDialog( - context: context, - builder: (context) => Dialog( - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), - child: Container( - padding: const EdgeInsets.all(16), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - _CountryItem(name: 'Argentina', flag: 'assets/country_flags/ar.png'), - _CountryItem(name: 'Bahrain', flag: 'assets/country_flags/ba.png'), - _CountryItem(name: 'Denmark', flag: 'assets/country_flags/de.png'), - _CountryItem(name: 'Finland', flag: 'assets/country_flags/fi.png'), - _CountryItem(name: 'Oman', flag: 'assets/country_flags/am.png'), - _CountryItem(name: 'Singapore', flag: 'assets/country_flags/si.png'), - _CountryItem(name: 'Saudi Arabia', flag: 'assets/country_flags/sa.png'), - ], + const SizedBox(height: 24), + + // Ranking section + Container( + decoration: BoxDecoration( + color: Colors.grey[100], + borderRadius: BorderRadius.circular(12), + ), + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 8), + child: Row( + children: [ + Expanded( + child: _RankingCard( + title: context.translate('Rank in 2023','تقرير مؤشر الازدهار (2023)'), + value: '44', + icon: const Icon(Icons.arrow_downward, color: Colors.red, size: 25), + ), + ), + SizedBox( + height: 60, + width: 1, + child: CustomPaint( + painter: DottedLinePainter(), + ), + ), + Expanded( + child: _RankingCard( + title: context.translate('vs. Previous Edition','مقابل الإصدار السابق'), + value: '41', + icon: const SizedBox.shrink(), + ), + ), + ], + ), + ), + const SizedBox(height: 24), + + // Country ranking section + Container( + decoration: BoxDecoration( + color: const Color(0xFFF5F5F5), + borderRadius: BorderRadius.circular(12), + ), + padding: const EdgeInsets.symmetric(vertical: 8), + child: Column( + children: [ + _CountryRankingItem( + title: context.translate('First Globally','أولاً عالمياً'), + country: context.translate('DENMARK','الدنمارك'), + flagPath: 'assets/country_flags/de.png', + ), + const Padding( + padding: EdgeInsets.symmetric(horizontal: 8), + child: DottedDivider(), + ), + _CountryRankingItem( + title: 'First in GCC', + country: context.translate('MULTIPLE COUNTRIES','دول متعددة'), + flagPath: 'assets/competitiveness/multi-frame.jpg', + onTap: () => showDialog( + context: context, + builder: (context) => Dialog( + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), + child: Container( + padding: const EdgeInsets.all(16), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(12), + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + _CountryItem(name: context.translate('Argentina','الأرجنتين'), flag: 'assets/country_flags/ar.png'), + _CountryItem(name: context.translate('Bahrain','البحرين') ,flag: 'assets/country_flags/ba.png'), + _CountryItem(name: context.translate('Denmark','الدنمارك'), flag: 'assets/country_flags/de.png'), + _CountryItem(name: context.translate('Finland','فنلندا'), flag: 'assets/country_flags/fi.png'), + _CountryItem(name: context.translate('Oman','عمان') ,flag: 'assets/country_flags/am.png'), + _CountryItem(name: context.translate('Singapore','سنغافورة'), flag: 'assets/country_flags/si.png'), + _CountryItem(name: context.translate('Saudi Arabia','المملكة العربية السعودية'), flag: 'assets/country_flags/sa.png'), + ], + ), ), ), ), ), - ), - const Padding( - padding: EdgeInsets.symmetric(horizontal: 8), - child: DottedDivider(), - ), - _CountryRankingItem( - title: 'First in Arab Countries', - country: 'UNITED ARAB EMIRATES', - flagPath: 'assets/country_flags/ga.png', - ), - ], + const Padding( + padding: EdgeInsets.symmetric(horizontal: 8), + child: DottedDivider(), + ), + _CountryRankingItem( + title: context.translate('First in Arab Countries','الأول في دول مجلس التعاون الخليجي'), + country: context.translate('UNITED ARAB EMIRATES','الإمارات العربية المتحدة'), + flagPath: 'assets/country_flags/ga.png', + ), + ], + ), ), - ), - ], + ], + ), ), ), ); @@ -186,7 +197,7 @@ class _RankingCard extends StatelessWidget { Text( title, textAlign: TextAlign.center, - style: const TextStyle(fontSize: 13, color: Colors.black54), + style: TextStyle(fontSize: context.translate(13,11),fontWeight: FontWeight.w500,), ), const SizedBox(height: 4), Row( @@ -194,8 +205,8 @@ class _RankingCard extends StatelessWidget { children: [ Text( value, - style: const TextStyle( - fontSize: 36, + style: TextStyle( + fontSize: context.translate(36,32), fontWeight: FontWeight.bold, ), ), @@ -238,13 +249,13 @@ class _CountryRankingItem extends StatelessWidget { children: [ Text( title, - style: const TextStyle(fontSize: 14, color: Colors.black54), + style:TextStyle(fontSize: context.translate(14,11), color: Colors.black54), ), const SizedBox(height: 4), Text( country, - style: const TextStyle( - fontSize: 20, + style: TextStyle( + fontSize: context.translate(20,18), fontWeight: FontWeight.bold, ), ), diff --git a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart index 6f0e331b..a6530f07 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/Competitiveness/competitiveness.dart @@ -14,20 +14,26 @@ class Competitiveness extends StatelessWidget { if (didPop) return; context.go('/myhomepage'); }, - child: BaseScaffold( - title: Text( - context.translate( - 'UAE Competitiveness', - 'تنافسية دولة الإمارات العربية المتحدة', - ), - style: TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ) + child: Theme( + data: ThemeData( + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', ), ), - body: CompetitivenessState(context), + child: BaseScaffold( + mytitleColor: Colors.black, + title: Text( + context.translate( + 'UAE Competitiveness', + 'تنافسية دولة الإمارات العربية المتحدة', + ), + style: TextStyle( + fontSize: context.translate(22, 16), + ), + ), + body: CompetitivenessState(context), + ), ), ); } @@ -36,59 +42,76 @@ class Competitiveness extends StatelessWidget { final List> reports = [ { 'rank': 44, + 'title-ar':'تقرير مؤشر الازدهار (2023)', 'title': 'Prosperity Index (2023)', 'logo': 'assets/competitiveness/solo.png', 'borderColor': Colors.blue, }, { 'rank': 26, + 'title-ar':'تقرير السعادة العالمية (2023)', 'title': 'World Happiness Report (2023)', 'logo': 'assets/competitiveness/soloo.png', 'borderColor': Color(0xFF844F36), }, { 'rank': 7, + 'title-ar':'مؤشر أداء الخدمات اللوجستية (2023)', 'title': 'Logistics Performance Index (2023)', 'logo': 'assets/competitiveness/solo.png', 'borderColor': Colors.blue, }, { 'rank': 10, + 'title-ar':'مؤشر الإرهاب العالمي (2023)', 'title': 'Global Soft Power Index (2023)', 'logo': 'assets/competitiveness/soloo.png', 'borderColor': Colors.blue, }, { 'rank': 76, + 'title-ar':'مؤشر الإرهاب العالمي (2023)', 'title': 'Global Terrorism Index (2023)', 'logo': 'assets/competitiveness/solo.png', 'borderColor': Color(0xFF844F36), }, { 'rank': 10, + 'title-ar':'الكتاب السنوي للتنافسية العالمية (2023)', 'title': 'The World Competitiveness Yearbook (2023)', 'logo': 'assets/competitiveness/soloo.png', 'borderColor': Colors.blue, }, { 'rank': 71, + 'title-ar':'تقرير الفجوة بين الجنسين العالمية (2023)', 'title': 'Global Gender Gap Report (2023)', 'logo': 'assets/competitiveness/solo.png', 'borderColor': Colors.blue, }, { 'rank': 29, + 'title-ar':'مؤشر الأداء الصناعي التنافسي (2023)', 'title': 'Competitive Industrial Performance Index (2023)', 'logo': 'assets/competitiveness/soloo.png', 'borderColor': Color(0xFF844F36), }, ]; + Widget rankDivider=Container( + margin: EdgeInsets.all(5), + width: 1, + height: 40, + color: Colors.grey, + ); + return Column( children: [ SizedBox(height: 16), Text( - '(22) Competitive Reports', + context.translate( + '(22) Competitive Reports', + 'التقارير التنافسية (22)',), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600), ), SizedBox(height: 12), @@ -126,10 +149,11 @@ class Competitiveness extends StatelessWidget { ), ], ), - const SizedBox(width: 12), + const SizedBox(width: 8), + rankDivider, Expanded( child: Text( - report['title'], + context.translate(report['title'],report['title-ar']), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), ), ),