ZhuQingRui_Branch
朱卿睿 2 years ago
parent 5c648e947f
commit 52fbfd2cd2

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":["D:\\project\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
{"inputs":["D:\\project\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\project\\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 @@
["D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
["D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\project\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

@ -170,7 +170,7 @@
"languageVersion": "3.1"
}
],
"generated": "2023-10-17T13:09:11.782840Z",
"generated": "2023-11-07T13:29:35.426886Z",
"generator": "pub",
"generatorVersion": "3.1.3"
}

@ -108,6 +108,6 @@ file:///D:/flutter/flutter/flutter/packages/flutter_test/
file:///D:/flutter/flutter/flutter/packages/flutter_test/lib/
travelguide
3.1
file:///D:/travelguideProject/travelguideProject/src/
file:///D:/travelguideProject/travelguideProject/src/lib/
file:///D:/project/travelguideProject/src/
file:///D:/project/travelguideProject/src/lib/
2

@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\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 21:09:11.888569","version":"3.13.7"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\Administrator\\\\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-11-07 21:32:35.735318","version":"3.13.7"}

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="FrameworkDetectionExcludesConfiguration">
<type id="android" />

@ -2,8 +2,14 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>

@ -9,7 +9,39 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="9033771e-f64a-4ad5-9600-b5eee3480140" name="Changes" comment="Changes" />
<list default="true" id="9033771e-f64a-4ad5-9600-b5eee3480140" name="Changes" comment="Changes">
<change beforePath="$PROJECT_DIR$/.dart_tool/dartpad/web_plugin_registrant.dart" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/dartpad/web_plugin_registrant.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/flutter_build/dart_plugin_registrant.dart" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/flutter_build/dart_plugin_registrant.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/package_config.json" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/package_config.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.dart_tool/package_config_subset" beforeDir="false" afterPath="$PROJECT_DIR$/.dart_tool/package_config_subset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.flutter-plugins" beforeDir="false" afterPath="$PROJECT_DIR$/.flutter-plugins" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.flutter-plugins-dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/.flutter-plugins-dependencies" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/src.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/src.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/checksums/checksums.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.5/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/android/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/android/local.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/3ab92844fab25e9eaf2afc8234c11382/gen_dart_plugin_registrant.stamp" beforeDir="false" afterPath="$PROJECT_DIR$/build/3ab92844fab25e9eaf2afc8234c11382/gen_dart_plugin_registrant.stamp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/app/tmp/kotlin-classes/debug/com/example/travelguide/MainActivity.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ios/Runner/GeneratedPluginRegistrant.m" beforeDir="false" afterPath="$PROJECT_DIR$/ios/Runner/GeneratedPluginRegistrant.m" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linux/flutter/generated_plugin_registrant.cc" beforeDir="false" afterPath="$PROJECT_DIR$/linux/flutter/generated_plugin_registrant.cc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linux/flutter/generated_plugin_registrant.h" beforeDir="false" afterPath="$PROJECT_DIR$/linux/flutter/generated_plugin_registrant.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/linux/flutter/generated_plugins.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/linux/flutter/generated_plugins.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/macos/Flutter/GeneratedPluginRegistrant.swift" beforeDir="false" afterPath="$PROJECT_DIR$/macos/Flutter/GeneratedPluginRegistrant.swift" afterDir="false" />
<change beforePath="$PROJECT_DIR$/windows/flutter/generated_plugin_registrant.cc" beforeDir="false" afterPath="$PROJECT_DIR$/windows/flutter/generated_plugin_registrant.cc" afterDir="false" />
<change beforePath="$PROJECT_DIR$/windows/flutter/generated_plugin_registrant.h" beforeDir="false" afterPath="$PROJECT_DIR$/windows/flutter/generated_plugin_registrant.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/windows/flutter/generated_plugins.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/windows/flutter/generated_plugins.cmake" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -65,23 +97,29 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
"git-widget-placeholder": "ZhuQingRui__Branch",
"io.flutter.reload.alreadyRun": "true",
"last_opened_file_path": "D:/travelguideProject/src",
"project.structure.last.edited": "SDK",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "dart.settings",
"show.migrate.to.gradle.popup": "false"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;cidr.known.project.marker&quot;: &quot;true&quot;,
&quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
&quot;git-widget-placeholder&quot;: &quot;ZhuQingRui__Branch&quot;,
&quot;io.flutter.reload.alreadyRun&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/project/travelguideProject/src&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;project.structure.last.edited&quot;: &quot;SDK&quot;,
&quot;project.structure.proportion&quot;: &quot;0.0&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.ide.settings.new.ui&quot;,
&quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
}</component>
<component name="RunManager">
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
<module name="travelguide" />
@ -141,9 +179,14 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1697098226870</updated>
<workItem from="1699363582261" duration="322000" />
<workItem from="1699363913384" duration="119000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
@ -167,4 +210,8 @@
</map>
</option>
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component>
</project>

