Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch

# Conflicts:
#	src/.dart_tool/package_config.json
#	src/.dart_tool/package_config_subset
#	src/.flutter-plugins
#	src/.flutter-plugins-dependencies
#	src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
#	src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
#	src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
#	src/build/app/intermediates/flutter/debug/flutter_build.d
#	src/build/app/intermediates/flutter/debug/libs.jar
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4=
#	src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/build/app/intermediates/source_set_path_map/debug/file-map.txt
#	src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
#	src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
#	src/build/app/outputs/apk/debug/app-debug.apk
#	src/build/app/outputs/flutter-apk/app-debug.apk
#	src/build/app/outputs/flutter-apk/app-debug.apk.sha1
#	src/build/app/outputs/logs/manifest-merger-debug-report.txt
#	src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
#	src/build/sqflite/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	src/build/sqflite/intermediates/incremental/debug/packageDebugResources/merger.xml
#	src/build/sqflite/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/build/sqflite/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/build/sqflite/intermediates/incremental/packageDebugAssets/merger.xml
#	src/build/sqflite/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/build/sqflite/outputs/logs/manifest-merger-debug-report.txt
#	src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
HanJiaHui_Branch
嘉辉 JIA HUI 2 years ago
commit 8496eeb78c

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\travelguideProject\\src\\assets\\0.png D:\\travelguideProject\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\travelguideProject\\src\\assets\\service2.png C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter\\flutter\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter\\flutter\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter\\flutter\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter\\flutter\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD664661712

@ -0,0 +1 @@
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
["D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

@ -105,13 +105,21 @@
},
{
"name": "sqflite",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "sqflite_common",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
"packageUri": "lib/",
"languageVersion": "3.0"
},
@ -139,6 +147,12 @@
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "synchronized",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "term_glyph",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
@ -170,7 +184,11 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
"generated": "2023-10-17T13:12:11.527001Z",
=======
"generated": "2023-10-17T14:06:28.851103Z",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
"generator": "pub",
"generatorVersion": "3.1.1"
}

@ -52,6 +52,7 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
source_span
2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
sqflite
@ -62,6 +63,18 @@ sqflite_common
3.0
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
sqflite
3.0
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib/
sqflite_common
3.0
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
stack_trace
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
@ -72,12 +85,21 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
string_scanner
2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
synchronized
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
synchronized
2.18
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
term_glyph
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/

@ -1,2 +1,6 @@
# This is a generated file; do not edit or check into version control.
<<<<<<< HEAD
sqflite=C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
=======
sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1 +1,5 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"}
<<<<<<< HEAD
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"}
=======
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 22:31:12.840798","version":"3.13.3"}
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -25,5 +25,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Flutter for Android" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

@ -1 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

@ -0,0 +1 @@
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

@ -1 +1 @@
assets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/Collection_Preview.jpg  assets/Collection_Preview.jpg  assets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  asset assets/Collection_Preview.jpg  assetassets/Museum_Preview.jpassets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf

@ -1 +1 @@
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

@ -1 +1 @@
assets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/Collection_Preview.jpg  assets/Collection_Preview.jpg  assets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  asset assets/Collection_Preview.jpg  assetassets/Museum_Preview.jpassets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf

@ -1 +1 @@
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

File diff suppressed because one or more lines are too long

