diff --git a/android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin index 4a6935cb..e34b6775 100644 --- a/android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log} { y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  LJ3  2z +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  2z x -v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build.json  LJ3 2 +v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build.json  3 2 } -{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build_mini.json  LJ3 2l +{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/android_gradle_build_mini.json  3 2l j -h/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja  LJ3 2p +h/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja  3 2p n -l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja.txt  LJ3u +l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build.ninja.txt  3u s -q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build_file_index.txt  LJ3 _ 2v +q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/build_file_index.txt  3 _ 2v t -r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json  LJ3z +r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json  3z x -v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json.bin  LJ3  +v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/compile_commands.json.bin  3  ~ -|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/metadata_generation_command.txt  LJ3 +|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/metadata_generation_command.txt  3  2s q -o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/prefab_config.json  LJ3  ( 2x +o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/prefab_config.json  3  ( 2x v -t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/symbol_folder_index.txt  LJ3  k 2c +t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/symbol_folder_index.txt  3  k 2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  LJ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin index 939aa973..24ffd646 100644 --- a/android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log } {/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ƌLJ3  2| +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  2| z -x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  ƌLJ3 2 +x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  3 2  -}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build_mini.json  ƌLJ3 2n +}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build_mini.json  3 2n l -j/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja  ƌLJ3 2r +j/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja  3 2r p -n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja.txt  ƌLJ3w +n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build.ninja.txt  3w u -s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build_file_index.txt  ƌLJ3 _ 2x +s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/build_file_index.txt  3 _ 2x v -t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json  ƌLJ3| +t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json  3| z -x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json.bin  ƌLJ3  +x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/compile_commands.json.bin  3   -~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/metadata_generation_command.txt  ƌLJ3 +~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/metadata_generation_command.txt  3  2u s -q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/prefab_config.json  ƌLJ3  ( 2z +q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/prefab_config.json  3  ( 2z x -v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/symbol_folder_index.txt  ƌLJ3  m 2c +v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/symbol_folder_index.txt  3  m 2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ƌLJ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin b/android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin index af87fa84..74f9a3f8 100644 --- a/android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logw u s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ɌLJ3  2t +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  2t r -p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build.json  ɌLJ3 2y +p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build.json  3 2y w -u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build_mini.json  ɌLJ3 2f +u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/android_gradle_build_mini.json  3 2f d -b/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja  ɌLJ3 2j +b/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja  3 2j h -f/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja.txt  ɌLJ3o +f/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build.ninja.txt  3o m -k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build_file_index.txt  ɌLJ3 _ 2p +k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/build_file_index.txt  3 _ 2p n -l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json  ɌLJ3t +l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json  3t r -p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json.bin  ɌLJ3 z +p/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/compile_commands.json.bin  3 z x -v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/metadata_generation_command.txt  ɌLJ3 +v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/metadata_generation_command.txt  3  2m k -i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/prefab_config.json  ɌLJ3  ( 2r +i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/prefab_config.json  3  ( 2r p -n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/symbol_folder_index.txt  ɌLJ3  e 2c +n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/symbol_folder_index.txt  3  e 2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ɌLJ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin b/android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin index b6018356..502105eb 100644 --- a/android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Logz x v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ̌LJ3  2w +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  2w u -s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build.json  ͌LJ3 2| +s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build.json  3 2| z -x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build_mini.json  ͌LJ3 2i +x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/android_gradle_build_mini.json  3 2i g -e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  ͌LJ3 2m +e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  3 2m k -i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja.txt  ͌LJ3r +i/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja.txt  3r p -n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build_file_index.txt  ͌LJ3 _ 2s +n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build_file_index.txt  3 _ 2s q -o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json  ͌LJ3w +o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json  3w u -s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json.bin  ͌LJ3 } +s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/compile_commands.json.bin  3 } { -y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/metadata_generation_command.txt  ͌LJ3 +y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/metadata_generation_command.txt  3  2p n -l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/prefab_config.json  ͌LJ3  ( 2u +l/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/prefab_config.json  3  ( 2u s -q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/symbol_folder_index.txt  ͌LJ3  h 2c +q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/symbol_folder_index.txt  3  h 2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ͌LJ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/configure_fingerprint.bin index 28e12edd..01063997 100644 --- a/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ȇ3  ǟ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ُ3  ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/android_gradle_build.json  ȇ3 ǟ2 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/android_gradle_build.json  ڏ3 ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/android_gradle_build_mini.json  ȇ3 ǟ2u +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/android_gradle_build_mini.json  ڏ3 ǟ2u s -q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build.ninja  ȇ3 ǟ2y +q/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build.ninja  ڏ3 ǟ2y w -u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build.ninja.txt  ȇ3~ +u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build.ninja.txt  ڏ3~ | -z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build_file_index.txt  ȇ3 _ ǟ2 +z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/build_file_index.txt  ڏ3 _ ǟ2 } -{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/compile_commands.json  ȇ3 +{/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/compile_commands.json  ڏ3  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/compile_commands.json.bin  ȇ3  +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/compile_commands.json.bin  ڏ3   -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/metadata_generation_command.txt  ȇ3 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/metadata_generation_command.txt  ڏ3  ǟ2| z -x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/prefab_config.json  ȇ3  ( ǟ2 +x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/prefab_config.json  ڏ3  ( ǟ2  -}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/symbol_folder_index.txt  ȇ3  t ǟ2c +}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/symbol_folder_index.txt  ڏ3  t ǟ2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ȇ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ڏ3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/configure_fingerprint.bin index 5b3023ae..c32c0dae 100644 --- a/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ȇ3  ǟ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build.json  ȇ3 ǟ2 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build.json  3 ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build_mini.json  ȇ3 ǟ2w +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build_mini.json  3 ǟ2w u -s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build.ninja  ȇ3 ǟ2{ +s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build.ninja  3 ǟ2{ y -w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build.ninja.txt  ȇ3 +w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build.ninja.txt  3 ~ -|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build_file_index.txt  ȇ3 _ ǟ2 +|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build_file_index.txt  3 _ ǟ2  -}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json  ȇ3 +}/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json  3  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json.bin  ȇ3  +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json.bin  3   -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/metadata_generation_command.txt  ȇ3 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/metadata_generation_command.txt  3  ǟ2~ | -z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/prefab_config.json  ȇ3  ( ǟ2 +z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/prefab_config.json  3  ( ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/symbol_folder_index.txt  ȇ3  v ǟ2c +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/symbol_folder_index.txt  3  v ǟ2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ȇ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/configure_fingerprint.bin index 2da1bf2b..022b1326 100644 --- a/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log ~ |/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ȇ3  ǟ2} +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  ǟ2} { -y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/android_gradle_build.json  ȇ3 ǟ2 +y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/android_gradle_build.json  3 ǟ2  -~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/android_gradle_build_mini.json  ȇ3 ǟ2o +~/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/android_gradle_build_mini.json  3 ǟ2o m -k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build.ninja  ȇ3 ǟ2s +k/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build.ninja  3 ǟ2s q -o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build.ninja.txt  ȇ3x +o/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build.ninja.txt  3x v -t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build_file_index.txt  ȇ3 _ ǟ2y +t/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/build_file_index.txt  3 _ ǟ2y w -u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/compile_commands.json  ȇ3} +u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/compile_commands.json  3} { -y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/compile_commands.json.bin  ȇ3  +y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/compile_commands.json.bin  3   -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/metadata_generation_command.txt  ȇ3 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/metadata_generation_command.txt  3  ǟ2v t -r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/prefab_config.json  ȇ3  ( ǟ2{ +r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/prefab_config.json  3  ( ǟ2{ y -w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/symbol_folder_index.txt  ȇ3  n ǟ2c +w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/symbol_folder_index.txt  3  n ǟ2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ȇ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/configure_fingerprint.bin b/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/configure_fingerprint.bin index 4114b4e4..09c78d71 100644 --- a/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/configure_fingerprint.bin +++ b/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/configure_fingerprint.bin @@ -2,27 +2,27 @@ C/C++ Structured Log  /Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/additional_project_files.txtC A -?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ȇ3  ǟ2 +?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  3  ǟ2 ~ -|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build.json  ȇ3 ǟ2 +|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build.json  3 ǟ2  -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build_mini.json  ȇ3 ǟ2r +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build_mini.json  3 ǟ2r p -n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build.ninja  ȇ3 ǟ2v +n/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build.ninja  3 ǟ2v t -r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build.ninja.txt  ȇ3{ +r/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build.ninja.txt  3{ y -w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build_file_index.txt  ȇ3 _ ǟ2| +w/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/build_file_index.txt  3 _ ǟ2| z -x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/compile_commands.json  ȇ3 +x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/compile_commands.json  3 ~ -|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/compile_commands.json.bin  ȇ3  +|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/compile_commands.json.bin  3   -/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/metadata_generation_command.txt  ȇ3 +/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/metadata_generation_command.txt  3  ǟ2y w -u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/prefab_config.json  ȇ3  ( ǟ2~ +u/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/prefab_config.json  3  ( ǟ2~ | -z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/symbol_folder_index.txt  ȇ3  q ǟ2c +z/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/symbol_folder_index.txt  3  q ǟ2c a -_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ȇ3  ހ2 \ No newline at end of file +_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  3  ހ2 \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index fc4f1720..79716a9f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -20,12 +20,12 @@ if (project.hasProperty('google-services.json')) { def flutterVersionCode = localProperties.getProperty("flutter.versionCode") if (flutterVersionCode == null) { - flutterVersionCode = "62" + flutterVersionCode = "63" } def flutterVersionName = localProperties.getProperty("flutter.versionName") if (flutterVersionName == null) { - flutterVersionName = "1.0.61" + flutterVersionName = "1.0.62" } def keystorePropertiesFile = rootProject.file("key.properties") diff --git a/assets/icons/uae_numbers/ShareDark.png b/assets/icons/uae_numbers/ShareDark.png index ea202abe..7ddb90d0 100644 Binary files a/assets/icons/uae_numbers/ShareDark.png and b/assets/icons/uae_numbers/ShareDark.png differ diff --git a/assets/icons/uae_numbers/ShareLight.png b/assets/icons/uae_numbers/ShareLight.png index 1a60bccc..afb37751 100644 Binary files a/assets/icons/uae_numbers/ShareLight.png and b/assets/icons/uae_numbers/ShareLight.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index bfd71a07..a737e729 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -322,10 +322,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -354,10 +358,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; @@ -498,7 +506,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_TEAM = 9N5SRFUGK2; ENABLE_BITCODE = NO; @@ -509,7 +517,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.7; + MARKETING_VERSION = 1.0.8; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -697,7 +705,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_TEAM = 9N5SRFUGK2; ENABLE_BITCODE = NO; @@ -708,7 +716,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.7; + MARKETING_VERSION = 1.0.8; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -734,7 +742,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 8; + CURRENT_PROJECT_VERSION = 9; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_TEAM = 9N5SRFUGK2; ENABLE_BITCODE = NO; @@ -745,7 +753,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.7; + MARKETING_VERSION = 1.0.8; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/config/my_router.dart b/lib/config/my_router.dart index 23f6a666..50de605f 100644 --- a/lib/config/my_router.dart +++ b/lib/config/my_router.dart @@ -692,7 +692,7 @@ final GoRouter router = GoRouter( if (state.uri.path == '/SessionCheckScreen' || state.uri.path == '/login' || state.uri.path == '/register' || - state.uri.path == '/forgot-password/:email'|| + state.uri.path.startsWith('/forgot-password/') || state.uri.path == '/termsandconditions'|| state.uri.path == '/privacy_policy' ) { diff --git a/lib/l10n/intl_ar.arb b/lib/l10n/intl_ar.arb index a862c53f..5776d62b 100644 --- a/lib/l10n/intl_ar.arb +++ b/lib/l10n/intl_ar.arb @@ -3,6 +3,9 @@ "economy_title":"اقتصاد", "social_title":"اجتماعي", "environment_title":"بيئة", + "economy_title_upper": "اقتصاد", + "social_title_upper": "اجتماعي", + "environment_title_upper": "بيئة", "bookmarks": "الإشارات المرجعية", "searchCountry": "Search Country", "feedback_title": "تعليق", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 9ae73899..a4aabcb2 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -3,6 +3,9 @@ "economy_title": "Economy", "social_title": "Social", "environment_title": "Environment", + "economy_title_upper": "ECONOMY", + "social_title_upper": "SOCIAL", + "environment_title_upper": "ENVIRONMENT", "bookmarks": "Bookmarks", "searchCountry": "Search Country", "feedback_title": "Feedback", 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 9a1816cb..3ca5dd96 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 @@ -18,6 +18,7 @@ import 'package:uae_stat/presentation/components/constant/constant.dart'; import 'package:http/http.dart' as http; import 'package:uae_stat/config/api_config.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +// import 'package:uae_stat/l10n/app_localizations.dart'; class UaeNumbers extends ConsumerWidget { const UaeNumbers({super.key}); @@ -35,8 +36,7 @@ class UaeNumbers extends ConsumerWidget { // } @override - Widget build(BuildContext context,WidgetRef ref) { - + Widget build(BuildContext context, WidgetRef ref) { final isDarkTheme = ref.watch(themeProvider) == ThemeMode.dark || (ref.watch(themeProvider) == ThemeMode.system && MediaQuery.of(context).platformBrightness == Brightness.dark); @@ -53,14 +53,14 @@ class UaeNumbers extends ConsumerWidget { backgroundColor: isDarkTheme ? Color(0xFF333333) : Color(0xFF414042), title: Text( context.translate( - 'UAE Numbers', - 'أرقام الإمارات', - ), + 'UAE Numbers', + 'أرقام الإمارات', + ), style: TextStyle( - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', - ), + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), color: isDarkTheme ? Color(0xFFFFFFFF) : Color(0xFF000000), ), ), @@ -100,7 +100,7 @@ class _UaenumberWidgetState extends ConsumerState { MediaQuery.of(context).platformBrightness == Brightness.dark); final themeMode = (isDark ? 'dark' : 'light'); - fetchData(locale?.languageCode ?? 'en',themeMode); + fetchData(locale?.languageCode ?? 'en', themeMode); _searchController.addListener(() { setState(() { filterData(_searchController.text); @@ -114,10 +114,11 @@ class _UaenumberWidgetState extends ConsumerState { super.dispose(); } - Future fetchData(locale,themeMode) async { + Future fetchData(locale, themeMode) async { const baseUrl = '$apiUrl/api/getUAENumbersData'; try { - final response = await http.get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode')); + final response = await http + .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode')); if (response.statusCode == 200) { setState(() { homePageData = (json.decode(response.body) as List) @@ -215,7 +216,7 @@ class _UaenumberWidgetState extends ConsumerState { MediaQuery.of(context).platformBrightness == Brightness.dark); final themeString = isDark ? 'dark' : 'light'; - fetchData(localeCode,themeString); + fetchData(localeCode, themeString); }); ref.listen(themeProvider, (previous, next) async { @@ -234,7 +235,7 @@ class _UaenumberWidgetState extends ConsumerState { MediaQuery.of(context).platformBrightness == Brightness.dark); final themeString = isDark ? 'dark' : 'light'; - fetchData(localeCode,themeString); + fetchData(localeCode, themeString); }); final themeMode = ref.watch(themeProvider); @@ -265,115 +266,128 @@ class _UaenumberWidgetState extends ConsumerState { } return Container( - color: isDarkTheme ? Color(0xFF000000) : Color(0xFFFFFFFF), // Set background here - child: Padding( - padding: const EdgeInsets.only(left: 16.0, right: 16.0, top: 5.0, bottom: 5.0), - child: Column( - children: [ - Container( - height: 40, - decoration: BoxDecoration( - color: isDarkTheme ? Color(0xFF000000) : Colors.white, - borderRadius: BorderRadius.circular(5.0), - border: Border.all(width: 2, color: Color(0xFFA0A0A0)), - ), - child: Padding( - padding: EdgeInsets.only(left: 5.0), - child: TextField( - controller: _searchController, - onChanged: (value) { - filterData(value); - }, - decoration: InputDecoration( - hintText: AppLocalizations.of(context)!.search, - hintStyle: TextStyle( - color: isDarkTheme ? Color(0xFF898C81) : Color(0xFF898C81), - fontFamily: context.translate('Roboto', 'NotoKufi'), - fontSize: 18, - // height: 1.8, - ), - prefixIconConstraints: BoxConstraints( - maxWidth: 42, - maxHeight: 42, - ), - prefixIcon: Container( - padding: EdgeInsets.only(right: 5, left: 5), - alignment: Alignment.center, - child: SvgPicture.asset( - MiscIconAssetPath.Search, - semanticsLabel: 'Search', - colorFilter: ColorFilter.mode(Color(0xFFAA8E83), BlendMode.srcIn), - height: 18, - width: 18, - ), - ), - suffixIcon: _searchController.text.isNotEmpty - ? IconButton( - icon: Icon( - Icons.clear, - color: Color(0xFFAA8E83), - size: 18, - ), - onPressed: () { - _searchController.clear(); - filterData(''); + color: isDarkTheme + ? Color(0xFF000000) + : Color(0xFFFFFFFF), // Set background here + child: Padding( + padding: const EdgeInsets.only( + left: 16.0, right: 16.0, top: 5.0, bottom: 5.0), + child: Column( + children: [ + Container( + height: 40, + decoration: BoxDecoration( + color: isDarkTheme ? Color(0xFF000000) : Colors.white, + borderRadius: BorderRadius.circular(5.0), + border: Border.all(width: 2, color: Color(0xFFA0A0A0)), + ), + child: Padding( + padding: EdgeInsets.only(left: 5.0), + child: TextField( + controller: _searchController, + onChanged: (value) { + filterData(value); }, - ) - : null, - // contentPadding: EdgeInsets.symmetric(vertical: 12, horizontal: 18.0), - border: InputBorder.none, - // contentPadding: - // EdgeInsets.symmetric(vertical: 9, horizontal: 18.0), - // contentPadding: EdgeInsets.zero, + decoration: InputDecoration( + hintText: AppLocalizations.of(context)!.search, + hintStyle: TextStyle( + color: + isDarkTheme ? Color(0xFF898C81) : Color(0xFF898C81), + fontFamily: context.translate('Roboto', 'NotoKufi'), + fontSize: 18, + // height: 1.8, + ), + prefixIconConstraints: BoxConstraints( + maxWidth: 42, + maxHeight: 42, + ), + prefixIcon: Container( + padding: EdgeInsets.only(right: 5, left: 5), + alignment: Alignment.center, + child: SvgPicture.asset( + MiscIconAssetPath.Search, + semanticsLabel: 'Search', + colorFilter: ColorFilter.mode( + Color(0xFFA0A0A0), BlendMode.srcIn), + height: 20, + width: 20, + ), + ), + suffixIcon: _searchController.text.isNotEmpty + ? IconButton( + icon: Icon( + Icons.clear, + color: Color(0xFFAA8E83), + size: 18, + ), + onPressed: () { + _searchController.clear(); + filterData(''); + }, + ) + : null, + // contentPadding: EdgeInsets.symmetric(vertical: 12, horizontal: 18.0), + border: InputBorder.none, + // contentPadding: + // EdgeInsets.symmetric(vertical: 9, horizontal: 18.0), + // contentPadding: EdgeInsets.zero, + ), + ), ), ), - ), - ), - SizedBox(height: myheight / 40), - Expanded( - child: filteredData.isEmpty - ? Center(child: Text("No data available")) - : ListView( - children: [ - ...filteredData.map((mainTopic) { - String colorPattern = mainTopic['color_pattern']; - Color backgroundColor = Color(int.parse(colorPattern)); - Color borderColor = backgroundColor; - int index = filteredData.indexOf(mainTopic); + SizedBox(height: myheight / 40), + Expanded( + child: filteredData.isEmpty + ? Center(child: Text("No data available")) + : ListView( + children: [ + ...filteredData.map((mainTopic) { + String colorPattern = mainTopic['color_pattern']; + Color backgroundColor = + Color(int.parse(colorPattern)); + Color borderColor = backgroundColor; + int index = filteredData.indexOf(mainTopic); - return CustomExpandableTile( - index: index, - isExpanded: expandedIndex == index, - onTap: (index) { - setState(() { - expandedIndex = (expandedIndex == index) ? null : index; - }); - }, - title: mainTopic['main_topic'], - titleBackgroundColor: backgroundColor, - // currentTheme: currentTheme, - children: _buildSubTopics( - mainTopic['sub_topics'] ?? [], - mywidth, - myheight, - borderColor, - colorPattern, - mainTopic['main_topic'],isDarkTheme), - ); - }), - ], - ), + return CustomExpandableTile( + index: index, + isExpanded: expandedIndex == index, + onTap: (index) { + setState(() { + expandedIndex = + (expandedIndex == index) ? null : index; + }); + }, + title: mainTopic['main_topic'], + titleBackgroundColor: backgroundColor, + // currentTheme: currentTheme, + children: _buildSubTopics( + mainTopic['sub_topics'] ?? [], + mywidth, + myheight, + borderColor, + colorPattern, + mainTopic['main_topic'], + isDarkTheme), + ); + }), + ], + ), + ), + ], ), - ], - ), - ) - ); + )); } - List _buildSubTopics(List subTopics, double myWidth, myheight, - Color borderColor, String colorPattern, mainTopic,isDarkTheme) { - subTopics.sort((a, b) => - (a['sub_topic_list_order'] ?? 0).compareTo(b['sub_topic_list_order'] ?? 0)); + List _buildSubTopics( + List subTopics, + double myWidth, + myheight, + Color borderColor, + String colorPattern, + mainTopic, + isDarkTheme) { + subTopics.sort((a, b) => (a['sub_topic_list_order'] ?? 0) + .compareTo(b['sub_topic_list_order'] ?? 0)); return subTopics .map((subTopic) => Column( @@ -389,8 +403,8 @@ class _UaenumberWidgetState extends ConsumerState { List _buildDataSetCards(List tileData, double myWidth, Color borderColor, colorPattern, mainTopic) { - tileData.sort((a, b) => - (a['data_set_list_order'] ?? 0).compareTo(b['data_set_list_order'] ?? 0)); + tileData.sort((a, b) => (a['data_set_list_order'] ?? 0) + .compareTo(b['data_set_list_order'] ?? 0)); List rows = []; for (int i = 0; i < tileData.length; i += 2) { @@ -403,13 +417,12 @@ class _UaenumberWidgetState extends ConsumerState { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: rowItems.map((data) { - final cardWidth = rowItems.length == 1 - ? myWidth - : (myWidth - 16) / 2.6; + final cardWidth = + rowItems.length == 1 ? myWidth : (myWidth - 18) / 1.6; return Expanded( child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 5.0), + padding: const EdgeInsets.symmetric(horizontal: 0.0), child: buildCard( context, data['data_set_tile_heading'] ?? '', @@ -499,7 +512,7 @@ class _UaenumberWidgetState extends ConsumerState { child: Container( width: mywidth, decoration: BoxDecoration( - color: isDarkTheme ? Color(0xFF111111) : Colors.white, + color: isDarkTheme ? Colors.black : Colors.white, border: Border.all( color: bordercolor, width: 2, @@ -514,10 +527,11 @@ class _UaenumberWidgetState extends ConsumerState { Text( title, textAlign: TextAlign.center, - style: robotoRegular11(context,isDarkTheme), + style: robotoRegular11(context, isDarkTheme), ), SizedBox(height: 0.1), - Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle(context)), + Text(subtitle, + textAlign: TextAlign.center, style: subtitleStyle(context)), SizedBox(height: 0.3), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -529,7 +543,7 @@ class _UaenumberWidgetState extends ConsumerState { 'Roboto', 'NotoKufi', ), - fontSize: 20, + fontSize: 26, color: isPopulationGrowth ? (isPositive ? Colors.green : Colors.red) : boldColor, @@ -572,14 +586,14 @@ class CustomExpandableTile extends ConsumerStatefulWidget { }); @override - ConsumerState createState() => _CustomExpandableTileState(); + ConsumerState createState() => + _CustomExpandableTileState(); } class _CustomExpandableTileState extends ConsumerState { bool isExpanded = false; // late bool isExpanded; - @override void initState() { super.initState(); // Initialize isExpanded based on widget's property @@ -596,7 +610,6 @@ class _CustomExpandableTileState extends ConsumerState { print('123456789000'); print(isDarkTheme); - return Card( elevation: 0, child: Column( @@ -610,13 +623,15 @@ class _CustomExpandableTileState extends ConsumerState { child: Container( decoration: BoxDecoration( color: widget.titleBackgroundColor, - borderRadius: BorderRadius.only(topLeft: Radius.circular(20),topRight: Radius.circular(20)) - ), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), + topRight: Radius.circular(20))), padding: const EdgeInsets.only( left: 16, bottom: 5, top: 5, right: 10), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + Spacer(), Text( widget.title, style: TextStyle( @@ -629,6 +644,7 @@ class _CustomExpandableTileState extends ConsumerState { fontSize: 20, ), ), + Spacer(), Icon( widget.isExpanded ? Icons.keyboard_arrow_up @@ -650,17 +666,19 @@ class _CustomExpandableTileState extends ConsumerState { height: widget.isExpanded ? myheight * 0.52 : 0, child: widget.isExpanded ? SingleChildScrollView( - child: Container( - decoration: BoxDecoration( - color: isDarkTheme ? Color(0xFF000000) : Color(0xFFFFFFFF), - // borderRadius: BorderRadius.all(Radius.circular(20)) - ), - padding: const EdgeInsets.all(1), - child: Column( - children: widget.children, - ), - ), - ) + child: Container( + decoration: BoxDecoration( + color: isDarkTheme + ? Color(0xFF000000) + : Color(0xFFFFFFFF), + // borderRadius: BorderRadius.all(Radius.circular(20)) + ), + padding: const EdgeInsets.all(1), + child: Column( + children: widget.children, + ), + ), + ) : null, ), ), @@ -668,4 +686,4 @@ class _CustomExpandableTileState extends ConsumerState { ), ); } -} +} \ No newline at end of file diff --git a/lib/presentation/Screens/charts/screens/chart_screen.dart b/lib/presentation/Screens/charts/screens/chart_screen.dart index 7be041db..68443adc 100644 --- a/lib/presentation/Screens/charts/screens/chart_screen.dart +++ b/lib/presentation/Screens/charts/screens/chart_screen.dart @@ -2741,7 +2741,9 @@ class _ChartScreen1State extends ConsumerState { // ), Icon( size: 24, - Icons.bookmarks_rounded, + isBookmarked + ? Icons.bookmarks + : Icons.bookmarks_outlined, color: isBookmarked ? isDarkTheme @@ -2759,6 +2761,8 @@ class _ChartScreen1State extends ConsumerState { // '#', '0xff'))) // : Colors.white, ), + + ], ), ), @@ -2799,7 +2803,13 @@ class _ChartScreen1State extends ConsumerState { strokeWidth: 2, ), ) // Show loading spinner - : Image(image: AssetImage(isDarkTheme ? UaeNumbersAssetPath.shareDark : UaeNumbersAssetPath.shareLight)) + : Image( + image: AssetImage( + isDarkTheme ? UaeNumbersAssetPath.shareDark : UaeNumbersAssetPath.shareLight, + ), + width: 24, // Set your desired width + height: 24, // Set your desired height + ) ], ), ), @@ -3023,7 +3033,7 @@ class _ChartScreen1State extends ConsumerState { // : Colors.white; return Card( - margin: const EdgeInsets.all(10), + margin: const EdgeInsets.all(5), child: Container( decoration: BoxDecoration( border: Border.all( @@ -3280,7 +3290,7 @@ class CardWidget extends StatelessWidget { return SizedBox.shrink(); } else if (response.length == 1) { return Container( - margin: const EdgeInsets.all(10), + margin: const EdgeInsets.all(5), // width: card_full_length ? double.infinity : null, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), @@ -3431,7 +3441,7 @@ class CardWidget extends StatelessWidget { )); } else { return Container( - margin: const EdgeInsets.all(10), + margin: const EdgeInsets.all(5), // width: card_full_length ? double.infinity : null, decoration: BoxDecoration( borderRadius: BorderRadius.circular(5), diff --git a/lib/presentation/Screens/charts/widgets/chart_widget.dart b/lib/presentation/Screens/charts/widgets/chart_widget.dart index 9f010629..eb037045 100644 --- a/lib/presentation/Screens/charts/widgets/chart_widget.dart +++ b/lib/presentation/Screens/charts/widgets/chart_widget.dart @@ -319,7 +319,7 @@ class ChartWidget extends StatelessWidget { // double percentage = (value / totalValue) * 100; double percentage = (totalValue > 0) ? (value / totalValue) * 100 : 0.0; bool isTouched = index == touchedIndex; - String displayTitle = title.length > 12 ? '${title.substring(0, 10)}...' : title; + String displayTitle = title.length > 12 ? '${title.substring(0, 12 )}...' : title; return PieChartSectionData( value: value, // color: Colors.primaries[index % Colors.primaries.length], diff --git a/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart b/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart index 077aa3c6..fc061820 100644 --- a/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart +++ b/lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart @@ -1491,6 +1491,11 @@ List _buildRows(List> tileData, Color borderColor, .sublist(i, i + 2 > tileData.length ? tileData.length : i + 2) .map((tile) { return Expanded( + child: Container( + margin: EdgeInsets.only( + right: 5, + left: 5, + ), child: InfoCard( // title: tile['data_set_tile_heading']!, title: tile['data_set_tile_heading'] ?? 'Unknown Title', @@ -1505,6 +1510,7 @@ List _buildRows(List> tileData, Color borderColor, mainTopic: mainTopic, onTap: () {}, ), + ) ); }).toList(), ), @@ -1602,11 +1608,11 @@ class InfoCard extends StatelessWidget { '/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey'); }, child: Container( - height: myheight / 10.9, + height: myheight / 10.8, - width: mywidth / 5, + width: mywidth / 4, - margin: const EdgeInsets.symmetric(horizontal: 8), + margin: const EdgeInsets.symmetric(horizontal: 0), // padding: const EdgeInsets.all(10), padding: const EdgeInsets.only(bottom: 0.5, top: 1, left: 10, right: 10), decoration: BoxDecoration( diff --git a/lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart b/lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart index 8fdbae29..7145086c 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart @@ -41,6 +41,7 @@ class _BookMarkState extends ConsumerState { List homePageData = []; List filteredData = []; + List> sortedList = []; @override void initState() { @@ -168,7 +169,7 @@ class _BookMarkState extends ConsumerState { ]; // Create a list to store sorted data - List> sortedList = []; +// List> sortedList = []; // Group data based on categories Map>> groupedData = { @@ -361,7 +362,7 @@ class _BookMarkState extends ConsumerState { 10.0), // Adjust the radius as needed ), side: BorderSide( - color: Color(0xFFAA8E83), // Set the outline color + color: Color(0xFFB68A34), // Set the outline color width: 1, // Set the border width ), ), @@ -372,7 +373,7 @@ class _BookMarkState extends ConsumerState { 'Roboto', 'NotoKufi', ), - color: Color(0xFFAA8E83), + color: Color(0xFFB68A34), fontSize: 16, ), ), @@ -386,7 +387,7 @@ class _BookMarkState extends ConsumerState { removeBookmark(id); }, style: TextButton.styleFrom( - backgroundColor: Color(0xFFAA8E83), // Set background color + backgroundColor: Color(0xFFB68A34), // Set background color foregroundColor: Colors.white, shape: RoundedRectangleBorder( borderRadius: @@ -464,19 +465,23 @@ class _BookMarkState extends ConsumerState { final List> tabs = [ { 'title': AppLocalizations.of(context)!.all_bookmarks, + 'titleUpper': AppLocalizations.of(context)!.all_bookmarks, 'color': isDarkTheme ? Colors.white : Color(0xFFB68A34), // 'color': isDarkTheme ? Colors.white : Colors.black, }, { 'title': AppLocalizations.of(context)!.economy_title, + 'titleUpper': AppLocalizations.of(context)!.economy_title_upper, 'color': isDarkTheme ? Color(0xFF89AFD8) : Color(0xFF89AFD8) }, { 'title': AppLocalizations.of(context)!.social_title, + 'titleUpper': AppLocalizations.of(context)!.social_title_upper, 'color': isDarkTheme ? Color(0xFF675863) : Color(0xFF675863) }, { 'title': AppLocalizations.of(context)!.environment_title, + 'titleUpper': AppLocalizations.of(context)!.environment_title_upper, 'color': isDarkTheme ? Color(0xFFB3CF99) : Color(0xFFB3CF99) }, ]; @@ -582,7 +587,8 @@ class _BookMarkState extends ConsumerState { : Colors.white, // borderRadius: BorderRadius.all(Radius.circular(20)) ), - padding: const EdgeInsets.all(16), + padding: const EdgeInsets.symmetric( + vertical: 16), child: GridView.builder( shrinkWrap: true, physics: @@ -662,7 +668,7 @@ class _BookMarkState extends ConsumerState { : Padding( padding: const EdgeInsets.all(8.0), child: Container( - margin: const EdgeInsets.all(13.0), + margin: const EdgeInsets.all(8.0), child: Column( children: [ Container( @@ -684,10 +690,11 @@ class _BookMarkState extends ConsumerState { right: 10), child: Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.center, children: [ Text( - tabs[selectedTabIndex]['title'], + tabs[selectedTabIndex] + ['titleUpper'], style: TextStyle( fontFamily: context.translate( 'Roboto', @@ -992,7 +999,7 @@ class TabBarHeader extends StatelessWidget { MaterialStateProperty.resolveWith((states) { return selectedIndex == index ? entry.value['color'] - : Colors.grey[700]; + : Color(0xFF898C81); }), ), child: Text( @@ -1085,8 +1092,9 @@ class _CustomExpandableTileState extends State { padding: const EdgeInsets.only( left: 16, bottom: 5, top: 5, right: 10), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + Spacer(), Text( widget.title, style: TextStyle( @@ -1099,11 +1107,12 @@ class _CustomExpandableTileState extends State { fontSize: 20, ), ), + Spacer(), Icon( widget.isExpanded ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down, - color: widget.isDarkTheme ? Colors.black : Colors.white, + color: Colors.white, size: 28.0, ), ], 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 d8057267..53a1f45c 100644 --- a/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart +++ b/lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart @@ -543,43 +543,65 @@ class NotificationTile extends StatelessWidget { }); }, child: ListTile( - leading: isPushed - ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E)) - : Icon(Icons.circle, - size: 12, - color: isDarkTheme ? Colors.white : const Color(0x99414042)), - title: Text( - title, - style: TextStyle( - color: isPushed - ? isDarkTheme - ? Colors.white - : Color(0xFF414042) - : isDarkTheme - ? Colors.white - : Color(0x99414042), - fontWeight: FontWeight.bold, - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', + // leading: isPushed + // ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E)) + // : Icon(Icons.circle, + // size: 12, + // color: isDarkTheme ? Colors.white : const Color(0x99414042)), + // leading: isPushed + // ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E)) + // : const Icon(Icons.circle, size: 12, color: Colors.transparent), + title: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(top: 4.0, right: 6), + child: isPushed + ? const Icon(Icons.circle, size: 8, color: Color(0xFFFF274E)) + : const Icon(Icons.circle, size: 8, color: Colors.transparent), + ), + Expanded( + child: Text( + title, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.bold, + fontFamily: context.translate('Roboto', 'NotoKufi'), + color: isPushed + ? (isDarkTheme ? Colors.white : Color(0xFF414042)) // dark title + : (isDarkTheme ? Color(0xFF999999) : Color(0x99414042)), // light grey title + ), + ), ), - ), + ], ), - subtitle: Text( - date, - style: TextStyle( - color: isPushed - ? isDarkTheme - ? Colors.white - : Color(0xFF8E8E8E) - : isDarkTheme - ? Colors.white - : Color(0x998E8E8E), - fontSize: 12, - fontWeight: FontWeight.w400, - fontFamily: context.translate( - 'Roboto', - 'NotoKufi', + // Text( + // title, + // style: TextStyle( + // color: isPushed + // ? isDarkTheme + // ? Colors.white + // : Color(0xFF414042) + // : isDarkTheme ? Color(0xFF999999) : Color(0xFF999999), + // fontWeight: FontWeight.bold, + // fontFamily: context.translate( + // 'Roboto', + // 'NotoKufi', + // ), + // ), + // ), + subtitle: Padding( + padding: const EdgeInsets.only(left: 15), // 👈 set your desired left padding here + child: Text( + date, + style: TextStyle( + color: isDarkTheme ? Color(0xFF565656) : Color(0xFF8E8E8E), + fontSize: 12, + fontWeight: FontWeight.w400, + fontFamily: context.translate( + 'Roboto', + 'NotoKufi', + ), ), ), ), diff --git a/pubspec.yaml b/pubspec.yaml index 2bc3372a..bdf0ddab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,8 +1,8 @@ name: uae_stat description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness." publish_to: "none" -#version: 1.0.61+62 -version: 1.0.7+8 +#version: 1.0.62+63 +version: 1.0.8+9 environment: sdk: ">=3.2.3 <4.0.0"