mbhvfy6mx
/
gitProject
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: mbhvfy6mx:ad30b187da6dc6ebbe16090be9f4aa9df77af9b7
Branches Tags
mbhvfy6mx:master
mbhvfy6mx:dev
mbhvfy6mx:cyx_branch
mbhvfy6mx:zxy_branch
...
compare: mbhvfy6mx:fa58d16f2bf941fe0477869f42ac7aa7cd84bfd7
Branches Tags
mbhvfy6mx:master
mbhvfy6mx:dev
mbhvfy6mx:cyx_branch
mbhvfy6mx:zxy_branch

14 Commits
ad30b187da ... fa58d16f2b

Author SHA1 Message Date
beitingnanxu fa58d16f2b Merge branch 'cyx_branch' into dev
2 years ago
beitingnanxu 7765a6a7ab Merge branch 'master' into cyx_branch
2 years ago
beitingnanxu 89d77f4ea3 Merge branch 'cyx_branch'
2 years ago
cyx13 cffb9743c9 Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch
2 years ago
cyx13 8c27436e4d Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch
2 years ago
cyx13 4ec4ea8326 Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch
2 years ago
蔡玉祥 2c1c88e62c Merge branch 'cyx_branch' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into cyx_branch
2 years ago
蔡玉祥 132a9efea0 Merge branch 'cyx_branch' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into cyx_branch
2 years ago
蔡玉祥 ac6bb681fa 达到
2 years ago
mbhvfy6mx 285af32e55 Merge pull request '版本控制' (#17) from master into cyx_branch
2 years ago
蔡玉祥 e750fe86a1 Merge branch 'cyx_branch' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into cyx_branch
2 years ago
蔡玉祥 aa2749eff7 dd
2 years ago
mbhvfy6mx 97f59e709a Merge pull request 'ddd' (#16) from master into cyx_branch
2 years ago
mbhvfy6mx b193b83e7d Merge pull request '版本控制' (#14) from master into cyx_branch
2 years ago
563 changed files with 2702 additions and 19 deletions
Show Stats

BIN
.gradle/7.4.2/checksums/checksums.lock
View File

Binary file not shown.

BIN
.gradle/7.4.2/checksums/md5-checksums.bin
View File

Binary file not shown.

BIN
.gradle/7.4.2/checksums/sha1-checksums.bin
View File

Binary file not shown.

BIN
.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock
View File

Binary file not shown.

0
src/.gradle/7.5/dependencies-accessors/gc.properties → .gradle/7.4.2/dependencies-accessors/gc.properties
Unescape View File

BIN
.gradle/7.4.2/executionHistory/executionHistory.lock
View File

Binary file not shown.

0
src/.gradle/7.5/fileChanges/last-build.bin → .gradle/7.4.2/fileChanges/last-build.bin
Unescape View File

BIN
.gradle/7.4.2/fileHashes/fileHashes.lock
View File

Binary file not shown.

0
src/.gradle/7.5/gc.properties → .gradle/7.4.2/gc.properties
Unescape View File

0
src/.gradle/7.5/checksums/checksums.lock → .gradle/7.5/checksums/checksums.lock
Unescape View File

0
src/.gradle/7.5/checksums/md5-checksums.bin → .gradle/7.5/checksums/md5-checksums.bin
Unescape View File

0
src/.gradle/7.5/checksums/sha1-checksums.bin → .gradle/7.5/checksums/sha1-checksums.bin
Unescape View File

0
src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock → .gradle/7.5/dependencies-accessors/dependencies-accessors.lock
Unescape View File

0
src/.gradle/vcs-1/gc.properties → .gradle/7.5/dependencies-accessors/gc.properties
Unescape View File

BIN
.gradle/7.5/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/7.5/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/7.5/fileChanges/last-build.bin
View File

Binary file not shown.

BIN
.gradle/7.5/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/7.5/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
src/.gradle/7.5/fileHashes/resourceHashesCache.bin → .gradle/7.5/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

0
src/存放源程序代码.txt → .gradle/7.5/gc.properties
Unescape View File

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

0
src/.gradle/buildOutputCleanup/cache.properties → .gradle/buildOutputCleanup/cache.properties
Unescape View File

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

BIN
.gradle/file-system.probe
View File

Binary file not shown.

0
.gradle/vcs-1/gc.properties
Unescape View File

0
src/.idea/.gitignore → .idea/.gitignore vendored
Unescape View File

0
src/.idea/compiler.xml → .idea/compiler.xml
Unescape View File

0
src/.idea/deploymentTargetDropDown.xml → .idea/deploymentTargetDropDown.xml
Unescape View File

0
src/.idea/gradle.xml → .idea/gradle.xml
Unescape View File

0
src/.idea/jarRepositories.xml → .idea/jarRepositories.xml
Unescape View File

4
src/.idea/misc.xml → .idea/misc.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<<<<<<< HEAD:.idea/misc.xml
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
>>>>>>> master:src/.idea/misc.xml
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

12
.idea/modules.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/gitProject.iml" filepath="$PROJECT_DIR$/.idea/modules/gitProject.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.androidTest.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/gitProject.app.unitTest.iml" />
</modules>
</component>
</project>

33
.idea/modules/app/gitProject.app.androidTest.iml
Unescape View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app:androidTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" />
<content url="file://$MODULE_DIR$/../../../app/src/androidTest" />
<content url="file://$MODULE_DIR$/../../../app/src/androidTestDebug" />
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gitProject.app.main" scope="TEST" />
</component>
<component name="TestModuleProperties" production-module="gitProject.app.main" />
</module>

34
.idea/modules/app/gitProject.app.iml
Unescape View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="gitProject" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
<option name="LAST_KNOWN_AGP_VERSION" value="7.4.2" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../app">
<excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
</content>
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

40
.idea/modules/app/gitProject.app.main.iml
Unescape View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app:main" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/out" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
</content>
<content url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" />
<content url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug">
<sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
</content>
<content url="file://$MODULE_DIR$/../../../app/src/debug" />
<content url="file://$MODULE_DIR$/../../../app/src/main">
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
</content>
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

28
.idea/modules/app/gitProject.app.unitTest.iml
Unescape View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app:unitTest" external.linked.project.path="$MODULE_DIR$/../../../app" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
<output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugUnitTest/out" />
<content url="file://$MODULE_DIR$/../../../app/src/test" />
<content url="file://$MODULE_DIR$/../../../app/src/testDebug" />
<orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gitProject.app.main" scope="TEST" />
</component>
<component name="TestModuleProperties" production-module="gitProject.app.main" />
</module>

0
src/.idea/modules/app/minote.app.androidTest.iml → .idea/modules/app/minote.app.androidTest.iml
Unescape View File

0
src/.idea/modules/app/minote.app.iml → .idea/modules/app/minote.app.iml
Unescape View File

0
src/.idea/modules/app/minote.app.main.iml → .idea/modules/app/minote.app.main.iml
Unescape View File

0
src/.idea/modules/app/minote.app.unitTest.iml → .idea/modules/app/minote.app.unitTest.iml
Unescape View File

12
.idea/modules/gitProject.iml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="gitProject" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/vcs.xml
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

102
.idea/workspace.xml
Unescape View File

@ -10,7 +10,109 @@
</component>
<component name="ChangeListManager">
<list default="true" id="2531eea7-ec98-43ef-9f7f-09fe1004db56" name="变更" comment="庞浩的注释">
<<<<<<< HEAD
<<<<<<< remotes/origin/cyx_branch
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/checksums.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/md5-checksums.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/sha1-checksums.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/dependencies-accessors/gc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/executionHistory/executionHistory.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/fileChanges/last-build.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/fileHashes/fileHashes.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/gc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/checksums.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/md5-checksums.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/checksums/sha1-checksums.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/dependencies-accessors/gc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/executionHistory/executionHistory.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/executionHistory/executionHistory.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileChanges/last-build.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/fileHashes.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/7.5/gc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/cache.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/file-system.probe" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.gradle/vcs-1/gc.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/gradle.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/jarRepositories.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.androidTest.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.main.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.unitTest.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/build.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/gradlew" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/gradlew.bat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/import-summary.txt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/local.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/minote.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/settings.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.androidTest.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.main.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/minote.app.unitTest.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gradlew" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gradlew.bat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/import-summary.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/minote.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" />
=======
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
>>>>>>> local
=======
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/src/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.androidTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.androidTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/.idea/modules/app/minote.app.unitTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/Node.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/Node.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/Task.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/Task.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/local.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/minote.iml" beforeDir="false" afterPath="$PROJECT_DIR$/src/minote.iml" afterDir="false" />
>>>>>>> 97f59e709a754d9ac92f018b602c051baead5aac
=======
>>>>>>> master
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

0
src/app/build.gradle → app/build.gradle
Unescape View File

0
src/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java → app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java
Unescape View File

0
src/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json → app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
Unescape View File

BIN
src/app/build/intermediates/apk/debug/app-debug.apk → app/build/intermediates/apk/debug/app-debug.apk
View File

Binary file not shown.

0
src/app/build/intermediates/apk/debug/output-metadata.json → app/build/intermediates/apk/debug/output-metadata.json
Unescape View File

0
src/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt → app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt
Unescape View File

0
src/app/build/intermediates/app_metadata/debug/app-metadata.properties → app/build/intermediates/app_metadata/debug/app-metadata.properties
Unescape View File

0
src/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json → app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json
Unescape View File

BIN
src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar → app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_0/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_1/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_2/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_3/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_4/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_5/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_6/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ce13d23a60c58f5f52995e904816ac4c1bdc8eaeca853b6df06555082277affe_bucket_7/graph.bin
View File

Binary file not shown.

BIN
app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
View File

Binary file not shown.

BIN
app/build/intermediates/dex_archive_input_jar_hashes/debug/out
View File

Binary file not shown.

1
app/build/intermediates/dex_number_of_buckets_file/debug/out
Unescape View File

@ -0,0 +1 @@
8

0
src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state → app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
Unescape View File

96
app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
Unescape View File

@ -0,0 +1,96 @@
#Wed Jun 07 14:15:06 CST 2023
net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat

56
app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

2
app/build/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

@ -0,0 +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="D:\gitProjs\gitProject\app\src\main\assets"/><source path="D:\gitProjs\gitProject\app\build\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:\gitProjs\gitProject\app\src\debug\assets"/></dataSet></merger>

2
app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
Unescape View File

@ -0,0 +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="D:\gitProjs\gitProject\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:\gitProjs\gitProject\app\src\debug\jniLibs"/></dataSet></merger>

2
app/build/intermediates/incremental/mergeDebugShaders/merger.xml
Unescape View File

@ -0,0 +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="D:\gitProjs\gitProject\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:\gitProjs\gitProject\app\src\debug\shaders"/></dataSet></merger>

4
app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
Unescape View File

@ -0,0 +1,4 @@
#Wed Jun 07 14:15:07 CST 2023
base.0=D\:\\gitProjs\\gitProject\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
path.0=classes.dex
renamed.0=classes.dex

BIN
src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources → app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
View File

Binary file not shown.

0
src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 → app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
Unescape View File

1
app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
View File

File diff suppressed because one or more lines are too long

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class → app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class → app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
Unescape View File

BIN
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
View File

Binary file not shown.

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class
Unescape View File

0
src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class → app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class
Unescape View File

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

Write Preview
Loading…
Cancel
Save