@ -15,5 +15,10 @@ import io.flutter.embedding.engine.FlutterEngine;
public final class GeneratedPluginRegistrant {
private static final String TAG = "GeneratedPluginRegistrant";
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
try {
flutterEngine.getPlugins().add(new com.tekartik.sqflite.SqflitePlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin sqflite, com.tekartik.sqflite.SqflitePlugin", e);
}
}
}

@ -1,4 +1,4 @@
sdk.dir=C:/Users/Administrator/AppData/Local/Android/Sdk
sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk
flutter.sdk=D:\\flutter\\flutter\\flutter
flutter.buildMode=debug
flutter.versionName=1.0.0

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

@ -1 +1,2 @@
 assets/0.png  asset assets/0.pngassets/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/0.png  asset assets/0.png assets/1.png  asset assets/1.png assets/2.png  asset assets/2.png assets/3.png  asset assets/3.png assets/4.png  asset assets/4.pngassets/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

@ -1 +1 @@
{"assets/0.png":["assets/0.png"],"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/0.png":["assets/0.png"],"assets/1.png":["assets/1.png"],"assets/2.png":["assets/2.png"],"assets/3.png":["assets/3.png"],"assets/4.png":["assets/4.png"],"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"]}

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 @@
ca3e20c31dcccca7250a38f66baab940
858a0db317072a4c537373bcbbb4d110

@ -1 +1,2 @@
 assets/0.png  asset assets/0.pngassets/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/0.png  asset assets/0.png assets/1.png  asset assets/1.png assets/2.png  asset assets/2.png assets/3.png  asset assets/3.png assets/4.png  asset assets/4.pngassets/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

@ -1 +1 @@
{"assets/0.png":["assets/0.png"],"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/0.png":["assets/0.png"],"assets/1.png":["assets/1.png"],"assets/2.png":["assets/2.png"],"assets/3.png":["assets/3.png"],"assets/4.png":["assets/4.png"],"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"]}

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,8 +1,8 @@
#Tue Oct 17 19:04:02 CST 2023
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\travelguideProject\\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\\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=D\:\\travelguideProject\\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=D\:\\travelguideProject\\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=D\:\\travelguideProject\\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\\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\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat
#Tue Nov 07 21:33:07 CST 2023
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\project\\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\:\\project\\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=D\:\\project\\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=D\:\\project\\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=D\:\\project\\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\:\\project\\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\:\\project\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat

@ -139,17 +139,17 @@
<attr name="splitMinWidth"/>
<attr name="splitMinSmallestWidth"/>
<attr name="splitLayoutDirection"/>
</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\Administrator\.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\Administrator\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"><file path="C:\Users\Administrator\.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\travelguideProject\src\android\app\src\main\res"/><source path="D:\travelguideProject\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="D:\travelguideProject\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\travelguideProject\src\android\app\src\main\res"><file name="launch_background" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\drawable\launch_background.xml" qualifiers="" type="drawable"/><file name="launch_background" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\drawable-v21\launch_background.xml" qualifiers="v21" type="drawable"/><file name="ic_launcher" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="D:\travelguideProject\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="C:\Users\Administrator\.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\Administrator\.gradle\caches\transforms-3\ae81e06d24c799147c26814497a2a305\transformed\jetified-window-java-1.0.0-beta04\res"><file path="C:\Users\Administrator\.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="D:\project\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="D:\project\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="D:\project\travelguideProject\src\android\app\src\main\res"/><source path="D:\project\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="D:\project\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:\project\travelguideProject\src\android\app\src\main\res"><file name="launch_background" path="D:\project\travelguideProject\src\android\app\src\main\res\drawable\launch_background.xml" qualifiers="" type="drawable"/><file name="launch_background" path="D:\project\travelguideProject\src\android\app\src\main\res\drawable-v21\launch_background.xml" qualifiers="v21" type="drawable"/><file name="ic_launcher" path="D:\project\travelguideProject\src\android\app\src\main\res\mipmap-hdpi\ic_launcher.png" qualifiers="hdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\project\travelguideProject\src\android\app\src\main\res\mipmap-mdpi\ic_launcher.png" qualifiers="mdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\project\travelguideProject\src\android\app\src\main\res\mipmap-xhdpi\ic_launcher.png" qualifiers="xhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\project\travelguideProject\src\android\app\src\main\res\mipmap-xxhdpi\ic_launcher.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="ic_launcher" path="D:\project\travelguideProject\src\android\app\src\main\res\mipmap-xxxhdpi\ic_launcher.png" qualifiers="xxxhdpi-v4" type="mipmap"/><file path="D:\project\travelguideProject\src\android\app\src\main\res\values\styles.xml" qualifiers=""><style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">@drawable/launch_background</item>
</style><style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style></file><file path="D:\travelguideProject\travelguideProject\src\android\app\src\main\res\values-night\styles.xml" qualifiers="night-v8"><style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
</style></file><file path="D:\project\travelguideProject\src\android\app\src\main\res\values-night\styles.xml" qualifiers="night-v8"><style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">@drawable/launch_background</item>
</style><style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style></file></source><source path="D:\travelguideProject\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="D:\travelguideProject\travelguideProject\src\build\app\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="D:\travelguideProject\travelguideProject\src\android\app\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="D:\travelguideProject\travelguideProject\src\android\app\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><configuration qualifiers=""><declare-styleable name="FontFamilyFont">
</style></file></source><source path="D:\project\travelguideProject\src\build\app\generated\res\rs\debug"/><source path="D:\project\travelguideProject\src\build\app\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="D:\project\travelguideProject\src\android\app\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="D:\project\travelguideProject\src\android\app\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><configuration qualifiers=""><declare-styleable name="FontFamilyFont">
<attr name="fontStyle">
<enum name="normal" value="0"/>

