25-6-13/1

android/app/.cxx/Debug/6a58wo5c/arm64-v8a/.ninja_log

@@ -7,3 +7,4 @@
 51	3269	1741777920308084919	CMakeFiles/native-lib.dir/native-lib.cpp.o	24041561fb88653e
 3270	3846	1741777920881053528	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/arm64-v8a/libnative-lib.so	d42fa60474264ab0
 221	3448	1743588458940410891	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/arm64-v8a/libnative-lib.so	d42fa60474264ab0
+44	596	1749722032357945285	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/arm64-v8a/libnative-lib.so	d42fa60474264ab0

android/app/.cxx/Debug/6a58wo5c/arm64-v8a/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Log
 
 }/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ë²ç¨ë2

 ÿÊü××2~
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ô¶õ§ö2

 ÿÊü××2~
 |
-z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/android_gradle_build.json	ë²ç¨ë2
ù
+z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/android_gradle_build.json	Õ¶õ§ö2
ù
  ˜Ëü××2„

 <EFBFBD>

-/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/android_gradle_build_mini.json	ë²ç¨ë2
» êÐü××2p
+/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/android_gradle_build_mini.json	Õ¶õ§ö2
» êÐü××2p
 n
-l/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build.ninja	ì²ç¨ë2
âƒ
 †Åü××2t
+l/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build.ninja	Õ¶õ§ö2
âƒ
 †Åü××2t
 r
-p/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build.ninja.txt	ì²ç¨ë2y
+p/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build.ninja.txt	Õ¶õ§ö2y
 w
-u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build_file_index.txt	ì²ç¨ë2
+u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/build_file_index.txt	Õ¶õ§ö2
 
^ €<>àÕ×2z
-x
+x
 v/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/compile_commands.json	Õ¶õ§ö2
« „Åü××2~
-|
+|
 z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/compile_commands.json.bin	Õ¶õ§ö2	
Æ „Åü××2†

-ƒ

+ƒ

 €
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/metadata_generation_command.txt	Õ¶õ§ö2
 
Š	 €<>àÕ×2w
-u
+u
 s/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/prefab_config.json	Õ¶õ§ö2