@ -1,3 +1,4 @@
<<<<<<< HEAD
#Tue Oct 17 20:13:55 CST 2023
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/mipmap-xxhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
@ -6,3 +7,13 @@ com.example.travelguide.app-main-5\:/drawable-v21/launch_background.xml=D\:\\tra
com.example.travelguide.app-main-5\:/mipmap-xhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/drawable/launch_background.xml=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable_launch_background.xml.flat
com.example.travelguide.app-main-5\:/mipmap-hdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat
=======
#Tue Oct 17 22:07:14 CST 2023
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/mipmap-xxhdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/mipmap-mdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/drawable-v21/launch_background.xml=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable-v21_launch_background.xml.flat
com.example.travelguide.app-main-5\:/mipmap-xhdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/drawable/launch_background.xml=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable_launch_background.xml.flat
com.example.travelguide.app-main-5\:/mipmap-hdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -139,7 +139,11 @@
<attr name="splitMinWidth"/>
<attr name="splitMinSmallestWidth"/>
<attr name="splitLayoutDirection"/>
<<<<<<< HEAD
</declare-styleable></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidx.window:window-java:1.0.0-beta04$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidx.window:window-java:1.0.0-beta04" from-dependency="true" generated-set="androidx.window:window-java:1.0.0-beta04$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"><file path="C:\Users\86131\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res\values\values.xml" qualifiers=""/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\res"/><source path="D:\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\app\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\res"><file name="launch_background" path="D:\travelguideProject\src\android\app\src\main\res\drawable\launch_background.xml" qualifiers="" type="drawable"/><file name="launch_background" path="D:\travelguideProject\src\android\app\src\main\res\drawable-v21\launch_background.xml" qualifiers="v21" type="drawable"/><file name="ic_launcher" path="D:\travelguideProject\src\android\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\src\android\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\src\android\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\src\android\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\src\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="D:\travelguideProject\src\android\app\src\main\res\values\styles.xml" qualifiers=""><style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
=======
</declare-styleable></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidx.window:window-java:1.0.0-beta04$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidx.window:window-java:1.0.0-beta04" from-dependency="true" generated-set="androidx.window:window-java:1.0.0-beta04$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"><file path="E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res\values\values.xml" qualifiers=""/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config=":sqflite$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\build\sqflite\intermediates\packaged_res\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config=":sqflite" from-dependency="true" generated-set=":sqflite$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\build\sqflite\intermediates\packaged_res\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\main\res"/><source path="E:\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="E:\travelguideProject\src\build\app\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\main\res"><file name="launch_background" path="E:\travelguideProject\src\android\app\src\main\res\drawable\launch_background.xml" qualifiers="" type="drawable"/><file name="launch_background" path="E:\travelguideProject\src\android\app\src\main\res\drawable-v21\launch_background.xml" qualifiers="v21" type="drawable"/><file name="ic_launcher" path="E:\travelguideProject\src\android\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="E:\travelguideProject\src\android\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="E:\travelguideProject\src\android\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="E:\travelguideProject\src\android\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="E:\travelguideProject\src\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="E:\travelguideProject\src\android\app\src\main\res\values\styles.xml" qualifiers=""><style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
<item name="android:windowBackground">@drawable/launch_background</item>
</style><style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
<<<<<<< HEAD
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
=======
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\main\assets"/><source path="E:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,4 +1,9 @@
<<<<<<< HEAD
#Tue Oct 17 23:35:51 CST 2023
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Tue Oct 17 22:31:18 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
renamed.0=classes.dex
path.0=classes.dex