@ -1,2 +1,2 @@
<?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\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\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\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\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="D:\project\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:\project\travelguideProject\src\android\app\src\main\assets"/><source path="D:\project\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:\project\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>

@ -1,4 +1,4 @@
#Tue Oct 17 21:09:18 CST 2023
base.0=D\:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
#Tue Nov 07 21:33:23 CST 2023
base.0=D\:\\project\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex

@ -13,8 +13,8 @@
13 to allow setting breakpoints, to provide hot reload, etc.
14 -->
15 <uses-permission android:name="android.permission.INTERNET" />
15-->D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
15-->D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
16
17 <application
18 android:name="android.app.Application"

@ -423,25 +423,6 @@
{
"outputFile": "com.example.travelguide.app-merged_res-11:/values_values.arsc.flat",
"map": [
{
"source": "D:\\travelguideProject\\travelguideProject\\src\\android\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",
"startOffsets": "176,832",
"endLines": "7,16",
"endColumns": "12,12",
"endOffsets": "483,998"
},
"to": {
"startLines": "93,97",
"startColumns": "4,4",
"startOffsets": "5462,5643",
"endLines": "96,99",
"endColumns": "12,12",
"endOffsets": "5638,5807"
}
},
{
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values\\values.xml",
"from": {
@ -479,6 +460,25 @@
"endColumns": "11,59,51,44,59,24,24,24,24,24",
"endOffsets": "289,349,401,446,4387,6899,7030,10987,11427,11736"
}
},
{
"source": "D:\\project\\travelguideProject\\src\\android\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",
"startOffsets": "176,832",
"endLines": "7,16",
"endColumns": "12,12",
"endOffsets": "483,998"
},
"to": {
"startLines": "93,97",
"startColumns": "4,4",
"startOffsets": "5462,5643",
"endLines": "96,99",
"endColumns": "12,12",
"endOffsets": "5638,5807"
}
}
]
},
@ -967,7 +967,7 @@
"outputFile": "com.example.travelguide.app-merged_res-11:/values-night-v8_values-night-v8.arsc.flat",
"map": [
{
"source": "D:\\travelguideProject\\travelguideProject\\src\\android\\app\\src\\main\\res\\values-night\\styles.xml",
"source": "D:\\project\\travelguideProject\\src\\android\\app\\src\\main\\res\\values-night\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",

@ -4,7 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-night-v8/values-night-v8.xml",
"map": [
{
"source": "D:\\travelguideProject\\travelguideProject\\src\\android\\app\\src\\main\\res\\values-night\\styles.xml",
"source": "D:\\project\\travelguideProject\\src\\android\\app\\src\\main\\res\\values-night\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",

@ -3,25 +3,6 @@
{
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values/values.xml",
"map": [
{
"source": "D:\\travelguideProject\\travelguideProject\\src\\android\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",
"startOffsets": "176,832",
"endLines": "7,16",
"endColumns": "12,12",
"endOffsets": "483,998"
},
"to": {
"startLines": "93,97",
"startColumns": "4,4",
"startOffsets": "5462,5643",
"endLines": "96,99",
"endColumns": "12,12",
"endOffsets": "5638,5807"
}
},
{
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values\\values.xml",
"from": {
@ -59,6 +40,25 @@
"endColumns": "11,59,51,44,59,24,24,24,24,24",
"endOffsets": "289,349,401,446,4387,6899,7030,10987,11427,11736"
}
},
{
"source": "D:\\project\\travelguideProject\\src\\android\\app\\src\\main\\res\\values\\styles.xml",
"from": {
"startLines": "3,14",
"startColumns": "4,4",
"startOffsets": "176,832",
"endLines": "7,16",
"endColumns": "12,12",
"endOffsets": "483,998"
},
"to": {
"startLines": "93,97",
"startColumns": "4,4",
"startOffsets": "5462,5643",
"endLines": "96,99",
"endColumns": "12,12",
"endOffsets": "5638,5807"
}
}
]
}

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

@ -1 +1 @@
f2f53b3ebaa78b849442430d47eafbeec592b100
abe30a4a98716c43d586377f045650c9256cc8fe

@ -1,6 +1,6 @@
-- Merging decision tree log ---
application
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:2:5-32:19
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:2:5-32:19
MERGED from [androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:24:5-31:19
MERGED from [androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:24:5-31:19
MERGED from [androidx.core:core:1.6.0] C:\Users\Administrator\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:5-89
@ -10,14 +10,14 @@ MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\Ad
android:appComponentFactory
ADDED from [androidx.core:core:1.6.0] C:\Users\Administrator\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
android:name
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
manifest
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from [:sqflite] D:\travelguideProject\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-9:12
ADDED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
MERGED from [:sqflite] D:\project\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:2:1-9:12
MERGED from [androidx.window:window-java:1.0.0-beta04] C:\Users\Administrator\.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] C:\Users\Administrator\.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] C:\Users\Administrator\.gradle\caches\transforms-3\75f94412898c7559d34d7edbbeaeb394\transformed\fragment-1.1.0\AndroidManifest.xml:17:1-24:12
@ -35,29 +35,29 @@ MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\Administrator\.grad
MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\Administrator\.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] C:\Users\Administrator\.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] C:\Users\Administrator\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:17:1-24:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:1:1-7:12
package
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
android:versionName
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
android:versionCode
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
ADDED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:1-33:12
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
xmlns:android
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:11-69
ADDED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml:1:11-69
uses-sdk
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
MERGED from [:sqflite] D:\travelguideProject\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
MERGED from [:sqflite] D:\travelguideProject\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
MERGED from [:sqflite] D:\project\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
MERGED from [:sqflite] D:\project\travelguideProject\src\build\sqflite\intermediates\merged_manifest\debug\AndroidManifest.xml:5:5-7:41
MERGED from [androidx.window:window-java:1.0.0-beta04] C:\Users\Administrator\.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] C:\Users\Administrator\.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] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:20:5-22:41
@ -92,18 +92,18 @@ MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\Administrato
MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.1.0] C:\Users\Administrator\.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] C:\Users\Administrator\.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] C:\Users\Administrator\.gradle\caches\transforms-3\6c0c163cc77ae6c91f9f7dfcd179c29c\transformed\jetified-annotation-experimental-1.1.0\AndroidManifest.xml:20:5-22:41
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\main\AndroidManifest.xml
INJECTED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml
uses-permission#android.permission.INTERNET
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
ADDED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
android:name
ADDED from D:\travelguideProject\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
ADDED from D:\project\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
uses-library#androidx.window.extensions
ADDED from [androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
android:required

@ -1,2 +1,2 @@
<?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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\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\Administrator\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\Administrator\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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\project\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\project\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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\project\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\project\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\Administrator\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\Administrator\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>

@ -1,2 +1,2 @@
<?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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\travelguideProject\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\Administrator\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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\project\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\Administrator\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>

@ -6,9 +6,16 @@
#import "GeneratedPluginRegistrant.h"
#if __has_include(<sqflite/SqflitePlugin.h>)
#import <sqflite/SqflitePlugin.h>
#else
@import sqflite;
#endif
@implementation GeneratedPluginRegistrant
+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
[SqflitePlugin registerWithRegistrar:[registry registrarForPlugin:@"SqflitePlugin"]];
}
@end

Loading…
Cancel
Save