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 90727238..bc15e9b8 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 24dcbb24..2eee5277 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 0b40aaf1..12db9828 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 19928d46..1972a437 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/country-profile/icons/animal.png b/assets/country-profile/icons/animal.png new file mode 100644 index 00000000..43ffbba2 Binary files /dev/null and b/assets/country-profile/icons/animal.png differ diff --git a/assets/country-profile/icons/chemical.png b/assets/country-profile/icons/chemical.png new file mode 100644 index 00000000..da829855 Binary files /dev/null and b/assets/country-profile/icons/chemical.png differ diff --git a/assets/country-profile/icons/food.png b/assets/country-profile/icons/food.png new file mode 100644 index 00000000..edb27d4a Binary files /dev/null and b/assets/country-profile/icons/food.png differ diff --git a/assets/country-profile/icons/metal.png b/assets/country-profile/icons/metal.png new file mode 100644 index 00000000..fc85476a Binary files /dev/null and b/assets/country-profile/icons/metal.png differ diff --git a/assets/country-profile/icons/vegetable.png b/assets/country-profile/icons/vegetable.png new file mode 100644 index 00000000..f122a34f Binary files /dev/null and b/assets/country-profile/icons/vegetable.png differ diff --git a/lib/infrastructure/services/img_asset_paths/icons/popup_asset_path.dart b/lib/infrastructure/services/img_asset_paths/icons/popup_asset_path.dart index 4bf483ac..f136634d 100644 --- a/lib/infrastructure/services/img_asset_paths/icons/popup_asset_path.dart +++ b/lib/infrastructure/services/img_asset_paths/icons/popup_asset_path.dart @@ -13,5 +13,11 @@ abstract class PopupAssetPath { static const perCapita = '$_basePath/perCapita.png'; static const population = '$_basePath/population.png'; static const real = '$_basePath/real.png'; - + static const stocks = '$_basePath/stocks.png'; + static const trade = '$_basePath/trade.png'; + static const vegetable = '$_basePath/vegetable.png'; + static const metal = '$_basePath/metal.png'; + static const food = '$_basePath/food.png'; + static const chemical = '$_basePath/chemical.png'; + static const animal = '$_basePath/animal.png'; } diff --git a/lib/presentation/Screens/Bottom Navigation Pages/Country_Profile/DetailedCountryProfilePage.dart b/lib/presentation/Screens/Bottom Navigation Pages/Country_Profile/DetailedCountryProfilePage.dart index a00d4e6a..6e4e8bd3 100644 --- a/lib/presentation/Screens/Bottom Navigation Pages/Country_Profile/DetailedCountryProfilePage.dart +++ b/lib/presentation/Screens/Bottom Navigation Pages/Country_Profile/DetailedCountryProfilePage.dart @@ -296,6 +296,10 @@ class CategoryPopupContent extends StatelessWidget { ), ), ); + final yellowDivider=Divider( + color: Color(0xFFE9BF70), + ); + final screenWidth=MediaQuery.of(context).size.width; switch (category) { case 'Demography': return Column( @@ -380,16 +384,16 @@ class CategoryPopupContent extends StatelessWidget { ), lineBorder, const SizedBox(height: 8), - const Icon(Icons.stacked_bar_chart, color: Colors.grey), + Image.asset(PopupAssetPath.IncomeLevel,width: 40,height: 40,), const SizedBox(height: 4), const Text( 'Income Level', - style: TextStyle(color: Colors.grey), + style: TextStyle(color: Color(0xFF666666),fontSize: 16), ), const SizedBox(height: 4), const Text( 'Upper Middle Income', - style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16), + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 28), ), const SizedBox(height: 16), ], @@ -401,7 +405,7 @@ class CategoryPopupContent extends StatelessWidget { children: [ const SizedBox(height: 16), _FDIItem( - icon: Icons.trending_down, + icon: PopupAssetPath.outflows, title: '2020 FDI Outflows (AED)', value: '4.75 B', growthRate: '-15.94%', @@ -409,7 +413,7 @@ class CategoryPopupContent extends StatelessWidget { ), lineBorder, _FDIItem( - icon: Icons.swap_horizontal_circle_outlined, + icon: PopupAssetPath.inflows, title: '2020 FDI Inflows (AED)', value: '14.75 B', growthRate: '-39.68%', @@ -417,7 +421,7 @@ class CategoryPopupContent extends StatelessWidget { ), lineBorder, _FDIItem( - icon: Icons.thumb_up_alt_outlined, + icon: PopupAssetPath.stocks, title: '2021 FDI Stocks (AED)', value: '18.98 B', growthRate: '89.75%', @@ -433,7 +437,7 @@ class CategoryPopupContent extends StatelessWidget { children: [ const SizedBox(height: 16), _TradeItem( - icon: Icons.cached, + icon: PopupAssetPath.trade, title: '2021 Total Trade (AED)', value: '603 B', growthRate: '39.89%', @@ -441,7 +445,7 @@ class CategoryPopupContent extends StatelessWidget { ), lineBorder, _TradeItem( - icon: Icons.download_outlined, + icon: PopupAssetPath.imports, title: '2021 Imports (AED)', value: '272.9 B', growthRate: '40.79%', @@ -449,7 +453,7 @@ class CategoryPopupContent extends StatelessWidget { ), lineBorder, _TradeItem( - icon: Icons.upload_outlined, + icon: PopupAssetPath.exports, title: '2021 Exports (AED)', value: '330.1 B', growthRate: '39.15%', @@ -472,60 +476,90 @@ class CategoryPopupContent extends StatelessWidget { ), const SizedBox(height: 8), const Center( - child: Text( - 'Total \$472.5M', - style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + child: Text.rich( + TextSpan( + text:'Total ', + style: TextStyle(fontSize: 20,), + children: [ + TextSpan( + text:'\$472.5M', + style: TextStyle(fontSize: 28,fontWeight: FontWeight.w500), + + ) + ] + ) ), ), const SizedBox(height: 16), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: const [ - _BilateralTradeValueBox( - label: 'Total Import', - value: '\$390.2M', - color: Color(0xFF00B292)), - _BilateralTradeValueBox( - label: 'Total Export', - value: '\$42.2M', - color: Color(0xFFDE4D86)), - _BilateralTradeValueBox( - label: 'Total ReExport', - value: '\$40.2M', - color: Color(0xFF4D52A1)), - ], + Center( + child: Container( + decoration: BoxDecoration( + color: Color(0xFFF8F8F8), + borderRadius: BorderRadius.circular(10), + ), + alignment: Alignment.center, + width: screenWidth * 0.90, + child:Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: const [ + _BilateralTradeValueBox( + label: 'Total Import', + value: '\$390.2M', + color: Color(0xFF5BB3AA), + isSelected: true, + ), + _BilateralTradeValueBox( + label: 'Total Export', + value: '\$42.2M', + color: Color(0xFFB57184), + isSelected: false, + ), + _BilateralTradeValueBox( + label: 'Total ReExport', + value: '\$40.2M', + color: Color(0xFF243E83), + isSelected: false, + ), + ], + ), + ), ), const SizedBox(height: 24), const Center( child: Text( 'Top 5 Import Commodities', style: TextStyle( - fontSize: 16, + fontSize: 20, fontWeight: FontWeight.bold, - color: Color(0xFF4FBFA8)), + color: Color(0xFF4FBFA8),), ), ), const SizedBox(height: 12), + yellowDivider, _CommodityRow( - icon: Icons.eco, + icon: PopupAssetPath.vegetable, label: 'Vegetable Products', - value: '\$198.6M'), + value: '\$198.6M',), + yellowDivider, _CommodityRow( - icon: Icons.liquor, + icon: PopupAssetPath.food, label: 'Foodstuffs, Beverages, Spirits And Tobacco', - value: '\$89.9M'), + value: '\$89.9M',), + yellowDivider, _CommodityRow( - icon: Icons.build, + icon: PopupAssetPath.metal, label: 'Base Metals And Articles Of Base Metal', - value: '\$65.6M'), + value: '\$65.6M',), + yellowDivider, _CommodityRow( - icon: Icons.pets, + icon: PopupAssetPath.animal, label: 'Live Animals And Their Products', - value: '\$23.7M'), + value: '\$23.7M',), + yellowDivider, _CommodityRow( - icon: Icons.science, + icon: PopupAssetPath.chemical, label: 'Products Of The Chemical or Allied Industries', - value: '\$4.7M'), + value: '\$4.7M',), const SizedBox(height: 16), ], ); @@ -548,11 +582,11 @@ Widget _DemographyItem({ height: 40, ), const SizedBox(height: 4), - Text(title, style: const TextStyle(color: Color(0xFF666666))), + Text(title, style: const TextStyle(color: Color(0xFF666666),fontSize: 20)), const SizedBox(height: 4), Text( value, - style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16), + style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 20), textAlign: TextAlign.center, ), ], @@ -577,7 +611,7 @@ Widget _DemographyStatItem({ height: 40, ), const SizedBox(height: 4), - Text(title, style: const TextStyle(color: Color(0xFF666666))), + Text(title, style: const TextStyle(color: Color(0xFF666666),fontSize: 16)), const SizedBox(height: 4), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -635,7 +669,7 @@ Widget _GDPMetricItem({ height: 40, ), const SizedBox(height: 4), - Text(title, style: const TextStyle(color: Color(0xFF666666))), + Text(title, style: const TextStyle(color: Color(0xFF666666),fontSize: 16)), const SizedBox(height: 4), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -673,7 +707,7 @@ Widget _GDPMetricItem({ } Widget _FDIItem({ - required IconData icon, + required String icon, required String title, required String value, required String growthRate, @@ -681,32 +715,55 @@ Widget _FDIItem({ }) { return Column( children: [ - Icon(icon, size: 32, color: Colors.grey), - const SizedBox(height: 4), - Text(title, style: const TextStyle(color: Colors.grey)), - const SizedBox(height: 4), - Text( - value, - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18, - color: Colors.black, - ), + Image.asset( + icon, + width: 40, + height: 40, ), - const SizedBox(height: 2), - Text( - '$growthRate Growth Rate', - style: TextStyle( - color: isPositive ? Colors.green : Colors.red, - fontSize: 12, + const SizedBox(height: 4), + Text(title, style: const TextStyle(color: Colors.grey,fontSize: 16),), + const SizedBox(height: 4), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + value, + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 28, + color: Colors.black, + ), ), + const SizedBox(width: 12,), + Column( + children: [ + Row( + children: [ + Text( + growthRate, + style: TextStyle(fontSize: 16, color:isPositive ? Colors.green : Colors.red,fontWeight: FontWeight.w500), + ), + Icon(isPositive ? Icons.arrow_upward:Icons.arrow_downward, size: 16, color: isPositive ? Colors.green : Colors.red), + ], + ), + + Text( + 'Growth Rate', + style: const TextStyle(fontSize: 12, color: Color(0xFF666666)), + ), + + + ], + ), + + ], ), ], ); } Widget _TradeItem({ - required IconData icon, + required String icon, required String title, required String value, required String growthRate, @@ -714,25 +771,48 @@ Widget _TradeItem({ }) { return Column( children: [ - Icon(icon, size: 32, color: Colors.grey), - const SizedBox(height: 4), - Text(title, style: const TextStyle(color: Colors.grey)), - const SizedBox(height: 4), - Text( - value, - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18, - color: Colors.black, - ), + Image.asset( + icon, + width: 40, + height: 40, ), - const SizedBox(height: 2), - Text( - '$growthRate Growth Rate', - style: TextStyle( - color: isPositive ? Colors.green : Colors.red, - fontSize: 12, - ), + const SizedBox(height: 4), + Text(title, style: const TextStyle(fontSize: 16,color: Colors.grey)), + const SizedBox(height: 4), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + value, + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 28, + color: Colors.black, + ), + ), + const SizedBox(width: 12,), + Column( + children: [ + Row( + children: [ + Text( + growthRate, + style: TextStyle(fontSize: 16, color:isPositive ? Colors.green : Colors.red,fontWeight: FontWeight.w500), + ), + Icon(isPositive ? Icons.arrow_upward:Icons.arrow_downward, size: 16, color: isPositive ? Colors.green : Colors.red), + ], + ), + + Text( + 'Growth Rate', + style: const TextStyle(fontSize: 12, color: Color(0xFF666666)), + ), + + + ], + ), + + ], ), ], ); @@ -742,34 +822,49 @@ class _BilateralTradeValueBox extends StatelessWidget { final String label; final String value; final Color color; + final bool isSelected; const _BilateralTradeValueBox({ required this.label, required this.value, required this.color, + required this.isSelected, }); @override Widget build(BuildContext context) { return Container( + height: 90, padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), decoration: BoxDecoration( - color: color.withOpacity(0.1), + color: isSelected?Colors.white:Colors.transparent, borderRadius: BorderRadius.circular(10), - border: Border.all(color: color), - ), + border: isSelected?Border.all(color:Color(0xFFAA8E83)):null, + boxShadow:isSelected ?[ + BoxShadow( + color: Color(0xFFAA8E83).withValues(alpha: 0.5), + blurRadius: 15, + spreadRadius: 0, + offset: Offset( + 0, + 5, + ), + ), + ]:null, + ), child: Column( + mainAxisAlignment: MainAxisAlignment.center, children: [ Text( label, - style: TextStyle(fontSize: 12, color: color), + style: TextStyle(fontSize: 13,), ), const SizedBox(height: 4), Text( value, style: TextStyle( fontWeight: FontWeight.bold, - fontSize: 14, + fontSize: 22, color: color, ), ), @@ -780,7 +875,7 @@ class _BilateralTradeValueBox extends StatelessWidget { } Widget _CommodityRow({ - required IconData icon, + required String icon, required String label, required String value, }) { @@ -788,15 +883,20 @@ Widget _CommodityRow({ padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12), child: Row( children: [ - Icon(icon, size: 20, color: Colors.grey[600]), + Image.asset( + icon, + width: 35, + height:35, + ), const SizedBox(width: 12), Expanded( - child: Text(label, style: const TextStyle(fontSize: 14)), + child: Text(label, style: const TextStyle(fontSize: 13,fontWeight: FontWeight.w500)), ), Text( value, - style: const TextStyle( - fontWeight: FontWeight.bold, color: Colors.teal), + style: const TextStyle(fontSize: 13, + fontWeight: FontWeight.w500, + color: Color(0xFF54AFA6),), ), ], ), @@ -806,7 +906,7 @@ Widget _CommodityRow({ void showCategoryPopup(BuildContext context, String category) { showDialog( context: context, - barrierColor: Colors.black.withOpacity(0.3), + barrierColor: Colors.black.withValues(alpha: 0.3), builder: (context) => BackdropFilter( filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5), child: Dialog(