SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final bug fix

Browse Source
This commit is contained in:
Surendiran 2025-08-08 10:23:25 +05:30
parent bebe2df4dc
commit 40aefbb045
22 changed files with 385 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/.cxx/Debug/4y161to1/arm64-v8a/configure_fingerprint.bin
View File

@ -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 y/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/arm64-v8a/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ¿ŒÍLJ3  ¡¹ñÀ÷2z ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ƒØìø‡3  ¡¹ñÀ÷2z
x 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 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 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 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 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 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 ö ¦¹ñÀ÷2s
q 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 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 a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ¿ŒÍLJ3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  „Øìø‡3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/armeabi-v7a/configure_fingerprint.bin
View File

@ -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 {/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÆŒÍLJ3  ¸ïòÀ÷2| ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ¯Øìø‡3  ¸ïòÀ÷2|
z z
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  ÆŒÍLJ3„ ºïòÀ÷2<C3B7> x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/armeabi-v7a/android_gradle_build.json  ¯Øìø‡3„ ºïòÀ÷2<C3B7>
 
}/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 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 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 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 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 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 € »ïòÀ÷2u
s 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 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 a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÆŒÍLJ3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ¯Øìø‡3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/x86/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Logw
u u
s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/additional_project_files.txtC s/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÉŒÍLJ3  „òòÀ÷2t ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ¿Øìø‡3  „òòÀ÷2t
r 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 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 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 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 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 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 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 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 Ø …òòÀ÷2m
k 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 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 a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÉŒÍLJ3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÀØìø‡3 ¤ òÑÞ€á2

24
android/app/.cxx/Debug/4y161to1/x86_64/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Logz
x x
v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/additional_project_files.txtC v/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÌŒÍLJ3  •ôòÀ÷2w ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÖØìø‡3  •ôòÀ÷2w
u 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 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 g
e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  ÍŒÍLJ3ØÌ <20>ôòÀ÷2m e/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/Debug/4y161to1/x86_64/build.ninja  ÖØìø‡3ØÌ <20>ôòÀ÷2m
k 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 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 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 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 ç –ôòÀ÷2p
n 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 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 a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÍŒÍLJ3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÖØìø‡3 ¤ òÑÞ€á2

24
android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/configure_fingerprint.bin
View File

