Merge branch 'master' of dama_agh/telnow_2025 into master

android/app/.cxx/Debug/3v266c66/arm64-v8a/.cmake/api/v1/reply/cache-v2-af9be6835f7eaa658d52.json

@@ -779,7 +779,7 @@
 				}
 			],
 			"type" : "UNINITIALIZED",
-			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe"
+			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe"
 		},
 		{
 			"name" : "CMAKE_MODULE_LINKER_FLAGS",

android/app/.cxx/Debug/3v266c66/arm64-v8a/.cmake/api/v1/reply/index-2025-02-17T06-19-56-0583.json

@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"jsonFile" : "cache-v2-af9be6835f7eaa658d52.json",
+			"jsonFile" : "cache-v2-be88219af01d5376b3c0.json",
 			"kind" : "cache",
 			"version" : 
 			{
@@ -59,7 +59,7 @@
 		{
 			"cache-v2" : 
 			{
-				"jsonFile" : "cache-v2-af9be6835f7eaa658d52.json",
+				"jsonFile" : "cache-v2-be88219af01d5376b3c0.json",
 				"kind" : "cache",
 				"version" : 
 				{

android/app/.cxx/Debug/3v266c66/arm64-v8a/CMakeCache.txt

@@ -127,7 +127,7 @@ CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=E:\Kantor\telnow_2025\build\app\int
 CMAKE_LINKER:FILEPATH=C:/Users/moham/AppData/Local/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/windows-x86_64/bin/ld.lld.exe
 
 //No help, variable specified on the command line.
-CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 
 //Flags used by the linker during the creation of modules.
 CMAKE_MODULE_LINKER_FLAGS:STRING=

android/app/.cxx/Debug/3v266c66/arm64-v8a/CMakeFiles/rules.ninja

@@ -32,7 +32,7 @@ rule RERUN_CMAKE
 # Rule for cleaning all built files.
 
 rule CLEAN
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
   description = Cleaning all built files...
 
 
@@ -40,6 +40,6 @@ rule CLEAN
 # Rule for printing all primary targets available.
 
 rule HELP
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe -t targets
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe -t targets
   description = All primary targets available:
 

android/app/.cxx/Debug/3v266c66/arm64-v8a/android_gradle_build.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\arm64-v8a",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\arm64-v8a",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/arm64-v8a/android_gradle_build_mini.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\arm64-v8a",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\arm64-v8a",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/arm64-v8a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	“œŽ¾Ñ2

§ ÆĽ�Ñ2`
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	¹ñãÍÖ2

§ ÆĽ�Ñ2`
 ^
-\E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\additional_project_files.txt	“œŽ¾Ñ2
 ÑòÀ”Ñ2]
+\E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\additional_project_files.txt	½ñãÍÖ2
 ŠïãÍÖ2]
 [
-YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\android_gradle_build.json	“œŽ¾Ñ2
• êòÀ”Ñ2b
+YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\android_gradle_build.json	½ñãÍÖ2
• ¾ðãÍÖ2b
 `
-^E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\android_gradle_build_mini.json	“œŽ¾Ñ2
ò �óÀ”Ñ2O
+^E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\android_gradle_build_mini.json	½ñãÍÖ2
ò õðãÍÖ2O
 M
-KE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build.ninja	­œŽ¾Ñ2
ÍÓ
 ˜òÀ”Ñ2S
+KE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build.ninja	½ñãÍÖ2
ÍÓ
 »êãÍÖ2S
 Q
-OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build.ninja.txt	­œŽ¾Ñ2X
+OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build.ninja.txt	½ñãÍÖ2X
 V
-TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build_file_index.txt	­œŽ¾Ñ2

K ‡óÀ”Ñ2Y
+TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\build_file_index.txt	½ñãÍÖ2

K ®ñãÍÖ2Y
 W
-UE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\compile_commands.json	לŽ¾Ñ2	]
+UE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\compile_commands.json	½ñãÍÖ2	]
 [
-YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\compile_commands.json.bin	לŽ¾Ñ2
+YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\compile_commands.json.bin	½ñãÍÖ2
 c
 a
-_E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\metadata_generation_command.txt	ØœŽ¾Ñ2
Ÿ …óÀ”Ñ2V
+_E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\metadata_generation_command.txt	¾ñãÍÖ2
Ÿ ªñãÍÖ2V
 T
-RE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\prefab_config.json	ØœŽ¾Ñ2

( …óÀ”Ñ2[
+RE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\prefab_config.json	¾ñãÍÖ2

( ¬ñãÍÖ2[
 Y
-WE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\symbol_folder_index.txt	ØœŽ¾Ñ2


N †óÀ”Ñ2
+WE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\arm64-v8a\symbol_folder_index.txt	¾ñãÍÖ2


N ­ñãÍÖ2

android/app/.cxx/Debug/3v266c66/arm64-v8a/metadata_generation_command.txt

@@ -8,7 +8,7 @@
 -DANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_ANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_TOOLCHAIN_FILE=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393\build\cmake\android.toolchain.cmake
--DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+-DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\arm64-v8a
 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\arm64-v8a
 -DCMAKE_BUILD_TYPE=Debug

android/app/.cxx/Debug/3v266c66/armeabi-v7a/.cmake/api/v1/reply/cache-v2-a7dbe51e248e57ef6ec8.json

@@ -779,7 +779,7 @@
 				}
 			],
 			"type" : "UNINITIALIZED",
-			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe"
+			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe"
 		},
 		{
 			"name" : "CMAKE_MODULE_LINKER_FLAGS",

android/app/.cxx/Debug/3v266c66/armeabi-v7a/.cmake/api/v1/reply/index-2025-02-17T06-19-58-0486.json

@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"jsonFile" : "cache-v2-a7dbe51e248e57ef6ec8.json",
+			"jsonFile" : "cache-v2-5048e6198c1f7af45a8f.json",
 			"kind" : "cache",
 			"version" : 
 			{
@@ -59,7 +59,7 @@
 		{
 			"cache-v2" : 
 			{
-				"jsonFile" : "cache-v2-a7dbe51e248e57ef6ec8.json",
+				"jsonFile" : "cache-v2-5048e6198c1f7af45a8f.json",
 				"kind" : "cache",
 				"version" : 
 				{

android/app/.cxx/Debug/3v266c66/armeabi-v7a/CMakeCache.txt

@@ -127,7 +127,7 @@ CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=E:\Kantor\telnow_2025\build\app\int
 CMAKE_LINKER:FILEPATH=C:/Users/moham/AppData/Local/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/windows-x86_64/bin/ld.lld.exe
 
 //No help, variable specified on the command line.
-CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 
 //Flags used by the linker during the creation of modules.
 CMAKE_MODULE_LINKER_FLAGS:STRING=

android/app/.cxx/Debug/3v266c66/armeabi-v7a/CMakeFiles/rules.ninja

@@ -32,7 +32,7 @@ rule RERUN_CMAKE
 # Rule for cleaning all built files.
 
 rule CLEAN
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
   description = Cleaning all built files...
 
 
@@ -40,6 +40,6 @@ rule CLEAN
 # Rule for printing all primary targets available.
 
 rule HELP
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe -t targets
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe -t targets
   description = All primary targets available:
 

android/app/.cxx/Debug/3v266c66/armeabi-v7a/android_gradle_build.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\armeabi-v7a",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\armeabi-v7a",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/armeabi-v7a/android_gradle_build_mini.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\armeabi-v7a",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\armeabi-v7a",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/armeabi-v7a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	àŽ¾Ñ2

§ ÆĽ�Ñ2b
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ê”äÍÖ2

§ ÆĽ�Ñ2b
 `
-^E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\additional_project_files.txt	Ä Ž¾Ñ2
 ¤�Á”Ñ2_
+^E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\additional_project_files.txt	Ê”äÍÖ2
 ¯”äÍÖ2_
 ]
-[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\android_gradle_build.json	Ä Ž¾Ñ2
™ ¦�Á”Ñ2d
+[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\android_gradle_build.json	Ê”äÍÖ2
™ ±”äÍÖ2d
 b
-`E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\android_gradle_build_mini.json	Ä Ž¾Ñ2
ö ©�Á”Ñ2Q
+`E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\android_gradle_build_mini.json	Ë”äÍÖ2
ö ¼”äÍÖ2Q
 O
-ME:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build.ninja	Ä Ž¾Ñ2
×Ó
 †�Á”Ñ2U
+ME:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build.ninja	Ë”äÍÖ2
×Ó
 Š”äÍÖ2U
 S
-QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build.ninja.txt	Ä Ž¾Ñ2Z
+QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build.ninja.txt	Ë”äÍÖ2Z
 X
-VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build_file_index.txt	Ä Ž¾Ñ2

K «�Á”Ñ2[
+VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\build_file_index.txt	Ë”äÍÖ2

K ÔäÍÖ2[
 Y
-WE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\compile_commands.json	Ä Ž¾Ñ2	_
+WE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\compile_commands.json	Ë”äÍÖ2	_
 ]
-[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\compile_commands.json.bin	Ä Ž¾Ñ2
+[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\compile_commands.json.bin	Ë”äÍÖ2
 e
 c
-aE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\metadata_generation_command.txt	Ä Ž¾Ñ2
© ª�Á”Ñ2X
+aE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\metadata_generation_command.txt	Ì”äÍÖ2
© ½”äÍÖ2X
 V
-TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\prefab_config.json	Ä Ž¾Ñ2

( ª�Á”Ñ2]
+TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\prefab_config.json	Ì”äÍÖ2

( ¿”äÍÖ2]
 [
-YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\symbol_folder_index.txt	Ä Ž¾Ñ2


P ª�Á”Ñ2
+YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\armeabi-v7a\symbol_folder_index.txt	Ì”äÍÖ2


P Á”äÍÖ2

android/app/.cxx/Debug/3v266c66/armeabi-v7a/metadata_generation_command.txt

@@ -8,7 +8,7 @@
 -DANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_ANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_TOOLCHAIN_FILE=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393\build\cmake\android.toolchain.cmake
--DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+-DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\armeabi-v7a
 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\armeabi-v7a
 -DCMAKE_BUILD_TYPE=Debug

android/app/.cxx/Debug/3v266c66/x86/.cmake/api/v1/reply/cache-v2-e9cc4d69ad036a78e4d9.json

@@ -779,7 +779,7 @@
 				}
 			],
 			"type" : "UNINITIALIZED",
-			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe"
+			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe"
 		},
 		{
 			"name" : "CMAKE_MODULE_LINKER_FLAGS",

android/app/.cxx/Debug/3v266c66/x86/.cmake/api/v1/reply/index-2025-02-17T06-19-59-0632.json

@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"jsonFile" : "cache-v2-e9cc4d69ad036a78e4d9.json",
+			"jsonFile" : "cache-v2-6ae4fe736fbfabd12fcf.json",
 			"kind" : "cache",
 			"version" : 
 			{
@@ -59,7 +59,7 @@
 		{
 			"cache-v2" : 
 			{
-				"jsonFile" : "cache-v2-e9cc4d69ad036a78e4d9.json",
+				"jsonFile" : "cache-v2-6ae4fe736fbfabd12fcf.json",
 				"kind" : "cache",
 				"version" : 
 				{

android/app/.cxx/Debug/3v266c66/x86/CMakeCache.txt

@@ -127,7 +127,7 @@ CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=E:\Kantor\telnow_2025\build\app\int
 CMAKE_LINKER:FILEPATH=C:/Users/moham/AppData/Local/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/windows-x86_64/bin/ld.lld.exe
 
 //No help, variable specified on the command line.
-CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 
 //Flags used by the linker during the creation of modules.
 CMAKE_MODULE_LINKER_FLAGS:STRING=

android/app/.cxx/Debug/3v266c66/x86/CMakeFiles/rules.ninja

@@ -32,7 +32,7 @@ rule RERUN_CMAKE
 # Rule for cleaning all built files.
 
 rule CLEAN
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
   description = Cleaning all built files...
 
 
@@ -40,6 +40,6 @@ rule CLEAN
 # Rule for printing all primary targets available.
 
 rule HELP
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe -t targets
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe -t targets
   description = All primary targets available:
 

android/app/.cxx/Debug/3v266c66/x86/android_gradle_build.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/x86/android_gradle_build_mini.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/x86/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ù Ž¾Ñ2

§ ÆĽ�Ñ2Z
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	è§äÍÖ2

§ ÆĽ�Ñ2Z
 X
-VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\additional_project_files.txt	Ù Ž¾Ñ2
 ›ŠÁ”Ñ2W
+VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\additional_project_files.txt	ì§äÍÖ2
 š§äÍÖ2W
 U
-SE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\android_gradle_build.json	Ù Ž¾Ñ2
‰ œŠÁ”Ñ2\
+SE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\android_gradle_build.json	ì§äÍÖ2
‰ §äÍÖ2\
 Z
-XE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\android_gradle_build_mini.json	Ù Ž¾Ñ2
æ žŠÁ”Ñ2I
+XE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\android_gradle_build_mini.json	ì§äÍÖ2
æ ˧äÍÖ2I
 G
-EE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build.ninja	Ù Ž¾Ñ2
¯Ó
 �ŠÁ”Ñ2M
+EE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build.ninja	ì§äÍÖ2
¯Ó
 ±¦äÍÖ2M
 K
-IE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build.ninja.txt	Ù Ž¾Ñ2R
+IE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build.ninja.txt	ì§äÍÖ2R
 P
-NE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build_file_index.txt	Ù Ž¾Ñ2

K ŸŠÁ”Ñ2S
+NE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\build_file_index.txt	ì§äÍÖ2

K Ò§äÍÖ2S
 Q
-OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\compile_commands.json	Ù Ž¾Ñ2	W
+OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\compile_commands.json	ì§äÍÖ2	W
 U
-SE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\compile_commands.json.bin	Ù Ž¾Ñ2
+SE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\compile_commands.json.bin	ì§äÍÖ2
 ]
 [
-YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\metadata_generation_command.txt	Ù Ž¾Ñ2
� žŠÁ”Ñ2P
+YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\metadata_generation_command.txt	ì§äÍÖ2
� ͧäÍÖ2P
 N
-LE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\prefab_config.json	Ù Ž¾Ñ2

( ŸŠÁ”Ñ2U
+LE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\prefab_config.json	í§äÍÖ2

( ͧäÍÖ2U
 S
-QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\symbol_folder_index.txt	Ù Ž¾Ñ2


H ŸŠÁ”Ñ2
+QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86\symbol_folder_index.txt	í§äÍÖ2


H ΧäÍÖ2

android/app/.cxx/Debug/3v266c66/x86/metadata_generation_command.txt

@@ -8,7 +8,7 @@
 -DANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_ANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_TOOLCHAIN_FILE=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393\build\cmake\android.toolchain.cmake
--DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+-DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\x86
 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\x86
 -DCMAKE_BUILD_TYPE=Debug

android/app/.cxx/Debug/3v266c66/x86_64/.cmake/api/v1/reply/cache-v2-6d8da1f19fa46eb74714.json

@@ -779,7 +779,7 @@
 				}
 			],
 			"type" : "UNINITIALIZED",
-			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe"
+			"value" : "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe"
 		},
 		{
 			"name" : "CMAKE_MODULE_LINKER_FLAGS",

android/app/.cxx/Debug/3v266c66/x86_64/.cmake/api/v1/reply/index-2025-02-17T06-20-00-0354.json

@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"jsonFile" : "cache-v2-6d8da1f19fa46eb74714.json",
+			"jsonFile" : "cache-v2-a8324f90078840118e65.json",
 			"kind" : "cache",
 			"version" : 
 			{
@@ -59,7 +59,7 @@
 		{
 			"cache-v2" : 
 			{
-				"jsonFile" : "cache-v2-6d8da1f19fa46eb74714.json",
+				"jsonFile" : "cache-v2-a8324f90078840118e65.json",
 				"kind" : "cache",
 				"version" : 
 				{

android/app/.cxx/Debug/3v266c66/x86_64/CMakeCache.txt

@@ -127,7 +127,7 @@ CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=E:\Kantor\telnow_2025\build\app\int
 CMAKE_LINKER:FILEPATH=C:/Users/moham/AppData/Local/Android/Sdk/ndk/25.1.8937393/toolchains/llvm/prebuilt/windows-x86_64/bin/ld.lld.exe
 
 //No help, variable specified on the command line.
-CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 
 //Flags used by the linker during the creation of modules.
 CMAKE_MODULE_LINKER_FLAGS:STRING=

android/app/.cxx/Debug/3v266c66/x86_64/CMakeFiles/rules.ninja

@@ -32,7 +32,7 @@ rule RERUN_CMAKE
 # Rule for cleaning all built files.
 
 rule CLEAN
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe $FILE_ARG -t clean $TARGETS
   description = Cleaning all built files...
 
 
@@ -40,6 +40,6 @@ rule CLEAN
 # Rule for printing all primary targets available.
 
 rule HELP
-  command = C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe -t targets
+  command = C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe -t targets
   description = All primary targets available:
 

android/app/.cxx/Debug/3v266c66/x86_64/android_gradle_build.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86_64",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86_64",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/x86_64/android_gradle_build_mini.json

@@ -4,14 +4,14 @@
   ],
   "cleanCommandsComponents": [
     [
-      "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+      "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
       "-C",
       "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86_64",
       "clean"
     ]
   ],
   "buildTargetsCommandComponents": [
-    "C:\\Users\\moham\\AppData\\Local\\Android\\Sdk\\cmake\\3.22.1\\bin\\ninja.exe",
+    "C:\\Users\\moham\\AppData\\Local\\Android\\sdk\\cmake\\3.22.1\\bin\\ninja.exe",
     "-C",
     "E:\\Kantor\\telnow_2025\\android\\app\\.cxx\\Debug\\3v266c66\\x86_64",
     "{LIST_OF_TARGETS_TO_BUILD}"

android/app/.cxx/Debug/3v266c66/x86_64/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured LogO
 M
 KC:\src\flutter\packages\flutter_tools\gradle\src\main\groovy\CMakeLists.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	†¡Ž¾Ñ2

§ ÆĽ�Ñ2]
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ü’åÍÖ2

§ ÆĽ�Ñ2]
 [
-YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\additional_project_files.txt	†¡Ž¾Ñ2
 ÷�Á”Ñ2Z
+YE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\additional_project_files.txt	ü’åÍÖ2
 בåÍÖ2Z
 X
-VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\android_gradle_build.json	†¡Ž¾Ñ2
� ˆ�Á”Ñ2_
+VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\android_gradle_build.json	ü’åÍÖ2
� ô’åÍÖ2_
 ]
-[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\android_gradle_build_mini.json	†¡Ž¾Ñ2
ì ‹�Á”Ñ2L
+[E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\android_gradle_build_mini.json	ü’åÍÖ2
ì ö’åÍÖ2L
 J
-HE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build.ninja	†¡Ž¾Ñ2
¾Ó
 Ì�Á”Ñ2P
+HE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build.ninja	ü’åÍÖ2
¾Ó
 º‹åÍÖ2P
 N
-LE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build.ninja.txt	†¡Ž¾Ñ2U
+LE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build.ninja.txt	ü’åÍÖ2U
 S
-QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build_file_index.txt	†¡Ž¾Ñ2

K ��Á”Ñ2V
+QE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\build_file_index.txt	ü’åÍÖ2

K ù’åÍÖ2V
 T
-RE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\compile_commands.json	†¡Ž¾Ñ2	Z
+RE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\compile_commands.json	ü’åÍÖ2	Z
 X
-VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\compile_commands.json.bin	†¡Ž¾Ñ2
+VE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\compile_commands.json.bin	ü’åÍÖ2
 `
 ^
-\E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\metadata_generation_command.txt	†¡Ž¾Ñ2
� ��Á”Ñ2S
+\E:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\metadata_generation_command.txt	ü’åÍÖ2
� ø’åÍÖ2S
 Q
-OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\prefab_config.json	†¡Ž¾Ñ2

( Ž�Á”Ñ2X
+OE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\prefab_config.json	ü’åÍÖ2

( ø’åÍÖ2X
 V
-TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\symbol_folder_index.txt	†¡Ž¾Ñ2


K Ž�Á”Ñ2
+TE:\Kantor\telnow_2025\android\app\.cxx\Debug\3v266c66\x86_64\symbol_folder_index.txt	ü’åÍÖ2


K ø’åÍÖ2

android/app/.cxx/Debug/3v266c66/x86_64/metadata_generation_command.txt

@@ -8,7 +8,7 @@
 -DANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_ANDROID_NDK=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393
 -DCMAKE_TOOLCHAIN_FILE=C:\Users\moham\AppData\Local\Android\Sdk\ndk\25.1.8937393\build\cmake\android.toolchain.cmake
--DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\Sdk\cmake\3.22.1\bin\ninja.exe
+-DCMAKE_MAKE_PROGRAM=C:\Users\moham\AppData\Local\Android\sdk\cmake\3.22.1\bin\ninja.exe
 -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\x86_64
 -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=E:\Kantor\telnow_2025\build\app\intermediates\cxx\Debug\3v266c66\obj\x86_64
 -DCMAKE_BUILD_TYPE=Debug

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.2.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.10" apply false
     id "com.google.gms.google-services" version "4.4.2" apply false
 }
 

lib/app_router.dart

@@ -41,7 +41,7 @@ class AppRouter extends RootStackRouter {
       Parameters param = resolver.route.queryParams;
       router.removeLast();
       if (!kIsWeb && U.getAccessCode() != null && param.isEmpty) {
-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}');
+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}');
       } else{
         FlutterNativeSplash.remove();
         resolver.next();
@@ -65,7 +65,7 @@ class AppRouter extends RootStackRouter {
       }
 
       if (pid == null || stb) {
-        router.pushNamed("/qr?new=true");
+        router.pushPath("/qr?new=true");
       }
 
       if(vRedirector.fragment != '' && U.getAccessCode() != null){
@@ -89,10 +89,10 @@ class AppRouter extends RootStackRouter {
           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keyAccessCode);
           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keySerialCode);
           await _sharedPreferencesManager.clearKey(SharedPreferencesManager.version);
-          router.pushNamed("/qr?new=true");
+          router.pushPath("/qr?new=true");
         }
       } else if(_isNewAccessCode(rawPid, U.getAccessCode()!)){
-        router.pushNamed("/change-code/$rawPid");
+        router.pushPath("/change-code/$rawPid");
         return;
       } else {
         if (_sharedPreferencesManager.getInt(SharedPreferencesManager.version) == null){
@@ -105,7 +105,7 @@ class AppRouter extends RootStackRouter {
             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keyAccessCode);
             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.keySerialCode);
             await _sharedPreferencesManager.clearKey(SharedPreferencesManager.version);
-            router.pushNamed("/qr?new=true");
+            router.pushPath("/qr?new=true");
           }
         }
       }
@@ -119,9 +119,9 @@ class AppRouter extends RootStackRouter {
     AutoRouteGuard.simple((resolver, router) async{
       router.removeLast();
       if (!_isValidVersion()) {
-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license');
+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license');
       } else if (_isLoggedIn()) {
-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/menu');
+        !kIsWeb? router.pushAndPopUntil(AppResponsive(), predicate: (_) => false) : router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/menu');
       } else{
         resolver.next();
       }
@@ -132,9 +132,9 @@ class AppRouter extends RootStackRouter {
     AutoRouteGuard.simple((resolver, router) async{
       router.removeLast();
       if (!_isValidVersion()) {
-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license');
+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/license');
       } else if (!_isLoggedIn()) {
-        router.pushNamed('/app/${Uri.encodeComponent(U.getAccessCode()!)}/login');
+        router.pushPath('/app/${Uri.encodeComponent(U.getAccessCode()!)}/login');
       } else{
         resolver.next();
       }

lib/main.dart

@@ -270,7 +270,7 @@ class NotificationClass {
     else{
       var pid = U.getPidFromUrl(context.router.currentUrl);
       context.router.removeLast();
-      context.navigateNamedTo("/app/$pid/menu/history");
+      context.navigateToPath("/app/$pid/menu/history");
     }
     // if (list['type'] == 'FORUM') {
     //   Navigator.push(context, PageTransition(type: PageTransitionType.rightToLeft, child: Forum(list['info'], list['currentStatus'] == 'DIMULAI' || list['currentStatus'] == 'DISELESAIKAN' ? true : false)));

lib/src/layouts/auth/change_code.dart

@@ -127,11 +127,11 @@ class _ChangeCodePageState extends State<ChangeCodePage> {
                               onPressed: (){
                                 if (U.getAccessCode() == null) {
                                   context.router.removeLast();
-                                  context.navigateNamedTo("/qr");
+                                  context.navigateToPath("/qr");
                                 }
                                 else{
                                   context.router.removeLast();
-                                  context.navigateNamedTo('/app/${_encodeAccessCode(U.getAccessCode()!)}');
+                                  context.navigateToPath('/app/${_encodeAccessCode(U.getAccessCode()!)}');
                                 }
                               },
                             ),
@@ -161,21 +161,21 @@ class _ChangeCodePageState extends State<ChangeCodePage> {
                                     if (tkn == null) {
                                       token.logout();
                                       context.router.removeLast();
-                                      context.navigateNamedTo("/app/$rawPid/login");
+                                      context.navigateToPath("/app/$rawPid/login");
                                     } else {
                                       var param = {'token': tkn, 'whiteListToken': false};
                                       var res = await _apiAuthProvider.postData('/api/fcmTokens/remove/', null, param, context);
                                       if (res != null && res['success']) {
                                         token.logout();
                                         context.router.removeLast();
-                                        context.navigateNamedTo("/app/$rawPid/login");
+                                        context.navigateToPath("/app/$rawPid/login");
                                       }
                                     }
                                   }
                                   else{
                                     token.logout();
                                     context.router.removeLast();
-                                    context.navigateNamedTo("/app/$rawPid/login");
+                                    context.navigateToPath("/app/$rawPid/login");
                                   }
                                 } catch(e) {
                                   print(e.toString());
@@ -184,7 +184,7 @@ class _ChangeCodePageState extends State<ChangeCodePage> {
                                   await _sharedPreferencesManager.clearKey(SharedPreferencesManager.version);
                                   token.logout();
                                   context.router.removeLast();
-                                  context.navigateNamedTo("/qr");
+                                  context.navigateToPath("/qr");
                                 }
                               },
                             ),

lib/src/layouts/auth/login.dart

@@ -103,7 +103,7 @@ class _LoginPageState extends State<LoginPage> {
                       ),
                       onTap: (){
                         context.router.removeLast();
-                        context.navigateNamedTo('/qr?new=true');
+                        context.navigateToPath('/qr?new=true');
                       },
                     ),
                   ),
@@ -256,7 +256,7 @@ class _LoginPageState extends State<LoginPage> {
             await U.clearPreferences();
             U.setHidePayload(true);
             context.router.removeLast();
-            context.navigateNamedTo("/app/$pid/menu");
+            context.navigateToPath("/app/$pid/menu");
             return;
           }
         });
@@ -268,7 +268,7 @@ class _LoginPageState extends State<LoginPage> {
         await sharedPreferencesManager.putString(SharedPreferencesManager.keyPendingData, jsonEncode([]));
         U.setHidePayload(true);
         context.router.removeLast();
-        context.navigateNamedTo("/app/$pid/menu");
+        context.navigateToPath("/app/$pid/menu");
       }
     }
   }
@@ -462,7 +462,7 @@ class _ForceChgPassPageState extends State<ForceChgPassPage> {
                             child: U.iconsax('arrow-left', color: Colors.white),
                             onTap: (){
                               context.router.removeLast();
-                              context.navigateNamedTo('/qr?new=true');
+                              context.navigateToPath('/qr?new=true');
                             },
                           ),
                           SizedBox(width: 15),
@@ -477,7 +477,7 @@ class _ForceChgPassPageState extends State<ForceChgPassPage> {
                               ),
                               onTap: (){
                                 context.router.removeLast();
-                                context.navigateNamedTo('/qr?new=true');
+                                context.navigateToPath('/qr?new=true');
                               },
                             ),
                           ),
@@ -571,7 +571,7 @@ class _ForceChgPassPageState extends State<ForceChgPassPage> {
                 // var pid = U.getAccessCode();
                 var pid = U.getPidFromUrl(context.router.currentUrl);
                 context.router.removeLast();
-                context.navigateNamedTo("/app/$pid/menu");
+                context.navigateToPath("/app/$pid/menu");
               }
             }
           } catch(e) {

lib/src/layouts/auth/qr.dart

@@ -74,7 +74,7 @@ class _NewQrPageState extends State<NewQrPage> {
     // }
     // if (_isAccCodeExist! && !kIsWeb && !_scanNew){
     //   context.router.removeLast();
-    //   context.navigateNamedTo("/app/${Uri.encodeComponent(accCode!)}/login");
+    //   context.navigateToPath("/app/${Uri.encodeComponent(accCode!)}/login");
     // }
 
     return Scaffold(
@@ -143,7 +143,7 @@ class _NewQrPageState extends State<NewQrPage> {
                               child: Text('backToLogin'.tr(), style: TextStyle(color: Colors.white, fontSize: 14, decoration: TextDecoration.underline)),
                               onTap: (){
                                 context.router.removeLast();
-                                context.navigateNamedTo("/app/${U.getAccessCode()}/login");
+                                context.navigateToPath("/app/${U.getAccessCode()}/login");
                               },
                             )
                         ) : Container(),
@@ -299,10 +299,10 @@ class _NewQrPageState extends State<NewQrPage> {
 
       if (!pidString.contains('loginme')) {
         context.router.removeLast();
-        context.navigateNamedTo("/app/${Uri.encodeComponent(splitPID[0])}/login");
+        context.navigateToPath("/app/${Uri.encodeComponent(splitPID[0])}/login");
       } else {
         context.router.removeLast();
-        context.navigateNamedTo("/app/${Uri.encodeComponent(splitPID[0])}/loginme"+pidString.split("/loginme").last);
+        context.navigateToPath("/app/${Uri.encodeComponent(splitPID[0])}/loginme"+pidString.split("/loginme").last);
       }
     } catch (e) {
       print(e);

lib/src/layouts/components/auto_login.dart

@@ -71,7 +71,7 @@ class _AutoLoginPageState extends State<AutoLoginPage> {
       redirectToLoginPage = true;
       Future.delayed(Duration.zero, (){
         context.router.removeLast();
-        context.navigateNamedTo("/app/${U.getAccessCode()}");
+        context.navigateToPath("/app/${U.getAccessCode()}");
       });
     }
   }
@@ -132,7 +132,7 @@ class _AutoLoginPageState extends State<AutoLoginPage> {
       // U.clearAccessCode();
       U.clearPreferences().then((value) {
         context.router.removeLast();
-        context.navigateNamedTo('/qr?new=true');
+        context.navigateToPath('/qr?new=true');
       });
     } catch(e) {
       print(e.toString());
@@ -182,7 +182,7 @@ class _AutoLoginPageState extends State<AutoLoginPage> {
                               child: U.iconsax('arrow-left', color: Colors.white),
                               onTap: (){
                                 context.router.removeLast();
-                                context.navigateNamedTo('/qr?new=true');
+                                context.navigateToPath('/qr?new=true');
                               },
                             ),
                             SizedBox(width: 15),
@@ -297,7 +297,7 @@ class _AutoLoginPageState extends State<AutoLoginPage> {
                 U.setHidePayload(true);
                 var pid = U.getAccessCode();
                 context.router.removeLast();
-                context.navigateNamedTo("/app/$pid/menu");
+                context.navigateToPath("/app/$pid/menu");
               }
             }
             else{

lib/src/layouts/components/template.dart

@@ -661,10 +661,10 @@ handlingError(context, type) {
                           var pid = U.getPidFromUrl(context.router.currentUrl);
                           token.logout();
                           context.router.removeLast();
-                          context.navigateNamedTo("/app/$pid/login");
+                          context.navigateToPath("/app/$pid/login");
                           // print(pid);
                           // context.router.removeLast();
-                          // context.navigateNamedTo('/app/$pid/login');
+                          // context.navigateToPath('/app/$pid/login');
                         }
                       },
                     )),

lib/src/layouts/functions/account.dart

@@ -59,7 +59,7 @@ class AccountFunction{
         closeLoading(context);
         token.logout();
         // context.router.removeLast();
-        context.navigateNamedTo("/app/$pid/login");
+        context.navigateToPath("/app/$pid/login");
       } else {
         var param = {'token': tkn, 'whiteListToken': false};
         var res = await apiAuthProvider.postData('/api/fcmTokens/remove/', null, param, context);
@@ -68,7 +68,7 @@ class AccountFunction{
           closeLoading(context);
           token.logout();
           // context.router.removeLast();
-          context.navigateNamedTo("/app/$pid/login");
+          context.navigateToPath("/app/$pid/login");
         }
         else{
           Future.delayed(const Duration(seconds: 5), () => closeLoading(context));
@@ -77,7 +77,7 @@ class AccountFunction{
     } catch(e) {
       print(e.toString());
       // context.router.removeLast();
-      context.navigateNamedTo("/app/$pid/login");
+      context.navigateToPath("/app/$pid/login");
     }
   }
 }

lib/src/layouts/mobile/app_mobile.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
+import 'package:double_back_to_exit/double_back_to_exit.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
@@ -12,6 +13,7 @@ import 'package:telnow_mobile_new/src/injector/injector.dart';
 import 'package:telnow_mobile_new/src/layouts/components/template.dart';
 import 'package:telnow_mobile_new/src/storage/sharedpreferences/shared_preferences_manager.dart';
 import 'package:telnow_mobile_new/src/utils/U.dart';
+import 'package:upgrader/upgrader.dart';
 
 class MobAppPage extends StatefulWidget {
   final Widget child;
@@ -163,7 +165,10 @@ class _MobMenuTemplateState extends State<MobMenuTemplate> {
 
     return Scaffold(
       backgroundColor: backgroundColor,
-      body: widget.child,
+      body: !kIsWeb?DoubleBackToExit(
+        snackBarMessage: 'pressAgain'.tr(),
+        child: widget.child,
+      ):widget.child,
       bottomNavigationBar: BottomNavigationBar(
         backgroundColor: Colors.white,
         selectedItemColor: textColor,
@@ -175,15 +180,15 @@ class _MobMenuTemplateState extends State<MobMenuTemplate> {
             switch (value) {
               case 0:
                 context.router.removeLast();
-                  context.navigateNamedTo("/app/$pid/menu/home");
+                  context.navigateToPath("/app/$pid/menu/home");
                 break;
               case 1:
                 context.router.removeLast();
-                  context.navigateNamedTo("/app/$pid/menu/history");
+                  context.navigateToPath("/app/$pid/menu/history");
                 break;
               default:
                 context.router.removeLast();
-                  context.navigateNamedTo("/app/$pid/menu/account");
+                  context.navigateToPath("/app/$pid/menu/account");
                 break;
             }
           }

lib/src/layouts/web/menu_account.dart

@@ -86,7 +86,7 @@ class _WebAccountPageState extends State<WebAccountPage> {
                   onTap: (){
                     var pid = U.getPidFromUrl(context.router.currentUrl);
                     context.router.removeLast();
-                    context.navigateNamedTo("/app/$pid/menu");
+                    context.navigateToPath("/app/$pid/menu");
                   },
                 )
               ],

lib/src/layouts/web/menu_history.dart

@@ -84,7 +84,7 @@ class _WebHistoryPageState extends State<WebHistoryPage> with TickerProviderStat
                   onTap: (){
                     var pid = U.getPidFromUrl(context.router.currentUrl);
                     context.router.removeLast();
-                    context.navigateNamedTo("/app/$pid/menu");
+                    context.navigateToPath("/app/$pid/menu");
                   },
                 )
               ],

lib/src/layouts/web/menu_home.dart

@@ -121,7 +121,7 @@ class _WebHomePageState extends State<WebHomePage> {
                             onTap: (){
                               var pid = U.getPidFromUrl(context.router.currentUrl);
                               context.router.removeLast();
-                              context.navigateNamedTo("/app/$pid/menu/history");
+                              context.navigateToPath("/app/$pid/menu/history");
                             },
                           ),
                           SizedBox(width: 10),
@@ -134,7 +134,7 @@ class _WebHomePageState extends State<WebHomePage> {
                             onTap: (){
                               var pid = U.getPidFromUrl(context.router.currentUrl);
                               context.router.removeLast();
-                              context.navigateNamedTo("/app/$pid/menu/account");
+                              context.navigateToPath("/app/$pid/menu/account");
                             },
                           )
                         ],

pubspec.lock

@@ -77,18 +77,18 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "1d1bd908a1fec327719326d5d0791edd37f16caff6493c01003689fb03315ad7"
+      sha256: "89bc5d17d8c575399891194b8cd02b39f52a8512c730052f17ebe443cdcb9109"
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.0+1"
+    version: "10.0.1"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: c2e359d8932986d4d1bcad7a428143f81384ce10fef8d4aa5bc29e1f83766a46
+      sha256: "8e622d26dc6be4bf496d47969e3e9ba555c3abcf2290da6abfa43cbd4f57fa52"
       url: "https://pub.dev"
     source: hosted
-    version: "9.3.1"
+    version: "10.0.1"
   badges:
     dependency: "direct main"
     description:
@@ -433,14 +433,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.3"
-  double_back_to_close_app:
+  double_back_to_exit:
     dependency: "direct main"
     description:
-      name: double_back_to_close_app
-      sha256: d19ce4e2f8d2cb9f35bdbc90eecd5c731cc0e6216f5e8f14e7d1e076dafb344a
+      name: double_back_to_exit
+      sha256: d1edd8b37b2df022661c3bfc00db3f05f1e70833789461055c86b8b1c2c65766
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "1.2.1"
   drag_and_drop_lists:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -43,7 +43,7 @@ dependencies:
   shared_preferences: ^2.4.0
   flutter_local_notifications: ^18.0.1
   get_it: ^8.0.3
-  double_back_to_close_app: ^2.1.0
+  double_back_to_exit: ^1.2.1
   page_transition: ^2.2.1
   badges: ^3.1.2
   shimmer: ^3.0.0
@@ -68,7 +68,7 @@ dependencies:
   app_settings: ^5.1.1
   translator: ^1.0.3+1
   lottie: ^3.3.1
-  auto_route: ^9.3.0+1
+  auto_route: ^10.0.1
   permission_handler: ^11.3.1
   quick_notify_2: ^0.3.0-dev.0
   timelines_plus: ^1.0.6
@@ -104,7 +104,7 @@ dev_dependencies:
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
   flutter_lints: ^5.0.0
-  auto_route_generator: ^9.3.1
+  auto_route_generator: ^10.0.1
   build_runner: ^2.4.14
 
 # For information on the generic Dart part of this file, see the