HanJiaHui_Branch
嘉辉 JIA HUI 2 years ago
parent 06be46b584
commit 4b1abf514c

File diff suppressed because one or more lines are too long

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

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

@ -0,0 +1,52 @@
//
// Generated file. Do not edit.
// This file is generated from template in file `flutter_tools/lib/src/flutter_plugins.dart`.
//
// @dart = 3.1
import 'dart:io'; // flutter_ignore: dart_io_import.
import 'package:sqflite/sqflite.dart';
import 'package:sqflite/sqflite.dart';
import 'package:sqflite/sqflite.dart';
@pragma('vm:entry-point')
class _PluginRegistrant {
@pragma('vm:entry-point')
static void register() {
if (Platform.isAndroid) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isIOS) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isLinux) {
} else if (Platform.isMacOS) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isWindows) {
}
}
}

@ -104,7 +104,6 @@
"languageVersion": "2.18"
},
{
<<<<<<< HEAD
"name": "sqflite",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
"packageUri": "lib/",
@ -117,8 +116,6 @@
"languageVersion": "3.0"
},
{
=======
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"name": "stack_trace",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
"packageUri": "lib/",
@ -137,15 +134,12 @@
"languageVersion": "2.18"
},
{
<<<<<<< HEAD
"name": "synchronized",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
=======
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"name": "term_glyph",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
"packageUri": "lib/",
@ -176,11 +170,7 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
"generated": "2023-10-16T02:42:09.019651Z",
=======
"generated": "2023-10-17T09:06:22.726393Z",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"generated": "2023-10-17T13:12:11.527001Z",
"generator": "pub",
"generatorVersion": "3.1.1"
}

@ -52,7 +52,6 @@ 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
@ -63,10 +62,6 @@ 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/
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
stack_trace
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
@ -77,17 +72,12 @@ 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/
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
term_glyph
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/

@ -1 +1 @@
{"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-16 10:42:15.845619","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\\\\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"}

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
<data-source name="travelguide.sqlite" uuid="5004e01d-17e4-4e45-bbdf-a455ba9544e6">
<database-info product="SQLite" version="3.43.0" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.43.0.0" dbms="SQLITE" exact-version="3.43.0" exact-driver-version="3.43">
<identifier-quote-string>&quot;</identifier-quote-string>
</database-info>
<case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
<secret-storage>master_key</secret-storage>
<auth-provider>no-auth</auth-provider>
<schema-mapping>
<introspection-scope>
<node kind="schema" qname="main" />
</introspection-scope>
</schema-mapping>
</data-source>
</component>
</project>

@ -5,7 +5,7 @@
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:E:\travelguideProject\src\Database</jdbc-url>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/Database</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
</component>

@ -0,0 +1,228 @@
<component name="libraryTable">
<library name="Dart Packages" type="DartPackagesLibraryType">
<properties>
<option name="packageNameToDirsMap">
<entry key="async">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
</list>
</value>
</entry>
<entry key="boolean_selector">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
</list>
</value>
</entry>
<entry key="characters">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
</list>
</value>
</entry>
<entry key="clock">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
</list>
</value>
</entry>
<entry key="collection">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib" />
</list>
</value>
</entry>
<entry key="cupertino_icons">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" />
</list>
</value>
</entry>
<entry key="fake_async">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
</list>
</value>
</entry>
<entry key="flutter">
<value>
<list>
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter/lib" />
</list>
</value>
</entry>
<entry key="flutter_lints">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
</list>
</value>
</entry>
<entry key="flutter_test">
<value>
<list>
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter_test/lib" />
</list>
</value>
</entry>
<entry key="lints">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
</list>
</value>
</entry>
<entry key="matcher">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
</list>
</value>
</entry>
<entry key="material_color_utilities">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
</list>
</value>
</entry>
<entry key="meta">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib" />
</list>
</value>
</entry>
<entry key="path">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
</list>
</value>
</entry>
<entry key="sky_engine">
<value>
<list>
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/lib" />
</list>
</value>
</entry>
<entry key="source_span">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
</list>
</value>
</entry>
<entry key="sqflite">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib" />
</list>
</value>
</entry>
<entry key="sqflite_common">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib" />
</list>
</value>
</entry>
<entry key="stack_trace">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
</list>
</value>
</entry>
<entry key="stream_channel">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
</list>
</value>
</entry>
<entry key="string_scanner">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
</list>
</value>
</entry>
<entry key="synchronized">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib" />
</list>
</value>
</entry>
<entry key="term_glyph">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
</list>
</value>
</entry>
<entry key="test_api">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib" />
</list>
</value>
</entry>
<entry key="vector_math">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />
</list>
</value>
</entry>
<entry key="web">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib" />
</list>
</value>
</entry>
</option>
</properties>
<CLASSES>
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib" />
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter/lib" />
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter_test/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES>
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -3,7 +3,7 @@
<component name="FrameworkDetectionExcludesConfiguration">
<type id="android" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="Android API 33 Platform" project-jdk-type="Android SDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="Android API 33, extension level 5 Platform" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SuppressABINotification">

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/src/.pub" />
<excludeFolder url="file://$MODULE_DIR$/src/build" />
<excludeFolder url="file://$MODULE_DIR$/src/.dart_tool" />
</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>

