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),);}