@ -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 ‚/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  äô˜È‡3  ™ªÇŸô2„ ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  Ù<EFBFBD>÷ù‡3  ™ªÇŸô2„
<EFBFBD> <EFBFBD>
/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  Ú<EFBFBD>÷ù‡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  Ú<EFBFBD>÷ù‡3• ¤ªÇŸô2u
s 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  Ú<EFBFBD>÷ù‡3²Í ù©ÇŸô2y
w 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  Ú<EFBFBD>÷ù‡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  Ú<EFBFBD>÷ù‡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  Ú<EFBFBD>÷ù‡3„
<EFBFBD> <EFBFBD>
/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  Ú<EFBFBD>÷ù‡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  Ú<EFBFBD>÷ù‡3
š ¥ªÇŸô2| š ¥ªÇŸô2|
z z
x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/prefab_config.json  äô˜È‡3  ( ¥ªÇŸô2<C3B4> x/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/arm64-v8a/prefab_config.json  Ú<EFBFBD>÷ù‡3  ( ¥ªÇŸô2<C3B4>
 
}/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  Ú<EFBFBD>÷ù‡3  t ¥ªÇŸô2c
a a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  äô˜È‡3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  Ú<EFBFBD>÷ù‡3 ¤ òÑÞ€á2

24
android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/configure_fingerprint.bin
View File

@ -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 „/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  õô˜È‡3  £¼ÇŸô2‡ ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ç<EFBFBD>÷ù‡3  £¼ÇŸô2‡
„ „
<EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build.json  õô˜È‡3– ¤¼ÇŸô2Œ <EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/android_gradle_build.json  ç<EFBFBD>÷ù‡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  ç<EFBFBD>÷ù‡3™ ¥¼ÇŸô2w
u 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  ç<EFBFBD>÷ù‡3¾Í ’¼ÇŸô2{
y 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  ç<EFBFBD>÷ù‡3€
~ ~
|/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build_file_index.txt  õô˜È‡3 _ ¦¼ÇŸô2<C3B4> |/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/build_file_index.txt  ç<EFBFBD>÷ù‡3 _ ¦¼ÇŸô2<C3B4>
 
}/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  ç<EFBFBD>÷ù‡3‡
„ „
<EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json.bin  õô˜È‡3 <09> <EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/armeabi-v7a/compile_commands.json.bin  ç<EFBFBD>÷ù‡3 <09>
Š Š
‡/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  ç<EFBFBD>÷ù‡3
¤ ¥¼ÇŸô2~ ¤ ¥¼ÇŸô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  ç<EFBFBD>÷ù‡3  ( ¦¼ÇŸô2„
<EFBFBD> <EFBFBD>
/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  ç<EFBFBD>÷ù‡3  v ¦¼ÇŸô2c
a a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  õô˜È‡3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ç<EFBFBD>÷ù‡3 ¤ òÑÞ€á2

24
android/app/.cxx/RelWithDebInfo/574gs2w4/x86/configure_fingerprint.bin
View File

@ -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 |/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ÿô˜È‡3  µÂÇŸô2} ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ñ<EFBFBD>÷ù‡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  ñ<EFBFBD>÷ù‡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  ñ<EFBFBD>÷ù‡3‰ ¸ÂÇŸô2o
m 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  ñ<EFBFBD>÷ù‡3ŽÍ ¨ÂÇŸô2s
q 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  ñ<EFBFBD>÷ù‡3x
v 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  ñ<EFBFBD>÷ù‡3 _ ¹ÂÇŸô2y
w 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  ñ<EFBFBD>÷ù‡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  ñ<EFBFBD>÷ù‡3 „
<EFBFBD> <EFBFBD>
/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  ñ<EFBFBD>÷ù‡3
ü ¹ÂÇŸô2v ü ¹ÂÇŸô2v
t 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  ñ<EFBFBD>÷ù‡3  ( ¹ÂÇŸô2{
y 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  ñ<EFBFBD>÷ù‡3  n ¹ÂÇŸô2c
a a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ÿô˜È‡3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ñ<EFBFBD>÷ù‡3 ¤ òÑÞ€á2

24
android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/configure_fingerprint.bin
View File

@ -2,27 +2,27 @@ C/C++ Structured Log
<EFBFBD> <EFBFBD>
/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/additional_project_files.txtC /Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/additional_project_files.txtC
A A
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  ‰õ˜È‡3  ·ÆÇŸô2€ ?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  €<EFBFBD>÷ù‡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  €<EFBFBD>÷ù‡3Œ ¸ÆÇŸô2‡
„ „
<EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build_mini.json  ‰õ˜È‡3<18> ¹ÆÇŸô2r <EFBFBD>/Users/venbateam/Documents/UAE_Stats/FCSC/frontend/android/app/.cxx/RelWithDebInfo/574gs2w4/x86_64/android_gradle_build_mini.json  €<EFBFBD>÷ù‡3<18> ¹ÆÇŸô2r
p 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  €<EFBFBD>÷ù‡3 Í §ÆÇŸô2v
t 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  €<EFBFBD>÷ù‡3{
y 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  €<EFBFBD>÷ù‡3 _ ¹ÆÇŸô2|
z 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  €<EFBFBD>÷ù‡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  €<EFBFBD>÷ù‡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  €<EFBFBD>÷ù‡3
‹ ¹ÆÇŸô2y ‹ ¹ÆÇŸô2y
w 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  €<EFBFBD>÷ù‡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  €<EFBFBD>÷ù‡3  q ¹ÆÇŸô2c
a a
_/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  ‰õ˜È‡3 ¤ òÑÞ€á2 _/Users/venbateam/Documents/flutter/packages/flutter_tools/gradle/src/main/groovy/CMakeLists.txt  €<EFBFBD>÷ù‡3 ¤ òÑÞ€á2

4
android/app/build.gradle
View File

@ -20,12 +20,12 @@ if (project.hasProperty('google-services.json')) {
def flutterVersionCode = localProperties.getProperty("flutter.versionCode") def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
if (flutterVersionCode == null) { if (flutterVersionCode == null) {
flutterVersionCode = "62" flutterVersionCode = "63"
} }
def flutterVersionName = localProperties.getProperty("flutter.versionName") def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) { if (flutterVersionName == null) {
flutterVersionName = "1.0.61" flutterVersionName = "1.0.62"
} }
def keystorePropertiesFile = rootProject.file("key.properties") def keystorePropertiesFile = rootProject.file("key.properties")

BIN
assets/icons/uae_numbers/ShareDark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/icons/uae_numbers/ShareLight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 1.7 KiB

20
ios/Runner.xcodeproj/project.pbxproj
View File

@ -322,10 +322,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Embed Pods Frameworks"; name = "[CP] Embed Pods Frameworks";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@ -354,10 +358,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; 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_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets;
DEVELOPMENT_TEAM = 9N5SRFUGK2; DEVELOPMENT_TEAM = 9N5SRFUGK2;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -509,7 +517,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.7; MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -697,7 +705,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets;
DEVELOPMENT_TEAM = 9N5SRFUGK2; DEVELOPMENT_TEAM = 9N5SRFUGK2;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -708,7 +716,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.7; MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -734,7 +742,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets; DEVELOPMENT_ASSET_PATHS = Runner/Assets.xcassets;
DEVELOPMENT_TEAM = 9N5SRFUGK2; DEVELOPMENT_TEAM = 9N5SRFUGK2;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -745,7 +753,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.7; MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios; PRODUCT_BUNDLE_IDENTIFIER = ae.gov.fcsc.frontend.ios;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

2
lib/config/my_router.dart
View File

@ -692,7 +692,7 @@ final GoRouter router = GoRouter(
if (state.uri.path == '/SessionCheckScreen' || if (state.uri.path == '/SessionCheckScreen' ||
state.uri.path == '/login' || state.uri.path == '/login' ||
state.uri.path == '/register' || state.uri.path == '/register' ||
state.uri.path == '/forgot-password/:email'|| state.uri.path.startsWith('/forgot-password/') ||
state.uri.path == '/termsandconditions'|| state.uri.path == '/termsandconditions'||
state.uri.path == '/privacy_policy' state.uri.path == '/privacy_policy'
) { ) {

3
lib/l10n/intl_ar.arb
View File

@ -3,6 +3,9 @@
"economy_title":"اقتصاد", "economy_title":"اقتصاد",
"social_title":"اجتماعي", "social_title":"اجتماعي",
"environment_title":"بيئة", "environment_title":"بيئة",
"economy_title_upper": "اقتصاد",
"social_title_upper": "اجتماعي",
"environment_title_upper": "بيئة",
"bookmarks": "الإشارات المرجعية", "bookmarks": "الإشارات المرجعية",
"searchCountry": "Search Country", "searchCountry": "Search Country",
"feedback_title": "تعليق", "feedback_title": "تعليق",

3
lib/l10n/intl_en.arb
View File

@ -3,6 +3,9 @@
"economy_title": "Economy", "economy_title": "Economy",
"social_title": "Social", "social_title": "Social",
"environment_title": "Environment", "environment_title": "Environment",
"economy_title_upper": "ECONOMY",
"social_title_upper": "SOCIAL",
"environment_title_upper": "ENVIRONMENT",
"bookmarks": "Bookmarks", "bookmarks": "Bookmarks",
"searchCountry": "Search Country", "searchCountry": "Search Country",
"feedback_title": "Feedback", "feedback_title": "Feedback",

306
lib/presentation/Screens/Bottom Navigation Pages/UAE_Numbers/uae_numbers.dart
View File

@ -18,6 +18,7 @@ import 'package:uae_stat/presentation/components/constant/constant.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:uae_stat/config/api_config.dart'; import 'package:uae_stat/config/api_config.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
// import 'package:uae_stat/l10n/app_localizations.dart';
class UaeNumbers extends ConsumerWidget { class UaeNumbers extends ConsumerWidget {
const UaeNumbers({super.key}); const UaeNumbers({super.key});
@ -35,8 +36,7 @@ class UaeNumbers extends ConsumerWidget {
// } // }
@override @override
Widget build(BuildContext context,WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final isDarkTheme = ref.watch(themeProvider) == ThemeMode.dark || final isDarkTheme = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system && (ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context).platformBrightness == Brightness.dark); MediaQuery.of(context).platformBrightness == Brightness.dark);
@ -53,14 +53,14 @@ class UaeNumbers extends ConsumerWidget {
backgroundColor: isDarkTheme ? Color(0xFF333333) : Color(0xFF414042), backgroundColor: isDarkTheme ? Color(0xFF333333) : Color(0xFF414042),
title: Text( title: Text(
context.translate( context.translate(
'UAE Numbers', 'UAE Numbers',
'أرقام الإمارات', 'أرقام الإمارات',
), ),
style: TextStyle( style: TextStyle(
fontFamily: context.translate( fontFamily: context.translate(
'Roboto', 'Roboto',
'NotoKufi', 'NotoKufi',
), ),
color: isDarkTheme ? Color(0xFFFFFFFF) : Color(0xFF000000), color: isDarkTheme ? Color(0xFFFFFFFF) : Color(0xFF000000),
), ),
), ),
@ -100,7 +100,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
MediaQuery.of(context).platformBrightness == Brightness.dark); MediaQuery.of(context).platformBrightness == Brightness.dark);
final themeMode = (isDark ? 'dark' : 'light'); final themeMode = (isDark ? 'dark' : 'light');
fetchData(locale?.languageCode ?? 'en',themeMode); fetchData(locale?.languageCode ?? 'en', themeMode);
_searchController.addListener(() { _searchController.addListener(() {
setState(() { setState(() {
filterData(_searchController.text); filterData(_searchController.text);
@ -114,10 +114,11 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
super.dispose(); super.dispose();
} }
Future<void> fetchData(locale,themeMode) async { Future<void> fetchData(locale, themeMode) async {
const baseUrl = '$apiUrl/api/getUAENumbersData'; const baseUrl = '$apiUrl/api/getUAENumbersData';
try { 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) { if (response.statusCode == 200) {
setState(() { setState(() {
homePageData = (json.decode(response.body) as List) homePageData = (json.decode(response.body) as List)
@ -215,7 +216,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
MediaQuery.of(context).platformBrightness == Brightness.dark); MediaQuery.of(context).platformBrightness == Brightness.dark);
final themeString = isDark ? 'dark' : 'light'; final themeString = isDark ? 'dark' : 'light';
fetchData(localeCode,themeString); fetchData(localeCode, themeString);
}); });
ref.listen<ThemeMode>(themeProvider, (previous, next) async { ref.listen<ThemeMode>(themeProvider, (previous, next) async {
@ -234,7 +235,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
MediaQuery.of(context).platformBrightness == Brightness.dark); MediaQuery.of(context).platformBrightness == Brightness.dark);
final themeString = isDark ? 'dark' : 'light'; final themeString = isDark ? 'dark' : 'light';
fetchData(localeCode,themeString); fetchData(localeCode, themeString);
}); });
final themeMode = ref.watch(themeProvider); final themeMode = ref.watch(themeProvider);
@ -265,115 +266,128 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
} }
return Container( return Container(
color: isDarkTheme ? Color(0xFF000000) : Color(0xFFFFFFFF), // Set background here color: isDarkTheme
child: Padding( ? Color(0xFF000000)
padding: const EdgeInsets.only(left: 16.0, right: 16.0, top: 5.0, bottom: 5.0), : Color(0xFFFFFFFF), // Set background here
child: Column( child: Padding(
children: [ padding: const EdgeInsets.only(
Container( left: 16.0, right: 16.0, top: 5.0, bottom: 5.0),
height: 40, child: Column(
decoration: BoxDecoration( children: [
color: isDarkTheme ? Color(0xFF000000) : Colors.white, Container(
borderRadius: BorderRadius.circular(5.0), height: 40,
border: Border.all(width: 2, color: Color(0xFFA0A0A0)), decoration: BoxDecoration(
), color: isDarkTheme ? Color(0xFF000000) : Colors.white,
child: Padding( borderRadius: BorderRadius.circular(5.0),
padding: EdgeInsets.only(left: 5.0), border: Border.all(width: 2, color: Color(0xFFA0A0A0)),
child: TextField( ),
controller: _searchController, child: Padding(
onChanged: (value) { padding: EdgeInsets.only(left: 5.0),
filterData(value); child: TextField(
}, controller: _searchController,
decoration: InputDecoration( onChanged: (value) {
hintText: AppLocalizations.of(context)!.search, filterData(value);
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('');
}, },
) decoration: InputDecoration(
: null, hintText: AppLocalizations.of(context)!.search,
// contentPadding: EdgeInsets.symmetric(vertical: 12, horizontal: 18.0), hintStyle: TextStyle(
border: InputBorder.none, color:
// contentPadding: isDarkTheme ? Color(0xFF898C81) : Color(0xFF898C81),
// EdgeInsets.symmetric(vertical: 9, horizontal: 18.0), fontFamily: context.translate('Roboto', 'NotoKufi'),
// contentPadding: EdgeInsets.zero, 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(
SizedBox(height: myheight / 40), child: filteredData.isEmpty
Expanded( ? Center(child: Text("No data available"))
child: filteredData.isEmpty : ListView(
? Center(child: Text("No data available")) children: [
: ListView( ...filteredData.map<Widget>((mainTopic) {
children: [ String colorPattern = mainTopic['color_pattern'];
...filteredData.map<Widget>((mainTopic) { Color backgroundColor =
String colorPattern = mainTopic['color_pattern']; Color(int.parse(colorPattern));
Color backgroundColor = Color(int.parse(colorPattern)); Color borderColor = backgroundColor;
Color borderColor = backgroundColor; int index = filteredData.indexOf(mainTopic);
int index = filteredData.indexOf(mainTopic);
return CustomExpandableTile( return CustomExpandableTile(
index: index, index: index,
isExpanded: expandedIndex == index, isExpanded: expandedIndex == index,
onTap: (index) { onTap: (index) {
setState(() { setState(() {
expandedIndex = (expandedIndex == index) ? null : index; expandedIndex =
}); (expandedIndex == index) ? null : index;
}, });
title: mainTopic['main_topic'], },
titleBackgroundColor: backgroundColor, title: mainTopic['main_topic'],
// currentTheme: currentTheme, titleBackgroundColor: backgroundColor,
children: _buildSubTopics( // currentTheme: currentTheme,
mainTopic['sub_topics'] ?? [], children: _buildSubTopics(
mywidth, mainTopic['sub_topics'] ?? [],
myheight, mywidth,
borderColor, myheight,
colorPattern, borderColor,
mainTopic['main_topic'],isDarkTheme), colorPattern,
); mainTopic['main_topic'],
}), isDarkTheme),
], );
), }),
],
),
),
],
), ),
], ));
),
)
);
} }
List<Widget> _buildSubTopics(List<dynamic> subTopics, double myWidth, myheight, List<Widget> _buildSubTopics(
Color borderColor, String colorPattern, mainTopic,isDarkTheme) { List<dynamic> subTopics,
subTopics.sort((a, b) => double myWidth,
(a['sub_topic_list_order'] ?? 0).compareTo(b['sub_topic_list_order'] ?? 0)); 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 return subTopics
.map<Widget>((subTopic) => Column( .map<Widget>((subTopic) => Column(
@ -389,8 +403,8 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
List<Widget> _buildDataSetCards(List<dynamic> tileData, double myWidth, List<Widget> _buildDataSetCards(List<dynamic> tileData, double myWidth,
Color borderColor, colorPattern, mainTopic) { Color borderColor, colorPattern, mainTopic) {
tileData.sort((a, b) => tileData.sort((a, b) => (a['data_set_list_order'] ?? 0)
(a['data_set_list_order'] ?? 0).compareTo(b['data_set_list_order'] ?? 0)); .compareTo(b['data_set_list_order'] ?? 0));
List<Widget> rows = []; List<Widget> rows = [];
for (int i = 0; i < tileData.length; i += 2) { for (int i = 0; i < tileData.length; i += 2) {
@ -403,13 +417,12 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: rowItems.map<Widget>((data) { children: rowItems.map<Widget>((data) {
final cardWidth = rowItems.length == 1 final cardWidth =
? myWidth rowItems.length == 1 ? myWidth : (myWidth - 18) / 1.6;
: (myWidth - 16) / 2.6;
return Expanded( return Expanded(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 5.0), padding: const EdgeInsets.symmetric(horizontal: 0.0),
child: buildCard( child: buildCard(
context, context,
data['data_set_tile_heading'] ?? '', data['data_set_tile_heading'] ?? '',
@ -499,7 +512,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
child: Container( child: Container(
width: mywidth, width: mywidth,
decoration: BoxDecoration( decoration: BoxDecoration(
color: isDarkTheme ? Color(0xFF111111) : Colors.white, color: isDarkTheme ? Colors.black : Colors.white,
border: Border.all( border: Border.all(
color: bordercolor, color: bordercolor,
width: 2, width: 2,
@ -514,10 +527,11 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
Text( Text(
title, title,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: robotoRegular11(context,isDarkTheme), style: robotoRegular11(context, isDarkTheme),
), ),
SizedBox(height: 0.1), SizedBox(height: 0.1),
Text(subtitle, textAlign: TextAlign.center, style: subtitleStyle(context)), Text(subtitle,
textAlign: TextAlign.center, style: subtitleStyle(context)),
SizedBox(height: 0.3), SizedBox(height: 0.3),
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -529,7 +543,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
'Roboto', 'Roboto',
'NotoKufi', 'NotoKufi',
), ),
fontSize: 20, fontSize: 26,
color: isPopulationGrowth color: isPopulationGrowth
? (isPositive ? Colors.green : Colors.red) ? (isPositive ? Colors.green : Colors.red)
: boldColor, : boldColor,
@ -572,14 +586,14 @@ class CustomExpandableTile extends ConsumerStatefulWidget {
}); });
@override @override
ConsumerState<CustomExpandableTile> createState() => _CustomExpandableTileState(); ConsumerState<CustomExpandableTile> createState() =>
_CustomExpandableTileState();
} }
class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> { class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
bool isExpanded = false; bool isExpanded = false;
// late bool isExpanded; // late bool isExpanded;
@override @override
void initState() { void initState() {
super.initState(); // Initialize isExpanded based on widget's property super.initState(); // Initialize isExpanded based on widget's property
@ -596,7 +610,6 @@ class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
print('123456789000'); print('123456789000');
print(isDarkTheme); print(isDarkTheme);
return Card( return Card(
elevation: 0, elevation: 0,
child: Column( child: Column(
@ -610,13 +623,15 @@ class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.titleBackgroundColor, 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( padding: const EdgeInsets.only(
left: 16, bottom: 5, top: 5, right: 10), left: 16, bottom: 5, top: 5, right: 10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Spacer(),
Text( Text(
widget.title, widget.title,
style: TextStyle( style: TextStyle(
@ -629,6 +644,7 @@ class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
fontSize: 20, fontSize: 20,
), ),
), ),
Spacer(),
Icon( Icon(
widget.isExpanded widget.isExpanded
? Icons.keyboard_arrow_up ? Icons.keyboard_arrow_up
@ -650,17 +666,19 @@ class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
height: widget.isExpanded ? myheight * 0.52 : 0, height: widget.isExpanded ? myheight * 0.52 : 0,
child: widget.isExpanded child: widget.isExpanded
? SingleChildScrollView( ? SingleChildScrollView(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: isDarkTheme ? Color(0xFF000000) : Color(0xFFFFFFFF), color: isDarkTheme
// borderRadius: BorderRadius.all(Radius.circular(20)) ? Color(0xFF000000)
), : Color(0xFFFFFFFF),
padding: const EdgeInsets.all(1), // borderRadius: BorderRadius.all(Radius.circular(20))
child: Column( ),
children: widget.children, padding: const EdgeInsets.all(1),
), child: Column(
), children: widget.children,
) ),
),
)
: null, : null,
), ),
), ),
@ -668,4 +686,4 @@ class _CustomExpandableTileState extends ConsumerState<CustomExpandableTile> {
), ),
); );
} }
} }

20
lib/presentation/Screens/charts/screens/chart_screen.dart
View File

@ -2741,7 +2741,9 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
// ), // ),
Icon( Icon(
size: 24, size: 24,
Icons.bookmarks_rounded, isBookmarked
? Icons.bookmarks
: Icons.bookmarks_outlined,
color: isBookmarked color: isBookmarked
? isDarkTheme ? isDarkTheme
@ -2759,6 +2761,8 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
// '#', '0xff'))) // '#', '0xff')))
// : Colors.white, // : Colors.white,
), ),
], ],
), ),
), ),
@ -2799,7 +2803,13 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
strokeWidth: 2, strokeWidth: 2,
), ),
) // Show loading spinner ) // 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<ChartScreen1> {
// : Colors.white; // : Colors.white;
return Card( return Card(
margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(5),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
@ -3280,7 +3290,7 @@ class CardWidget extends StatelessWidget {
return SizedBox.shrink(); return SizedBox.shrink();
} else if (response.length == 1) { } else if (response.length == 1) {
return Container( return Container(
margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(5),
// width: card_full_length ? double.infinity : null, // width: card_full_length ? double.infinity : null,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(5),
@ -3431,7 +3441,7 @@ class CardWidget extends StatelessWidget {
)); ));
} else { } else {
return Container( return Container(
margin: const EdgeInsets.all(10), margin: const EdgeInsets.all(5),
// width: card_full_length ? double.infinity : null, // width: card_full_length ? double.infinity : null,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(5),

2
lib/presentation/Screens/charts/widgets/chart_widget.dart
View File

@ -319,7 +319,7 @@ class ChartWidget extends StatelessWidget {
// double percentage = (value / totalValue) * 100; // double percentage = (value / totalValue) * 100;
double percentage = (totalValue > 0) ? (value / totalValue) * 100 : 0.0; double percentage = (totalValue > 0) ? (value / totalValue) * 100 : 0.0;
bool isTouched = index == touchedIndex; 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( return PieChartSectionData(
value: value, value: value,
// color: Colors.primaries[index % Colors.primaries.length], // color: Colors.primaries[index % Colors.primaries.length],

12
lib/presentation/routes/bottom_bar_routes/tab_routes/home_route.dart
View File

@ -1491,6 +1491,11 @@ List<Widget> _buildRows(List<Map<String, dynamic>> tileData, Color borderColor,
.sublist(i, i + 2 > tileData.length ? tileData.length : i + 2) .sublist(i, i + 2 > tileData.length ? tileData.length : i + 2)
.map((tile) { .map((tile) {
return Expanded( return Expanded(
child: Container(
margin: EdgeInsets.only(
right: 5,
left: 5,
),
child: InfoCard( child: InfoCard(
// title: tile['data_set_tile_heading']!, // title: tile['data_set_tile_heading']!,
title: tile['data_set_tile_heading'] ?? 'Unknown Title', title: tile['data_set_tile_heading'] ?? 'Unknown Title',
@ -1505,6 +1510,7 @@ List<Widget> _buildRows(List<Map<String, dynamic>> tileData, Color borderColor,
mainTopic: mainTopic, mainTopic: mainTopic,
onTap: () {}, onTap: () {},
), ),
)
); );
}).toList(), }).toList(),
), ),
@ -1602,11 +1608,11 @@ class InfoCard extends StatelessWidget {
'/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey'); '/chartScreen/$dataset?bgColor=$colorPattern&mainTopic=$encodedMainTopic&title=$encodedTitle&key=$encodedKey');
}, },
child: Container( 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.all(10),
padding: const EdgeInsets.only(bottom: 0.5, top: 1, left: 10, right: 10), padding: const EdgeInsets.only(bottom: 0.5, top: 1, left: 10, right: 10),
decoration: BoxDecoration( decoration: BoxDecoration(

31
lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart
View File

@ -41,6 +41,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
List<dynamic> homePageData = []; List<dynamic> homePageData = [];
List<dynamic> filteredData = []; List<dynamic> filteredData = [];
List<Map<String, dynamic>> sortedList = [];
@override @override
void initState() { void initState() {
@ -168,7 +169,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
]; ];
// Create a list to store sorted data // Create a list to store sorted data
List<Map<String, dynamic>> sortedList = []; // List<Map<String, dynamic>> sortedList = [];
// Group data based on categories // Group data based on categories
Map<String, List<Map<String, dynamic>>> groupedData = { Map<String, List<Map<String, dynamic>>> groupedData = {
@ -361,7 +362,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
10.0), // Adjust the radius as needed 10.0), // Adjust the radius as needed
), ),
side: BorderSide( side: BorderSide(
color: Color(0xFFAA8E83), // Set the outline color color: Color(0xFFB68A34), // Set the outline color
width: 1, // Set the border width width: 1, // Set the border width
), ),
), ),
@ -372,7 +373,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
'Roboto', 'Roboto',
'NotoKufi', 'NotoKufi',
), ),
color: Color(0xFFAA8E83), color: Color(0xFFB68A34),
fontSize: 16, fontSize: 16,
), ),
), ),
@ -386,7 +387,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
removeBookmark(id); removeBookmark(id);
}, },
style: TextButton.styleFrom( style: TextButton.styleFrom(
backgroundColor: Color(0xFFAA8E83), // Set background color backgroundColor: Color(0xFFB68A34), // Set background color
foregroundColor: Colors.white, foregroundColor: Colors.white,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: borderRadius:
@ -464,19 +465,23 @@ class _BookMarkState extends ConsumerState<BookMark> {
final List<Map<String, dynamic>> tabs = [ final List<Map<String, dynamic>> tabs = [
{ {
'title': AppLocalizations.of(context)!.all_bookmarks, 'title': AppLocalizations.of(context)!.all_bookmarks,
'titleUpper': AppLocalizations.of(context)!.all_bookmarks,
'color': isDarkTheme ? Colors.white : Color(0xFFB68A34), 'color': isDarkTheme ? Colors.white : Color(0xFFB68A34),
// 'color': isDarkTheme ? Colors.white : Colors.black, // 'color': isDarkTheme ? Colors.white : Colors.black,
}, },
{ {
'title': AppLocalizations.of(context)!.economy_title, 'title': AppLocalizations.of(context)!.economy_title,
'titleUpper': AppLocalizations.of(context)!.economy_title_upper,
'color': isDarkTheme ? Color(0xFF89AFD8) : Color(0xFF89AFD8) 'color': isDarkTheme ? Color(0xFF89AFD8) : Color(0xFF89AFD8)
}, },
{ {
'title': AppLocalizations.of(context)!.social_title, 'title': AppLocalizations.of(context)!.social_title,
'titleUpper': AppLocalizations.of(context)!.social_title_upper,
'color': isDarkTheme ? Color(0xFF675863) : Color(0xFF675863) 'color': isDarkTheme ? Color(0xFF675863) : Color(0xFF675863)
}, },
{ {
'title': AppLocalizations.of(context)!.environment_title, 'title': AppLocalizations.of(context)!.environment_title,
'titleUpper': AppLocalizations.of(context)!.environment_title_upper,
'color': isDarkTheme ? Color(0xFFB3CF99) : Color(0xFFB3CF99) 'color': isDarkTheme ? Color(0xFFB3CF99) : Color(0xFFB3CF99)
}, },
]; ];
@ -582,7 +587,8 @@ class _BookMarkState extends ConsumerState<BookMark> {
: Colors.white, : Colors.white,
// borderRadius: BorderRadius.all(Radius.circular(20)) // borderRadius: BorderRadius.all(Radius.circular(20))
), ),
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
vertical: 16),
child: GridView.builder( child: GridView.builder(
shrinkWrap: true, shrinkWrap: true,
physics: physics:
@ -662,7 +668,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
: Padding( : Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Container( child: Container(
margin: const EdgeInsets.all(13.0), margin: const EdgeInsets.all(8.0),
child: Column( child: Column(
children: [ children: [
Container( Container(
@ -684,10 +690,11 @@ class _BookMarkState extends ConsumerState<BookMark> {
right: 10), right: 10),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceBetween, MainAxisAlignment.center,
children: [ children: [
Text( Text(
tabs[selectedTabIndex]['title'], tabs[selectedTabIndex]
['titleUpper'],
style: TextStyle( style: TextStyle(
fontFamily: context.translate( fontFamily: context.translate(
'Roboto', 'Roboto',
@ -992,7 +999,7 @@ class TabBarHeader extends StatelessWidget {
MaterialStateProperty.resolveWith((states) { MaterialStateProperty.resolveWith((states) {
return selectedIndex == index return selectedIndex == index
? entry.value['color'] ? entry.value['color']
: Colors.grey[700]; : Color(0xFF898C81);
}), }),
), ),
child: Text( child: Text(
@ -1085,8 +1092,9 @@ class _CustomExpandableTileState extends State<CustomExpandableTile> {
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 16, bottom: 5, top: 5, right: 10), left: 16, bottom: 5, top: 5, right: 10),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Spacer(),
Text( Text(
widget.title, widget.title,
style: TextStyle( style: TextStyle(
@ -1099,11 +1107,12 @@ class _CustomExpandableTileState extends State<CustomExpandableTile> {
fontSize: 20, fontSize: 20,
), ),
), ),
Spacer(),
Icon( Icon(
widget.isExpanded widget.isExpanded
? Icons.keyboard_arrow_up ? Icons.keyboard_arrow_up
: Icons.keyboard_arrow_down, : Icons.keyboard_arrow_down,
color: widget.isDarkTheme ? Colors.black : Colors.white, color: Colors.white,
size: 28.0, size: 28.0,
), ),
], ],

92
lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart
View File

@ -543,43 +543,65 @@ class NotificationTile extends StatelessWidget {
}); });
}, },
child: ListTile( child: ListTile(
leading: isPushed // leading: isPushed
? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E)) // ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E))
: Icon(Icons.circle, // : Icon(Icons.circle,
size: 12, // size: 12,
color: isDarkTheme ? Colors.white : const Color(0x99414042)), // color: isDarkTheme ? Colors.white : const Color(0x99414042)),
title: Text( // leading: isPushed
title, // ? const Icon(Icons.circle, size: 12, color: Color(0xFFFF274E))
style: TextStyle( // : const Icon(Icons.circle, size: 12, color: Colors.transparent),
color: isPushed title: Row(
? isDarkTheme crossAxisAlignment: CrossAxisAlignment.start,
? Colors.white children: [
: Color(0xFF414042) Padding(
: isDarkTheme padding: EdgeInsets.only(top: 4.0, right: 6),
? Colors.white child: isPushed
: Color(0x99414042), ? const Icon(Icons.circle, size: 8, color: Color(0xFFFF274E))
fontWeight: FontWeight.bold, : const Icon(Icons.circle, size: 8, color: Colors.transparent),
fontFamily: context.translate( ),
'Roboto', Expanded(
'NotoKufi', 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( // Text(
date, // title,
style: TextStyle( // style: TextStyle(
color: isPushed // color: isPushed
? isDarkTheme // ? isDarkTheme
? Colors.white // ? Colors.white
: Color(0xFF8E8E8E) // : Color(0xFF414042)
: isDarkTheme // : isDarkTheme ? Color(0xFF999999) : Color(0xFF999999),
? Colors.white // fontWeight: FontWeight.bold,
: Color(0x998E8E8E), // fontFamily: context.translate(
fontSize: 12, // 'Roboto',
fontWeight: FontWeight.w400, // 'NotoKufi',
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',
),
), ),
), ),
), ),

4
pubspec.yaml
View File

@ -1,8 +1,8 @@
name: uae_stat name: uae_stat
description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness." description: "View statistics about the UAE from the Federal Center for Statistics and Competitiveness."
publish_to: "none" publish_to: "none"
#version: 1.0.61+62 #version: 1.0.62+63
version: 1.0.7+8 version: 1.0.8+9
environment: environment:
sdk: ">=3.2.3 <4.0.0" sdk: ">=3.2.3 <4.0.0"