Binary file not shown.

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

@ -1,5 +1 @@
<<<<<<< HEAD
99d422f60ec3de076ff7e456d1ef6bf5
=======
73ad0c3a968a1eeb9647bffe91993129
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
99d422f60ec3de076ff7e456d1ef6bf5

File diff suppressed because one or more lines are too long

@ -1,5 +1,4 @@
<<<<<<< HEAD
#Mon Oct 16 10:36:05 CST 2023
#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
com.example.travelguide.app-main-5\:/mipmap-mdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat
@ -7,13 +6,3 @@ 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 17:06:41 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
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af

File diff suppressed because one or more lines are too long

@ -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="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>
<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>

@ -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="E:\travelguideProject\src\android\app\src\main\jniLibs"/></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\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="D:\travelguideProject\src\android\app\src\main\jniLibs"/></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\jniLibs"/></dataSet></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="E:\travelguideProject\src\android\app\src\main\shaders"/></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\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="D:\travelguideProject\src\android\app\src\main\shaders"/></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\shaders"/></dataSet></merger>

@ -1,9 +1,4 @@
<<<<<<< HEAD
#Mon Oct 16 10:39:25 CST 2023
#Tue Oct 17 23:35:51 CST 2023
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Tue Oct 17 17:06:53 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
renamed.0=classes.dex
path.0=classes.dex

@ -13,17 +13,13 @@
13 to allow setting breakpoints, to provide hot reload, etc.
14 -->
15 <uses-permission android:name="android.permission.INTERNET" />
15-->E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
15-->D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
16
17 <application
18 android:name="android.app.Application"
19 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
<<<<<<< HEAD
19-->[androidx.core:core:1.6.0] C:\Users\86131\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
=======
19-->[androidx.core:core:1.6.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
20 android:debuggable="true"
21 android:icon="@mipmap/ic_launcher"
22 android:label="travelguide" >
@ -61,7 +57,6 @@
54 android:value="2" />
55
56 <uses-library
<<<<<<< HEAD
56-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
57 android:name="androidx.window.extensions"
57-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
@ -73,19 +68,6 @@
60-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
61 android:required="false" />
61-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:30:13-37
=======
56-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
57 android:name="androidx.window.extensions"
57-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
58 android:required="false" />
58-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:27:13-37
59 <uses-library
59-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:28:9-30:40
60 android:name="androidx.window.sidecar"
60-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
61 android:required="false" />
61-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:30:13-37
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
62 </application>
63
64</manifest>

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-af/values-af.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-am/values-am.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ar/values-ar.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-as/values-as.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-az/values-az.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-b+sr+Latn/values-b+sr+Latn.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-be/values-be.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bg/values-bg.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bn/values-bn.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bs/values-bs.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ca/values-ca.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-cs/values-cs.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-da/values-da.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-de/values-de.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-el/values-el.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rAU/values-en-rAU.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rCA/values-en-rCA.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
>>>>>>> 47bc09df85353396d7b3295225c69f597f8376af
"from": {
"startLines": "2",
"startColumns": "4",

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

Loading…
Cancel
Save