@ -1,3 +1,4 @@
<<<<<<< HEAD
com.example.travelguide.app-jetified-window-1.0.0-beta04-0 C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\res
com.example.travelguide.app-jetified-annotation-experimental-1.1.0-1 C:\Users\86131\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\res
com.example.travelguide.app-core-1.6.0-2 C:\Users\86131\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\res
@ -10,3 +11,18 @@ com.example.travelguide.app-rs-8 D:\travelguideProject\src\build\app\generated\r
com.example.travelguide.app-mergeDebugResources-9 D:\travelguideProject\src\build\app\intermediates\incremental\debug\mergeDebugResources\merged.dir
com.example.travelguide.app-mergeDebugResources-10 D:\travelguideProject\src\build\app\intermediates\incremental\debug\mergeDebugResources\stripped.dir
com.example.travelguide.app-merged_res-11 D:\travelguideProject\src\build\app\intermediates\merged_res\debug
=======
com.example.travelguide.app-jetified-window-1.0.0-beta04-0 E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\res
com.example.travelguide.app-jetified-annotation-experimental-1.1.0-1 E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\res
com.example.travelguide.app-core-1.6.0-2 E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\res
com.example.travelguide.app-jetified-window-java-1.0.0-beta04-3 E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res
com.example.travelguide.app-debug-4 E:\travelguideProject\src\android\app\src\debug\res
com.example.travelguide.app-main-5 E:\travelguideProject\src\android\app\src\main\res
com.example.travelguide.app-pngs-6 E:\travelguideProject\src\build\app\generated\res\pngs\debug
com.example.travelguide.app-resValues-7 E:\travelguideProject\src\build\app\generated\res\resValues\debug
com.example.travelguide.app-rs-8 E:\travelguideProject\src\build\app\generated\res\rs\debug
com.example.travelguide.app-mergeDebugResources-9 E:\travelguideProject\src\build\app\intermediates\incremental\debug\mergeDebugResources\merged.dir
com.example.travelguide.app-mergeDebugResources-10 E:\travelguideProject\src\build\app\intermediates\incremental\debug\mergeDebugResources\stripped.dir
com.example.travelguide.app-merged_res-11 E:\travelguideProject\src\build\app\intermediates\merged_res\debug
com.example.travelguide.app-packaged_res-12 E:\travelguideProject\src\build\sqflite\intermediates\packaged_res\debug
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1 +1,5 @@
06b7c1eab2cea4589a82eebf1f44dc090fa07bc6
<<<<<<< HEAD
06b7c1eab2cea4589a82eebf1f44dc090fa07bc6
=======
666db81d039cfbd914dc7f8faae99a319f36c9b7
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -12,6 +12,7 @@ MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\86
android:name
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
manifest
<<<<<<< HEAD
ADDED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
@ -38,6 +39,34 @@ MERGED from [androidx.annotation:annotation-experimental:1.1.0] C:\Users\86131\.
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
=======
ADDED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from [:sqflite] E:\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-9:12
MERGED from [androidx.window:window-java:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\AndroidManifest.xml:17:1-23:12
MERGED from [androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:17:1-33:12
MERGED from [androidx.fragment:fragment:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\75f94412898c7559d34d7edbbeaeb394\transformed\fragment-1.1.0\AndroidManifest.xml:17:1-24:12
MERGED from [androidx.viewpager:viewpager:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\83543b509ea72d197642ff197da2edd7\transformed\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.loader:loader:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ff65482bd388a984f10ca7f5c3c41d0d\transformed\loader-1.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.activity:activity:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\eb85f6cd47cafc1c47da2a37336a0e33\transformed\jetified-activity-1.0.0\AndroidManifest.xml:17:1-24:12
MERGED from [androidx.customview:customview:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\1d2f11a7d5de7a531a69c65e1d8a2026\transformed\customview-1.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.core:core:1.6.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:17:1-26:12
MERGED from [androidx.lifecycle:lifecycle-runtime:2.2.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\793c4fa41fed024d54f0246b25b34906\transformed\lifecycle-runtime-2.2.0\AndroidManifest.xml:17:1-24:12
MERGED from [androidx.savedstate:savedstate:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\61969234c20435b339c4ea8c72dc0f22\transformed\jetified-savedstate-1.0.0\AndroidManifest.xml:17:1-24:12
MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7fcad9088319f1ebd7850d62df4bcaf7\transformed\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\c9c1416cfdc16237773b18cd0425609e\transformed\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.tracing:tracing:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\cda2a1ca4d3bd6aae60d8d586ec4f3ff\transformed\jetified-tracing-1.0.0\AndroidManifest.xml:17:1-24:12
MERGED from [androidx.arch.core:core-runtime:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\76f856ea98086720a3c1fffee80b523a\transformed\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\47ecd4e588b99ef3b772f04d5aa6c9b7\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:17:1-27:12
MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\03b9b3b952540ee8cedf6c096276d934\transformed\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.annotation:annotation-experimental:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:17:1-24:12
INJECTED from E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
package
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
@ -53,6 +82,7 @@ INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xm
xmlns:android
ADDED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:11-69
uses-sdk
<<<<<<< HEAD
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
@ -94,6 +124,49 @@ MERGED from [androidx.annotation:annotation-experimental:1.1.0] C:\Users\86131\.
MERGED from [androidx.annotation:annotation-experimental:1.1.0] C:\Users\86131\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:20:5-22:41
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
=======
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from E:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
MERGED from [:sqflite] E:\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
MERGED from [:sqflite] E:\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
MERGED from [androidx.window:window-java:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\AndroidManifest.xml:19:5-21:41
MERGED from [androidx.window:window-java:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\AndroidManifest.xml:19:5-21:41
MERGED from [androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.fragment:fragment:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\75f94412898c7559d34d7edbbeaeb394\transformed\fragment-1.1.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.fragment:fragment:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\75f94412898c7559d34d7edbbeaeb394\transformed\fragment-1.1.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.viewpager:viewpager:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\83543b509ea72d197642ff197da2edd7\transformed\viewpager-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.viewpager:viewpager:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\83543b509ea72d197642ff197da2edd7\transformed\viewpager-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.loader:loader:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ff65482bd388a984f10ca7f5c3c41d0d\transformed\loader-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.loader:loader:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\ff65482bd388a984f10ca7f5c3c41d0d\transformed\loader-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.activity:activity:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\eb85f6cd47cafc1c47da2a37336a0e33\transformed\jetified-activity-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.activity:activity:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\eb85f6cd47cafc1c47da2a37336a0e33\transformed\jetified-activity-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.customview:customview:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\1d2f11a7d5de7a531a69c65e1d8a2026\transformed\customview-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.customview:customview:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\1d2f11a7d5de7a531a69c65e1d8a2026\transformed\customview-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.core:core:1.6.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.core:core:1.6.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.lifecycle:lifecycle-runtime:2.2.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\793c4fa41fed024d54f0246b25b34906\transformed\lifecycle-runtime-2.2.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.lifecycle:lifecycle-runtime:2.2.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\793c4fa41fed024d54f0246b25b34906\transformed\lifecycle-runtime-2.2.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.savedstate:savedstate:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\61969234c20435b339c4ea8c72dc0f22\transformed\jetified-savedstate-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.savedstate:savedstate:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\61969234c20435b339c4ea8c72dc0f22\transformed\jetified-savedstate-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7fcad9088319f1ebd7850d62df4bcaf7\transformed\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7fcad9088319f1ebd7850d62df4bcaf7\transformed\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\c9c1416cfdc16237773b18cd0425609e\transformed\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\c9c1416cfdc16237773b18cd0425609e\transformed\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.tracing:tracing:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\cda2a1ca4d3bd6aae60d8d586ec4f3ff\transformed\jetified-tracing-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.tracing:tracing:1.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\cda2a1ca4d3bd6aae60d8d586ec4f3ff\transformed\jetified-tracing-1.0.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.arch.core:core-runtime:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\76f856ea98086720a3c1fffee80b523a\transformed\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.arch.core:core-runtime:2.0.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\76f856ea98086720a3c1fffee80b523a\transformed\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\47ecd4e588b99ef3b772f04d5aa6c9b7\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\47ecd4e588b99ef3b772f04d5aa6c9b7\transformed\versionedparcelable-1.1.1\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\03b9b3b952540ee8cedf6c096276d934\transformed\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\03b9b3b952540ee8cedf6c096276d934\transformed\lifecycle-viewmodel-2.1.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.annotation:annotation-experimental:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.annotation:annotation-experimental:1.1.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:20:5-22:41
INJECTED from E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
android:targetSdkVersion
INJECTED from D:\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml

@ -1 +1,5 @@
<<<<<<< HEAD
#Tue Oct 17 21:25:06 CST 2023
=======
#Tue Oct 17 22:07:13 CST 2023
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
<<<<<<< HEAD
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
=======
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,2 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="E:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -4,8 +4,14 @@
4
5 <uses-sdk
6 android:minSdkVersion="16"
<<<<<<< HEAD
6-->C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
7 android:targetSdkVersion="16" />
7-->C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
=======
6-->C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
7 android:targetSdkVersion="16" />
7-->C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
8
9</manifest>

@ -1,5 +1,6 @@
-- Merging decision tree log ---
manifest
<<<<<<< HEAD
ADDED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
INJECTED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
INJECTED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
@ -23,3 +24,28 @@ INJECTED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.
INJECTED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
ADDED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
=======
ADDED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:1-3:12
package
ADDED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:2:5-35
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
ADDED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
ADDED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
INJECTED from C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\AndroidManifest.xml
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c

@ -1,28 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'collection1.dart';
import 'collection2.dart';
import 'collection3.dart';
import 'collection4.dart';
import 'collection0.dart';
class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
initialRoute: '/', //
routes: {
'/': (context) => CollectionListPage(), //
'/targetPage0': (context) => collection0(), // 11
'/targetPage1': (context) => collection1(), // 11
'/targetPage2': (context) => collection2(), // 22
'/targetPage3': (context) => collection3(),
'/targetPage4': (context) => collection4(),
//
},
);
}
}
class CollectionListPage extends StatefulWidget {
@override
@ -45,7 +21,7 @@ class _CollectionListPageState extends State<CollectionListPage> {
setState(() {
filteredItems = items
.where((item) =>
item.toLowerCase().contains(_searchController.text.toLowerCase()))
item.toLowerCase().contains(_searchController.text.toLowerCase()))
.toList();
});
}
@ -74,14 +50,14 @@ class _CollectionListPageState extends State<CollectionListPage> {
hintText: '输入搜索词',
prefixIcon: Icon(
Icons.search,
color: Colors.green, //
color: Colors.green,
),
labelStyle: TextStyle(
color: Colors.green, //
color: Colors.green,
),
focusedBorder: UnderlineInputBorder(
borderSide:
BorderSide(color: Colors.green), // 线绿
borderSide: BorderSide(
color: Colors.green),
),
),
),
@ -92,16 +68,17 @@ class _CollectionListPageState extends State<CollectionListPage> {
),
SliverList(
delegate: SliverChildBuilderDelegate(
(BuildContext context, int index) {
(BuildContext context, int index) {
return InkWell(
onTap: () {
Navigator.pushNamed(
context, '/targetPage$index'); // 1
//
print('点击了列表项 $index');
context, '/targetPage$index');
},
child: ListTile(
title: Text(filteredItems[index]),
title: Text(
filteredItems[index],
style: TextStyle(fontSize: 18),
),
),
);
},

@ -0,0 +1,45 @@
import 'package:flutter/material.dart';
class MapPage extends StatelessWidget {
const MapPage({Key? key});
//
Widget _buildImage(String imagePath, double height, double verticalOffset) {
return Center( //
child: SizedBox(
height: height, // 使
child: Transform.translate(
offset: Offset(0, verticalOffset), // 使
child: Transform.scale(
scale: 0.9,
child: Image.asset(
imagePath,
),
),
),
),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('地图'),
backgroundColor: Colors.green,
),
body: SingleChildScrollView(
child: Column(
children: [
_buildImage('assets/1F.png', 200, 10), //
_buildImage('assets/2F.png', 200, 15),
_buildImage('assets/3F.png', 200, 15),
_buildImage('assets/4F.png', 200, 15),
_buildImage('assets/5F.png', 200, 15),
SizedBox(height: 100), //
],
),
),
);
}
}

@ -1,8 +1,13 @@
import 'package:flutter/material.dart';
import 'CollectionListPage.dart';
import 'MapPage.dart';
import 'MuseumInfoExtendPage.dart';
import 'ServicePage.dart';
<<<<<<< HEAD
import 'LoginPage.dart';
=======
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
void main() {
runApp(MaterialApp(
home: MuseumInfoPage(),
@ -104,6 +109,13 @@ class _MuseumInfoPageState extends State<MuseumInfoPage> {
),
);
}),
_buildCustomButton('地图', 45, 40, () {
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => MapPage(),
),
);
}),
],
),
);

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:travelguide/travelguideapp/ui/pages/service1.dart';
import 'service1.dart';
import 'service0.dart';
import 'service2.dart';
import 'service3.dart';
class ServicePage extends StatelessWidget {
const ServicePage({super.key});
//
@ -93,4 +93,4 @@ class ServicePage extends StatelessWidget {
),
);
}
}
}