-
( €<>àÕ×2|
+
( €<>àÕ×2|
 z
-x/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/symbol_folder_index.txt	ì²ç¨ë2
+x/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/arm64-v8a/symbol_folder_index.txt	Õ¶õ§ö2

android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/.ninja_log

@@ -7,3 +7,4 @@
 8	1314	1741777922363581612	CMakeFiles/native-lib.dir/native-lib.cpp.o	b06dc4e75654908c
 1315	1463	1741777922497132871	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/armeabi-v7a/libnative-lib.so	8fa1d32c8851c815
 10	278	1743588460622403369	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/armeabi-v7a/libnative-lib.so	8fa1d32c8851c815
+5	89	1749722034408576808	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/armeabi-v7a/libnative-lib.so	8fa1d32c8851c815

android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log
 <EFBFBD>

 /Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	‹´ç¨ë2

 éòü××2€

+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	®·õ§ö2

 éòü××2€

 ~
-|/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/android_gradle_build.json	‹´ç¨ë2
<18> ïòü××2‡

+|/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/android_gradle_build.json	®·õ§ö2
<18> ïòü××2‡

 „

-<EFBFBD>
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/android_gradle_build_mini.json	‹´ç¨ë2
à ùòü××2r
+<EFBFBD>
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/android_gradle_build_mini.json	®·õ§ö2
à ùòü××2r
 p
-n/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build.ninja	‹´ç¨ë2
¨„
 ¯òü××2v
+n/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build.ninja	®·õ§ö2
¨„
 ¯òü××2v
 t
-r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build.ninja.txt	‹´ç¨ë2{
+r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build.ninja.txt	®·õ§ö2{
 y
-w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build_file_index.txt	‹´ç¨ë2
+w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/build_file_index.txt	®·õ§ö2
 
^ “¤àÕ×2|
-z
+z
 x/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/compile_commands.json	®·õ§ö2
Æ ®òü××2€

-~
+~
 |/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/compile_commands.json.bin	®·õ§ö2	
ï ®òü××2ˆ

-…

+…

 ‚
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/metadata_generation_command.txt	®·õ§ö2
 
”	 “¤àÕ×2y
-w
+w
 u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/prefab_config.json	®·õ§ö2
-
( “¤àÕ×2~
+
( “¤àÕ×2~
 |
-z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/symbol_folder_index.txt	‹´ç¨ë2
+z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/armeabi-v7a/symbol_folder_index.txt	®·õ§ö2

android/app/.cxx/Debug/6a58wo5c/x86/.ninja_log

@@ -7,3 +7,4 @@
 7	1419	1741777924028952436	CMakeFiles/native-lib.dir/native-lib.cpp.o	b6bd31d87f9955ed
 1419	1638	1741777924251456785	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86/libnative-lib.so	a74e7c4bfd9047a
 12	286	1743588461089758411	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86/libnative-lib.so	a74e7c4bfd9047a
+4	118	1749722034570552110	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86/libnative-lib.so	a74e7c4bfd9047a

android/app/.cxx/Debug/6a58wo5c/x86/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Log{
 y
 w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ó<EFBFBD>Õìñ2

 þÿü××2x
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	É·õ§ö2

 þÿü××2x
 v
-t/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/android_gradle_build.json	Ó<EFBFBD>Õìñ2
á
+t/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/android_gradle_build.json	É·õ§ö2
á
  ‚€ý××2}
 {
-y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/android_gradle_build_mini.json	Ó<EFBFBD>Õìñ2
£ †€ý××2j
+y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/android_gradle_build_mini.json	É·õ§ö2
£ †€ý××2j
 h
-f/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build.ninja	Ó<EFBFBD>Õìñ2
²ƒ
 Üÿü××2n
+f/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build.ninja	É·õ§ö2
²ƒ
 Üÿü××2n
 l
-j/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build.ninja.txt	Ó<EFBFBD>Õìñ2s
+j/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build.ninja.txt	É·õ§ö2s
 q
-o/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build_file_index.txt	Ó<EFBFBD>Õìñ2
+o/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/build_file_index.txt	É·õ§ö2
 
^ ªÕàÕ×2t
-r
+r
 p/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/compile_commands.json	É·õ§ö2
± Ûÿü××2x
-v
+v
 t/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/compile_commands.json.bin	É·õ§ö2	
Ó Ûÿü××2~
-|
+|
 z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/metadata_generation_command.txt	É·õ§ö2
 
ì ©ÕàÕ×2q
-o
+o
 m/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/prefab_config.json	É·õ§ö2
-
( ©ÕàÕ×2v
+
( ©ÕàÕ×2v
 t
-r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/symbol_folder_index.txt	Ô<EFBFBD>Õìñ2
+r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86/symbol_folder_index.txt	É·õ§ö2

android/app/.cxx/Debug/6a58wo5c/x86_64/.ninja_log

@@ -7,3 +7,4 @@
 31	1333	1741777925679630953	CMakeFiles/native-lib.dir/native-lib.cpp.o	cd23b75ae14e319a
 1334	1500	1741777925862774067	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86_64/libnative-lib.so	e95127d82673baa5
 22	263	1743588461662904639	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86_64/libnative-lib.so	e95127d82673baa5
+5	71	1749722034665043085	/Users/hamzaaleghwairyeen/development/App/driver_sefer/build/app/intermediates/cxx/Debug/6a58wo5c/obj/x86_64/libnative-lib.so	e95127d82673baa5

android/app/.cxx/Debug/6a58wo5c/x86_64/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Log~
 |
 z/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ì´ç¨ë2

 ûŠý××2{
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ß·õ§ö2

 ûŠý××2{
 y
-w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/android_gradle_build.json	Ì´ç¨ë2
í
+w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/android_gradle_build.json	ß·õ§ö2
í
  ýŠý××2€

 ~
-|/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/android_gradle_build_mini.json	Ì´ç¨ë2
¯ €‹ý××2m
+|/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/android_gradle_build_mini.json	ß·õ§ö2
¯ €‹ý××2m
 k
-i/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build.ninja	Ì´ç¨ë2
¼ƒ
 çŠý××2q
+i/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build.ninja	ß·õ§ö2
¼ƒ
 çŠý××2q
 o
-m/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build.ninja.txt	Ì´ç¨ë2v
+m/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build.ninja.txt	ß·õ§ö2v
 t
-r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build_file_index.txt	Í´ç¨ë2
+r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/build_file_index.txt	ß·õ§ö2
 
^ ŒààÕ×2w
-u
+u
 s/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/compile_commands.json	ß·õ§ö2
§ çŠý××2{
-y
+y
 w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/compile_commands.json.bin	ß·õ§ö2	
 çŠý××2<C397>

-
+
 }/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/metadata_generation_command.txt	ß·õ§ö2
 
û ŒààÕ×2t
-r
+r
 p/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/prefab_config.json	ß·õ§ö2
-
( ŒààÕ×2y
+
( ŒààÕ×2y
 w
-u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/symbol_folder_index.txt	Í´ç¨ë2
+u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/Debug/6a58wo5c/x86_64/symbol_folder_index.txt	ß·õ§ö2

android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log
 ‰

 †
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	‘ôÊðñ2

 Œ¥âÁÜ2‰

+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ü—Ï¢ö2

 Œ¥âÁÜ2‰

 †

-ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/android_gradle_build.json	’ôÊðñ2
” ¶¥âÁÜ2Ž

+ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/android_gradle_build.json	Ü—Ï¢ö2
” ¶¥âÁÜ2Ž

 ‹

-ˆ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/android_gradle_build_mini.json	’ôÊðñ2
Ö ’¨âÁÜ2y
+ˆ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/android_gradle_build_mini.json	Ü—Ï¢ö2
Ö ’¨âÁÜ2y
 w
-u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build.ninja	’ôÊðñ2
÷„
 ü¢âÁÜ2}
+u/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build.ninja	Ü—Ï¢ö2
÷„
 ü¢âÁÜ2}
 {
-y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build.ninja.txt	’ôÊðñ2ƒ

+y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build.ninja.txt	Ü—Ï¢ö2ƒ

 €

-~/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build_file_index.txt	’ôÊðñ2
+~/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/build_file_index.txt	Ü—Ï¢ö2
 
^ àòíÕ×2„

-<EFBFBD>

+<EFBFBD>

 /Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/compile_commands.json	Ü—Ï¢ö2
­ ü¢âÁÜ2‰

-†

+†

 ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/compile_commands.json.bin	Ü—Ï¢ö2	
Ñ ü¢âÁÜ2<C39C>

-Œ

+Œ

 ‰
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/metadata_generation_command.txt	Ü—Ï¢ö2
 
®	 ßòíÕ×2€

-~
+~
 |/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/prefab_config.json	Ü—Ï¢ö2
-
( ßòíÕ×2‡

+
( ßòíÕ×2‡

 „

-<EFBFBD>
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/symbol_folder_index.txt	’ôÊðñ2
+<EFBFBD>
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/arm64-v8a/symbol_folder_index.txt	Ü—Ï¢ö2

android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log
 ‹

 ˆ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	íúÊðñ2

 ¶£ãÁÜ2‹

+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	â˜Ï¢ö2

 ¶£ãÁÜ2‹

 ˆ

-…
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/android_gradle_build.json	ïúÊðñ2
œ ߣãÁÜ2<C39C>

+…
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/android_gradle_build.json	â˜Ï¢ö2
œ ߣãÁÜ2<C39C>

 <EFBFBD>

-Š
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/android_gradle_build_mini.json	ïúÊðñ2
Þ Š¤ãÁÜ2{
+Š
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/android_gradle_build_mini.json	â˜Ï¢ö2
Þ Š¤ãÁÜ2{
 y
-w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build.ninja	ïúÊðñ2
½…
 Ò¢ãÁÜ2
+w/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build.ninja	â˜Ï¢ö2
½…
 Ò¢ãÁÜ2
 }
-{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build.ninja.txt	ïúÊðñ2†

+{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build.ninja.txt	â˜Ï¢ö2†

 ƒ

-€
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build_file_index.txt	ïúÊðñ2
+€
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/build_file_index.txt	â˜Ï¢ö2
 
^ ãŽîÕ×2‡

-„

+„

 <EFBFBD>
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/compile_commands.json	â˜Ï¢ö2
È Å¢ãÁÜ2‹

-ˆ

+ˆ

 …
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/compile_commands.json.bin	â˜Ï¢ö2	
ú Å¢ãÁÜ2‘

-Ž

+Ž

 ‹
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/metadata_generation_command.txt	â˜Ï¢ö2
 
¸	 âŽîÕ×2ƒ

-€

+€

 ~/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/prefab_config.json	â˜Ï¢ö2
-
( âŽîÕ×2‰

+
( âŽîÕ×2‰

 †

-ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/symbol_folder_index.txt	ïúÊðñ2
+ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/armeabi-v7a/symbol_folder_index.txt	â˜Ï¢ö2

android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Log
 ƒ

 €
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	­üÊðñ2

 ÒÒãÁÜ2<C39C>

+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ÿ˜Ï¢ö2

 ÒÒãÁÜ2<C39C>

 
-}/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/android_gradle_build.json	­üÊðñ2
ü
+}/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/android_gradle_build.json	ÿ˜Ï¢ö2
ü
  ‚ÓãÁÜ2ˆ

 …

-‚
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/android_gradle_build_mini.json	­üÊðñ2
¾ °ÓãÁÜ2s
+‚
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/android_gradle_build_mini.json	ÿ˜Ï¢ö2
¾ °ÓãÁÜ2s
 q
-o/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build.ninja	­üÊðñ2
Ç„
 ¦ËãÁÜ2w
+o/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build.ninja	ÿ˜Ï¢ö2
Ç„
 ¦ËãÁÜ2w
 u
-s/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build.ninja.txt	­üÊðñ2|
+s/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build.ninja.txt	ÿ˜Ï¢ö2|
 z
-x/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build_file_index.txt	­üÊðñ2
+x/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/build_file_index.txt	ÿ˜Ï¢ö2
 
^ ¥«îÕ×2}
-{
+{
 y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/compile_commands.json	ÿ˜Ï¢ö2
³ ¢ËãÁÜ2<C39C>

-
+
 }/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/compile_commands.json.bin	ÿ˜Ï¢ö2	
Þ ¢ËãÁÜ2‰

-†

+†

 ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/metadata_generation_command.txt	ÿ˜Ï¢ö2
 
<18>	 ¤«îÕ×2z
-x
+x
 v/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/prefab_config.json	ÿ˜Ï¢ö2
-
( ¥«îÕ×2
+
( ¥«îÕ×2
 }
-{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/symbol_folder_index.txt	­üÊðñ2
+{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86/symbol_folder_index.txt	ÿ˜Ï¢ö2

android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log
 †

 ƒ
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ÓýÊðñ2

 ýþãÁÜ2†

+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ª좚2

 ýþãÁÜ2†

 ƒ

-€
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/android_gradle_build.json	ÓýÊðñ2
ˆ ÀÿãÁÜ2‹

+€
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/android_gradle_build.json	­™Ï¢ö2
ˆ ÀÿãÁÜ2‹

 ˆ

-…
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/android_gradle_build_mini.json	ÓýÊðñ2
Ê ¤€äÁÜ2v
+…
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/android_gradle_build_mini.json	­™Ï¢ö2
Ê ¤€äÁÜ2v
 t
-r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build.ninja	ÓýÊðñ2
Ñ„
 éüãÁÜ2z
+r/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build.ninja	­™Ï¢ö2
Ñ„
 éüãÁÜ2z
 x
-v/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build.ninja.txt	ÓýÊðñ2
+v/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build.ninja.txt	­™Ï¢ö2
 }
-{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build_file_index.txt	ÓýÊðñ2
+{/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/build_file_index.txt	­™Ï¢ö2
 
^ ÕÕîÕ×2€

-~
+~
 |/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/compile_commands.json	­™Ï¢ö2
© éüãÁÜ2†

-ƒ

+ƒ

 €
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/compile_commands.json.bin	­™Ï¢ö2	
Í éüãÁÜ2Œ

-‰

+‰

 †
/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/metadata_generation_command.txt	­™Ï¢ö2
 
Ÿ	 ÓÕîÕ×2}
-{
+{
 y/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/prefab_config.json	­™Ï¢ö2
-
( ÔÕîÕ×2ƒ

+
( ÔÕîÕ×2ƒ

 €

-~/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/symbol_folder_index.txt	ÓýÊðñ2
+~/Users/hamzaaleghwairyeen/development/App/driver_sefer/android/app/.cxx/RelWithDebInfo/4y6h5l4y/x86_64/symbol_folder_index.txt	­™Ï¢ö2

android/app/build.gradle

@@ -66,8 +66,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 142
+        versionCode = 143
-        versionName = '2.0.142'
+        versionName = '2.0.143'
         multiDexEnabled =true
     }
     sourceSets {

ios/Runner/Info.plist

@@ -35,7 +35,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>105</string>
+	<string>106</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -50,7 +50,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.0.105</string>
+	<string>5.0.106</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/controller/auth/captin/login_captin_controller.dart

@@ -232,10 +232,7 @@ class LoginDriverController extends GetxController {
     Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
 
     var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {
-      'email': email.toString().contains('@')
+      'email': email,
-          // ? (box.read(BoxName.emailDriver))
-          ? (email)
-          : email,
       'id': driverID,
     });
 

lib/controller/firebase/firbase_messge.dart

@@ -408,7 +408,8 @@ class FirebaseMessagesController extends GetxController {
       var encryptedKey = await storage.read(key: 'FCM_PRIVATE_KEY');
       // Log.print('encryptedKey: ${encryptedKey}');
       if (encryptedKey != null) {
-        serviceAccountKeyJson = (encryptedKey);
+        serviceAccountKeyJson =
+            EncryptionHelper.instance.decryptData(encryptedKey);
         // Log.print('serviceAccountKeyJson: ${serviceAccountKeyJson}');
       } else {
         print('🔴 Error: FCM_PRIVATE_KEY not found in Secure Storage');

lib/controller/functions/crud.dart

@@ -4,7 +4,6 @@ import 'package:secure_string_operations/secure_string_operations.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/constant/links.dart';
 import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
-import 'package:sefer_driver/controller/functions/add_error.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
@@ -44,9 +43,9 @@ class CRUD {
             'Bearer ${X.r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs).toString().split(AppInformation.addd)[0]}'
       },
     );
-    // print(response.request);
+    print(response.request);
-    // Log.print('response.body: ${response.body}');
+    Log.print('response.body: ${response.body}');
-    // print(payload);
+    print(payload);
     if (response.statusCode == 200) {
       var jsonData = jsonDecode(response.body);
       if (jsonData['status'] == 'success') {
@@ -82,7 +81,7 @@ class CRUD {
   }) async {
     var s = await LoginDriverController().getJwtWallet();
     final hmac = box.read(BoxName.hmac);
-    Log.print('hmac: ${hmac}');
+    // Log.print('hmac: ${hmac}');
     var url = Uri.parse(
       link,
     );
@@ -95,10 +94,9 @@ class CRUD {
         'X-HMAC-Auth': hmac.toString(),
       },
     );
-    // print(response.request);
+    Log.print('response.request: ${response.request}');
-    // // Log.print('response.request: ${response.request}');
+    Log.print('response.body: ${response.body}');
-    // Log.print('response.body: ${response.body}');
+    print(payload);
-    // print(payload);
     if (response.statusCode == 200) {
       var jsonData = jsonDecode(response.body);
       if (jsonData['status'] == 'success') {
@@ -145,9 +143,9 @@ class CRUD {
           'X-HMAC-Auth': hmac.toString(),
         },
       );
-      // print(response.request);
+      print(response.request);
-      // Log.print('response.body: ${response.body}');
+      Log.print('response.body: ${response.body}');
-      // print(payload);
+      print(payload);
       if (response.statusCode == 200) {
         try {
           var jsonData = jsonDecode(response.body);
@@ -203,9 +201,9 @@ class CRUD {
           // 'Authorization': 'Bearer ${box.read(BoxName.jwt)}'
         },
       );
-      // print(response.request);
+      print(response.request);
-      // Log.print('response.body: ${response.body}');
+      Log.print('response.body: ${response.body}');
-      // print(payload);
+      print(payload);
       if (response.statusCode == 200) {
         try {
           var jsonData = jsonDecode(response.body);

lib/controller/functions/location_controller.dart

@@ -4,10 +4,12 @@ import 'dart:math';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:location/location.dart';
+import 'package:sefer_driver/constant/table_names.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/links.dart';
 import '../../main.dart';
+import '../../print.dart';
 import '../home/captin/home_captain_controller.dart';
 import '../home/payment/captain_wallet_controller.dart';
 import 'crud.dart';
@@ -72,6 +74,8 @@ class LocationController extends GetxController {
   }
 
   int _insertCounter = 0;
+  double? _lastSpeed;
+  DateTime? _lastSpeedTime;
 
   Future<void> startLocationUpdates() async {
     if (box.read(BoxName.driverID) != null) {
@@ -111,13 +115,17 @@ class LocationController extends GetxController {
               if (_lastSavedPosition == null ||
                   _calculateDistanceInMeters(_lastSavedPosition!, myLocation) >=
                       10) {
+                double currentSpeed = speed; // m/s
+                double? acceleration = _calculateAcceleration(currentSpeed);
+
                 await sql.insertData({
                   'driver_id': box.read(BoxName.driverID).toString(),
                   'latitude': myLocation.latitude,
                   'longitude': myLocation.longitude,
+                  'acceleration': acceleration ?? 0.0,
                   'created_at': DateTime.now().toIso8601String(),
                   'updated_at': DateTime.now().toIso8601String(),
-                }, 'car_locations');
+                }, TableName.behavior);
 
                 _lastSavedPosition = myLocation;
               }
@@ -125,6 +133,7 @@ class LocationController extends GetxController {
 
             // ✅ إدخال للسيرفر كل دقيقة
             _insertCounter++;
+            Log.print('_insertCounter: ${_insertCounter}');
             if (_insertCounter >= 12) {
               _insertCounter = 0;
               await CRUD().post(
@@ -199,4 +208,22 @@ class LocationController extends GetxController {
             2;
     return 12742 * 1000 * asin(sqrt(a)); // meters
   }
+
+  double? _calculateAcceleration(double currentSpeed) {
+    final now = DateTime.now();
+    if (_lastSpeed != null && _lastSpeedTime != null) {
+      final deltaTime =
+          now.difference(_lastSpeedTime!).inMilliseconds / 1000.0; // seconds
+      if (deltaTime > 0) {
+        final acceleration = (currentSpeed - _lastSpeed!) / deltaTime;
+        _lastSpeed = currentSpeed;
+        _lastSpeedTime = now;
+        return double.parse(acceleration.toStringAsFixed(2));
+      }
+    }
+
+    _lastSpeed = currentSpeed;
+    _lastSpeedTime = now;
+    return null;
+  }
 }

lib/controller/home/captin/home_captain_controller.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:sefer_driver/constant/box_name.dart';
@@ -90,7 +91,8 @@ class HomeCaptainController extends GetxController {
     isActive = !isActive;
     if (isActive) {
       if (double.parse(totalPoints) > -300) {
-        // locationController.startLocationUpdates();
+        locationController.startLocationUpdates();
+        HapticFeedback.heavyImpact();
         // locationBackController.startBackLocation();
         activeStartTime = DateTime.now();
         activeTimer = Timer.periodic(const Duration(seconds: 1), (timer) {

lib/controller/home/captin/map_driver_controller.dart

@@ -173,6 +173,7 @@ class MapDriverController extends GetxController {
 
   cancelTripFromDriverAfterApplied() async {
     if (formKeyCancel.currentState!.validate()) {
+      box.write(BoxName.statusDriverLocation, 'off');
       FirebaseMessagesController().sendNotificationToDriverMAP(
         "Cancel Trip from driver",
         "Trip Cancelled from driver. We are looking for a new driver. Please wait."

lib/controller/local/translations.dart

@@ -65,7 +65,7 @@ class MyTranslation extends Translations {
           "Order Applied": "تم تطبيق الطلب",
 
           //firebase above
-          "cancel": "إلغاء",
+          "cancel": "إلغاء", "Syria": "‏سوريا",
           "Security Warning": "تحذير أمني",
           "Potential security risks detected. The application will close in @seconds seconds.":
               "تم اكتشاف مخاطر أمنية محتملة. سيتم إغلاق التطبيق خلال @seconds ثانية.",

lib/main.dart

@@ -44,11 +44,17 @@ final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
 @pragma('vm:entry-point')
 Future<void> backgroundMessageHandler(RemoteMessage message) async {
+  WidgetsFlutterBinding.ensureInitialized();
   await Firebase.initializeApp();
-
+  if (!await FlutterOverlayWindow.isPermissionGranted()) {
+    // بإمكانك تجاهل الطلب في الخلفية والاكتفاء بالتنبيه
+    Log.print("Overlay permission not granted; showing only notification.");
+  }
   if (Platform.isAndroid) {
     if (message.notification != null && message.notification!.title != null) {
-      if (message.notification?.title == 'Order'.tr ||
+      Log.print('message.notification!.title: ${message.notification!.title}');
+
+      if (message.notification?.title == 'طلب' ||
           message.notification?.title == 'OrderSpeed') {
         var myListString = message.data['DriverList'] ?? '[]';
         Log.print('myListString: $myListString');
@@ -57,6 +63,7 @@ Future<void> backgroundMessageHandler(RemoteMessage message) async {
         List<dynamic> myList;
         try {
           myList = jsonDecode(myListString) as List<dynamic>;
+          Log.print('myList: ${myList}');
         } catch (e) {
           Log.print('Error decoding JSON: $e');
           myList = [];
@@ -74,9 +81,9 @@ Future<void> backgroundMessageHandler(RemoteMessage message) async {
           flag: OverlayFlag.focusPointer,
           // visibility: NotificationVisibility.visibilityPublic,
           positionGravity: PositionGravity.auto,
-          height: 700,
+          height: 1300,
           width: WindowSize.matchParent,
-          startPosition: const OverlayPosition(0, -150),
+          startPosition: const OverlayPosition(0, -40),
         );
         NotificationController().showNotification(
           message.notification!.title.toString(),
@@ -175,10 +182,10 @@ class _MyAppState extends State<MyApp> {
           FirebaseMessagesController().getToken(),
         ]);
 
-        PermissionStatus status1 = await Permission.location.status;
+        // PermissionStatus status1 = await Permission.location.status;
-        if (status1.isGranted) {
+        // if (status1.isGranted) {
-          await LocationController().startLocationUpdates();
+        //   await LocationController().startLocationUpdates();
-        }
+        // }
       }
 
       String? key = (await storage.read(key: BoxName.payMobApikey));

lib/models/db_sql.dart

@@ -19,9 +19,14 @@ class DbSql {
     String path = join(await getDatabasesPath(), 'my_database.db');
     return await openDatabase(
       path,
-      version: 1,
+      version: 3,
-      onCreate: (db, version) async {
+      onCreate: (db, version) async => await _createTables(db),
-        await db.execute('''
+      onUpgrade: (db, oldVersion, newVersion) async => await _createTables(db),
+    );
+  }
+
+  Future<void> _createTables(Database db) async {
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS  ${TableName.carLocations}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             driver_id TEXT,
@@ -31,7 +36,7 @@ class DbSql {
             updated_at TEXT
           )
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.placesFavorite}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             latitude REAL,
@@ -40,7 +45,7 @@ class DbSql {
             rate TEXT
           )
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.recentLocations}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             latitude REAL,
@@ -49,7 +54,7 @@ class DbSql {
             rate TEXT
           )
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.driverOrdersRefuse}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             order_id TEXT UNIQUE,
@@ -57,7 +62,7 @@ class DbSql {
             driver_id TEXT
           )
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.rideLocation}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             order_id TEXT ,
@@ -66,29 +71,31 @@ class DbSql {
             lng TEXT
           )
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.faceDetectTimes}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             faceDetectTimes INTEGER
           )
         ''');
-        await db.execute('''
+
-          CREATE TABLE IF NOT EXISTS ${TableName.behavior}(
+    await db.execute('''
+          CREATE TABLE IF NOT EXISTS ${TableName.behavior} (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
-            speed REAL,
+            driver_id TEXT,
-            lat REAL,
+            latitude REAL,
-            lng REAL,
+            longitude REAL,
             acceleration REAL,
-            timestamp TEXT
+            created_at TEXT,
-          )
+            updated_at TEXT
+          );
         ''');
-        await db.execute('''
+    await db.execute('''
           CREATE TABLE IF NOT EXISTS ${TableName.captainNotification}(
             id INTEGER PRIMARY KEY AUTOINCREMENT,
             faceDetectTimes INTEGER
           )
         ''');
-        await db.execute('''
+    await db.execute('''
   CREATE TABLE IF NOT EXISTS ${TableName.applyRideFromOverLay}(
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     start_location_lat TEXT,
@@ -129,8 +136,6 @@ class DbSql {
     passenger_rate TEXT
   )
 ''');
-      },
-    );
   }
 
   Future<List<Map<String, dynamic>>> getAllData(String table) async {

lib/models/model/order_data.dart

@@ -1,52 +1,90 @@
 // lib/models/order_data.dart
+
 class OrderData {
   final String customerName;
-  final double distance;
+  final double tripDistanceKm; // المسافة الكلية للرحلة بالكيلومتر
   final String price;
-  final String startLocation;
+  final String startLocationAddress;
-  final String endLocation;
+  final String endLocationAddress;
-  final String passengerDistance;
+
-  final String duration;
+  final double distanceToPassengerKm; // المسافة إلى الراكب بالكيلومتر
+  final int tripDurationMinutes; // مدة الرحلة الكلية بالدقائق (مقربة لأعلى)
+  final int
+      durationToPassengerMinutes; // المدة إلى الراكب بالدقائق (مقربة لأعلى)
+
   final String rideType;
   final String orderId;
   final String passengerId;
   final String passengerRate;
 
+  final String? rawStartCoordinates;
+  final String? rawEndCoordinates;
+
   OrderData({
     required this.customerName,
-    required this.distance,
+    required this.tripDistanceKm,
     required this.price,
-    required this.startLocation,
+    required this.startLocationAddress,
-    required this.endLocation,
+    required this.endLocationAddress,
-    required this.passengerDistance,
+    required this.distanceToPassengerKm,
-    required this.duration,
+    required this.tripDurationMinutes,
+    required this.durationToPassengerMinutes,
     required this.rideType,
     required this.orderId,
     required this.passengerId,
     required this.passengerRate,
+    this.rawStartCoordinates,
+    this.rawEndCoordinates,
   });
 
-  // Factory constructor to create an OrderData instance from a List<dynamic>.
+  // دالة مساعدة لتحويل الثواني إلى دقائق وتقريبها لأعلى
-  // This handles parsing and provides default values for safety.
+  static int _secondsToRoundedUpMinutes(String secondsString) {
+    final seconds = double.tryParse(secondsString) ?? 0.0;
+    if (seconds <= 0) return 0;
+    return (seconds / 60)
+        .ceil(); // .ceil() لتقريب الكسر لأعلى (مثلاً 0.1 دقيقة تصبح 1 دقيقة)
+  }
+
   factory OrderData.fromList(List<dynamic> list) {
+    // بناءً على testList والافتراضات الجديدة:
+    // list[4]: durationToRide (مدة الرحلة الكلية بالثواني)
+    // list[5]: distance (المسافة الكلية للرحلة بالكيلومتر)
+    // list[12]: distanceByPassenger (المسافة إلى الراكب بالمتر)
+    // list[15]: durationToPassenger (المدة إلى الراكب بالثواني)
+
+    double distanceToPassengerMeters =
+        list.length > 12 ? (double.tryParse(list[12].toString()) ?? 0.0) : 0.0;
+
     return OrderData(
       customerName: list.length > 8 ? list[8].toString() : 'Unknown Customer',
-      distance:
+      tripDistanceKm:
           list.length > 5 ? (double.tryParse(list[5].toString()) ?? 0.0) : 0.0,
       price: list.length > 2 ? list[2].toString().split('.')[0] : '0',
-      startLocation: list.length > 29 ? list[29].toString() : 'Unknown',
+      startLocationAddress:
-      endLocation: list.length > 30 ? list[30].toString() : 'Unknown',
+          list.length > 29 ? list[29].toString() : 'Unknown Address',
-      passengerDistance: list.length > 12 ? list[12].toString() : 'Unknown',
+      endLocationAddress:
-      duration: list.length > 4
+          list.length > 30 ? list[30].toString() : 'Unknown Address',
-          ? (double.parse(list[4].toString()) / 60).toStringAsFixed(0)
+
-          : 'Unknown',
+      distanceToPassengerKm:
+          distanceToPassengerMeters / 1000.0, // تحويل من متر إلى كيلومتر
+
+      tripDurationMinutes:
+          list.length > 4 ? _secondsToRoundedUpMinutes(list[4].toString()) : 0,
+      durationToPassengerMinutes: list.length > 15
+          ? _secondsToRoundedUpMinutes(list[15].toString())
+          : 0,
+
       rideType:
           list.length > 31 ? _getRideType(list[31].toString()) : 'Unknown',
-      orderId: list.length > 16 ? list[16].toString() : 'Unknown',
+      orderId: list.length > 16 ? list[16].toString() : 'N/A',
-      passengerId: list.length > 7 ? list[7].toString() : 'Unknown',
+      passengerId: list.length > 7 ? list[7].toString() : 'N/A',
-      passengerRate: list.length > 33 ? list[33].toString() : 'Unknown',
+      passengerRate: list.length > 33 ? list[33].toString() : 'N/A',
+
+      rawStartCoordinates: list.isNotEmpty ? list[0].toString() : null,
+      rawEndCoordinates: list.length > 1 ? list[1].toString() : null,
     );
   }
+
   static String _getRideType(String type) {
     switch (type) {
       case 'Comfort':
@@ -60,7 +98,50 @@ class OrderData {
       case 'Rayeh Gai':
         return 'رايح جاي';
       default:
-        return '';
+        return type;
     }
   }
+
+  Map<String, double?>? get startCoordinates {
+    if (rawStartCoordinates == null) return null;
+    final parts = rawStartCoordinates!.split(',');
+    if (parts.length == 2) {
+      return {
+        'lat': double.tryParse(parts[0].trim()),
+        'lng': double.tryParse(parts[1].trim())
+      };
+    }
+    return null;
+  }
+
+  Map<String, double?>? get endCoordinates {
+    if (rawEndCoordinates == null) return null;
+    final parts = rawEndCoordinates!.split(',');
+    if (parts.length == 2) {
+      return {
+        'lat': double.tryParse(parts[0].trim()),
+        'lng': double.tryParse(parts[1].trim())
+      };
+    }
+    return null;
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'customerName': customerName,
+      'tripDistanceKm': tripDistanceKm,
+      'price': price,
+      'startLocationAddress': startLocationAddress,
+      'endLocationAddress': endLocationAddress,
+      'distanceToPassengerKm': distanceToPassengerKm,
+      'tripDurationMinutes': tripDurationMinutes,
+      'durationToPassengerMinutes': durationToPassengerMinutes,
+      'rideType': rideType,
+      'orderId': orderId,
+      'passengerId': passengerId,
+      'passengerRate': passengerRate,
+      'rawStartCoordinates': rawStartCoordinates,
+      'rawEndCoordinates': rawEndCoordinates,
+    };
+  }
 }

lib/views/auth/country_widget.dart

@@ -16,6 +16,7 @@ class CountryPicker extends StatelessWidget {
 
   final List<String> countryOptions = [
     'Jordan',
+    "Syria",
     'USA',
     'Egypt',
     'Turkey',

lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart

@@ -1,10 +1,6 @@
-import 'dart:io';
-
 import 'package:sefer_driver/constant/box_name.dart';
-import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
 import 'package:sefer_driver/controller/firebase/local_notification.dart';
 import 'package:sefer_driver/main.dart';
-import 'package:sefer_driver/views/auth/captin/cards/sms_signup.dart';
 import 'package:sefer_driver/views/home/Captin/orderCaptin/vip_order_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';
@@ -12,7 +8,6 @@ import 'package:get/get.dart';
 import 'package:sefer_driver/controller/home/captin/home_captain_controller.dart';
 
 import '../../../../../constant/colors.dart';
-import '../../../../../controller/packages/lingo/lingo_hunter.dart';
 import '../../../../Rate/ride_calculate_driver.dart';
 
 GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
@@ -95,26 +90,72 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
                 )
               : const SizedBox(),
           // : const SizedBox(),
-          AnimatedContainer(
+          // AnimatedContainer(
-            duration: const Duration(microseconds: 200),
+          //   duration: const Duration(microseconds: 200),
-            width: controller.widthMapTypeAndTraffic,
+          //   width: controller.widthMapTypeAndTraffic,
-            decoration: BoxDecoration(
+          //   decoration: BoxDecoration(
-                color: AppColor.secondaryColor,
+          //       color: AppColor.secondaryColor,
-                border: Border.all(color: AppColor.blueColor),
+          //       border: Border.all(color: AppColor.blueColor),
-                borderRadius: BorderRadius.circular(15)),
+          //       borderRadius: BorderRadius.circular(15)),
-            child: Builder(builder: (context) {
+          //   child: Builder(builder: (context) {
-              return IconButton(
+          //     return IconButton(
-                onPressed: () async {
+          //       onPressed: () async {
-                  print(box.read(BoxName.paymentLink));
+          //         final List<dynamic> testList = const [
-                },
+          //           "32.1117875,36.0669891",
-                icon: const Icon(
+          //           "32.1364001,36.0707479",
-                  FontAwesome5.grin_tears,
+          //           "24.84",
-                  size: 29,
+          //           "7.56",
-                  color: AppColor.blueColor,
+          //           "436",
-                ),
+          //           "4.38",
-              );
+          //           "109270481246447459618",
-            }),
+          //           "113172279072358305645",
-          ),
+          //           "hamza",
+          //           "e4QWqe7K607luM7qUMOPCL:APA91bFjX4XBM4I5COJl9fyxCTKJ1ZQpT3vzY7iEbOTuT4uo0-OSCAt5zgVhlhw4aC33s-VhyucDnP1tQGFd9svaazQ8A_SKgolPk3owzug8dCsiXoPeJ0k",
+          //           "+201010101010",
+          //           "6",
+          //           "43",
+          //           "true",
+          //           "c2tXiuBJQCSg4CU4IfqYOL:APA91bFA0f8R3QMnPQnPEEdNyjY-jcoKt4nLBHxcLLsmDSuJn5yd4jSvwq7qDIZpkkPkjfjdwdKsGL0-G0aHpPyjfiBvbCwFmlRMCUKftNMNT7MJx2Bp16Y",
+          //           "6",
+          //           "1188",
+          //           "false",
+          //           "109270481246447459618",
+          //           "436",
+          //           "startEnd",
+          //           "32.12404505187645,36.06566168367863",
+          //           "",
+          //           "",
+          //           "",
+          //           "",
+          //           "5.42",
+          //           "0",
+          //           "hamzaayedflutter@gmail.com",
+          //           "4368+PPP، السخنة، الأردن",
+          //           "43PC+C4G، السخنة، الأردن",
+          //           "Speed",
+          //           "8",
+          //           "5.00"
+          //         ];
+          //         await FlutterOverlayWindow.shareData(testList);
+          //         await FlutterOverlayWindow.showOverlay(
+          //           enableDrag: true,
+          //           flag: OverlayFlag.focusPointer,
+          //           // visibility: NotificationVisibility.visibilityPublic,
+          //           positionGravity: PositionGravity.auto,
+          //           height: 1300,
+          //           width: WindowSize.matchParent,
+          //           startPosition: const OverlayPosition(0, -90),
+          //         );
+          //         debugPrint('Overlay opened: ');
+          //       },
+          //       icon: const Icon(
+          //         FontAwesome5.grin_tears,
+          //         size: 29,
+          //         color: AppColor.blueColor,
+          //       ),
+          //     );
+          //   }),
+          // ),
 
           const SizedBox(
             height: 5,