@ -6,14 +6,28 @@ class collection0 extends StatelessWidget {
return Scaffold(
appBar: AppBar(
title: Text('西周 太保鼎'),
backgroundColor: Colors.green
backgroundColor: Colors.green,
),
body: Center(
child: Text(
'西周公元前1046-前771\n'
'通高57.6厘米 口长35.8厘米 宽22.8厘米\n'
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'西周公元前1046-前771\n'
'通高57.6厘米 口长35.8厘米 宽22.8厘米\n',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18, //
),
),
Image.asset(
'assets/collection0.png',
width: 200,
height: 200,
),
],
),
),
);
}
}
}

@ -6,12 +6,29 @@ class collection1 extends StatelessWidget {
return Scaffold(
appBar: AppBar(
title: Text('几何纹豆'),
backgroundColor: Colors.green
backgroundColor: Colors.green,
),
body: Center(
child: Text( '战国 二级\n'
'口径17.4厘米 高18.9厘米 器高12.7厘米 盖高7.9厘米\n'),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'战国 二级\n'
'口径17.4厘米 高18.9厘米 \n'
'器高12.7厘米 盖高7.9厘米\n',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18, //
),
),
Image.asset(
'assets/collection1.png',
width: 200,
height: 200,
),
],
),
),
);
}
}
}

@ -6,12 +6,28 @@ class collection2 extends StatelessWidget {
return Scaffold(
appBar: AppBar(
title: Text('蟠虺纹钟'),
backgroundColor: Colors.green
backgroundColor: Colors.green,
),
body: Center(
child: Text( '春秋 二级\n'
'通高48.4厘米 口横26厘米\n'),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'春秋 二级\n'
'通高48.4厘米 口横26厘米\n',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18, //
),
),
Image.asset(
'assets/collection2.png',
width: 200,
height: 200,
),
],
),
),
);
}
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save