diff --git a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock new file mode 100644 index 00000000..409fd8d3 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin new file mode 100644 index 00000000..98673e5e Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin new file mode 100644 index 00000000..ed29176b Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master1/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 00000000..4b7c9bb9 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock differ diff --git a/src/Notes-master1/.gradle/7.5/dependencies-accessors/gc.properties b/src/Notes-master1/.gradle/7.5/dependencies-accessors/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin new file mode 100644 index 00000000..6e145c3a Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock new file mode 100644 index 00000000..e0db6da9 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileChanges/last-build.bin b/src/Notes-master1/.gradle/7.5/fileChanges/last-build.bin new file mode 100644 index 00000000..f76dd238 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/fileChanges/last-build.bin differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin new file mode 100644 index 00000000..8b87e64d Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock new file mode 100644 index 00000000..07fdfdcb Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin new file mode 100644 index 00000000..16c04889 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/7.5/gc.properties b/src/Notes-master1/.gradle/7.5/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 00000000..93a0bb4e Binary files /dev/null and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..a1dcce2c --- /dev/null +++ b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Mar 20 17:08:22 ULAT 2023 +gradle.version=7.5 diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 00000000..a4564e39 Binary files /dev/null and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe new file mode 100644 index 00000000..6737637d Binary files /dev/null and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/.gradle/vcs-1/gc.properties b/src/Notes-master1/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.idea/.gitignore b/src/Notes-master1/.idea/.gitignore new file mode 100644 index 00000000..359bb530 --- /dev/null +++ b/src/Notes-master1/.idea/.gitignore @@ -0,0 +1,3 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml diff --git a/src/Notes-master1/.idea/compiler.xml b/src/Notes-master1/.idea/compiler.xml new file mode 100644 index 00000000..b589d56e --- /dev/null +++ b/src/Notes-master1/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/gradle.xml b/src/Notes-master1/.idea/gradle.xml new file mode 100644 index 00000000..a33cee77 --- /dev/null +++ b/src/Notes-master1/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/jarRepositories.xml b/src/Notes-master1/.idea/jarRepositories.xml new file mode 100644 index 00000000..a5f05cd8 --- /dev/null +++ b/src/Notes-master1/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml new file mode 100644 index 00000000..63423d15 --- /dev/null +++ b/src/Notes-master1/.idea/misc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/vcs.xml b/src/Notes-master1/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/src/Notes-master1/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.tmp/gradle16975174463946373243.bin b/src/Notes-master1/.tmp/gradle16975174463946373243.bin new file mode 100644 index 00000000..9f1af337 Binary files /dev/null and b/src/Notes-master1/.tmp/gradle16975174463946373243.bin differ diff --git a/src/Notes-master1/.tmp/gradle2965093248701212784.bin b/src/Notes-master1/.tmp/gradle2965093248701212784.bin new file mode 100644 index 00000000..4fad8096 Binary files /dev/null and b/src/Notes-master1/.tmp/gradle2965093248701212784.bin differ diff --git a/src/Notes-master1/.tmp/gradle_download13616390791118721338bin b/src/Notes-master1/.tmp/gradle_download13616390791118721338bin new file mode 100644 index 00000000..b262ce76 Binary files /dev/null and b/src/Notes-master1/.tmp/gradle_download13616390791118721338bin differ diff --git a/src/Notes-master1/.tmp/gradle_download9538719242193751182bin b/src/Notes-master1/.tmp/gradle_download9538719242193751182bin new file mode 100644 index 00000000..1551ea05 Binary files /dev/null and b/src/Notes-master1/.tmp/gradle_download9538719242193751182bin differ diff --git a/src/Notes-master1/android.lock b/src/Notes-master1/android.lock new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/android/FakeDependency.jar b/src/Notes-master1/android/FakeDependency.jar new file mode 100644 index 00000000..15cb0ecb Binary files /dev/null and b/src/Notes-master1/android/FakeDependency.jar differ diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle new file mode 100644 index 00000000..a0df5415 --- /dev/null +++ b/src/Notes-master1/app/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 30 + buildToolsVersion "30.0.3" + + defaultConfig { + applicationId "net.micode.notes" + minSdkVersion 22 + targetSdkVersion 22 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + + dependencies { + implementation files('E:\\Notes-master1\\gradle\\lib\\httpclient-osgi-4.5.14.jar') + implementation files('E:\\Notes-master1\\gradle\\lib\\httpclient-win-4.5.14.jar') + implementation files('E:\\Notes-master1\\gradle\\lib\\httpcore-4.4.16.jar') + } + + packagingOptions{ + exclude 'META-INF/DEPENDENCIES' + } + +} + + diff --git a/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java b/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java new file mode 100644 index 00000000..db176909 --- /dev/null +++ b/src/Notes-master1/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java @@ -0,0 +1,12 @@ +/** + * Automatically generated file. DO NOT MODIFY + */ +package net.micode.notes; + +public final class BuildConfig { + public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String APPLICATION_ID = "net.micode.notes"; + public static final String BUILD_TYPE = "debug"; + public static final int VERSION_CODE = 1; + public static final String VERSION_NAME = "0.1"; +} diff --git a/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 00000000..3517c1f4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json new file mode 100644 index 00000000..b2231b9c --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt new file mode 100644 index 00000000..66652a54 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -0,0 +1,2 @@ +#- File Locator - +listingFile=../../../outputs/apk/debug/output-metadata.json diff --git a/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties new file mode 100644 index 00000000..260f1ee9 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties @@ -0,0 +1,2 @@ +appMetadataVersion=1.1 +androidGradlePluginVersion=7.4.2 diff --git a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json new file mode 100644 index 00000000..714f6517 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json @@ -0,0 +1,10 @@ +{ + "version": 3, + "artifactType": { + "type": "COMPATIBLE_SCREEN_MANIFEST", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [] +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar new file mode 100644 index 00000000..e2f04c1c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin new file mode 100644 index 00000000..274fe1c2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin new file mode 100644 index 00000000..406488dd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin new file mode 100644 index 00000000..7fb4c424 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin new file mode 100644 index 00000000..dfcd56e8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin new file mode 100644 index 00000000..a8e0777f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_0/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_1/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_2/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_2/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_3/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_4/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_4/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_5/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_6/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_6/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_7/graph.bin new file mode 100644 index 00000000..601f245f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_11b400288f4f36607c7cf4b3c68f069fccb867640b4b6ceacca4d86bfb1844e6_bucket_7/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex new file mode 100644 index 00000000..44a3227f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex new file mode 100644 index 00000000..30394efd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex new file mode 100644 index 00000000..dc47d0c1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex new file mode 100644 index 00000000..e987c657 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex new file mode 100644 index 00000000..19670fbb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex new file mode 100644 index 00000000..691dbaa1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex new file mode 100644 index 00000000..7e636c54 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex new file mode 100644 index 00000000..2cb3542f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex new file mode 100644 index 00000000..7cfd2020 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out new file mode 100644 index 00000000..eecce6d7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out new file mode 100644 index 00000000..301160a9 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpclient-osgi-4.5.14.jar b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpclient-osgi-4.5.14.jar new file mode 100644 index 00000000..91c2365c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/0_httpclient-osgi-4.5.14.jar differ diff --git a/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-win-4.5.14.jar b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-win-4.5.14.jar new file mode 100644 index 00000000..4ffa2173 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/1_httpclient-win-4.5.14.jar differ diff --git a/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar new file mode 100644 index 00000000..6fdde2c3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/external_file_lib_dex_archives/debug/2_httpcore-4.4.16.jar differ diff --git a/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex new file mode 100644 index 00000000..991b9577 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state new file mode 100644 index 00000000..4215d76d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3l38MFuqmCrV1TgUG+l4Ny6VTuk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3l38MFuqmCrV1TgUG+l4Ny6VTuk= new file mode 100644 index 00000000..270124ff Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3l38MFuqmCrV1TgUG+l4Ny6VTuk= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PgKzZRdEg4V1sGkDJHB8YaOaPhY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PgKzZRdEg4V1sGkDJHB8YaOaPhY= new file mode 100644 index 00000000..aed581ee Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PgKzZRdEg4V1sGkDJHB8YaOaPhY= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcKUrQxoSal+pC2D6Km8U18LZXM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcKUrQxoSal+pC2D6Km8U18LZXM= new file mode 100644 index 00000000..66c75aa3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcKUrQxoSal+pC2D6Km8U18LZXM= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties new file mode 100644 index 00000000..cc0cc9c1 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,98 @@ +#Tue Jun 06 23:08:08 ULAT 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\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=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/layout/login.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_login.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/imageeee.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_imageeee.png.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 00000000..5644c1fe --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,116 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 登录失败 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 输入为空 + 登录 + 账号 + 密码 + 注册 + 请登录 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 注册成功 + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 00000000..95812f27 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,116 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 登录失败 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 输入为空 + 登录 + 账号 + 密码 + 注册 + 请登录 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 注册成功 + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 00000000..0735c4e8 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,176 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + fail to login + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + input empty + login + accoount + password + register + Please login in + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + register OK + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 00000000..18149f5f --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,55 @@ + + + -%s + --%s + --%s + --%s + + Messaging + Email + #335b5b5b33sp26sp20sp17sp14spPlease login inaccoountpasswordloginfail to loginregisterregister OKinput emptyNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + 短信 + 邮件 + 请登录账号密码登录登录失败注册注册成功输入为空便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + + 短信 + 郵件 + 请登录账号密码登录登录失败注册注册成功输入为空便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 00000000..cf419821 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 00000000..011164d3 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 00000000..5c9d2e34 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt new file mode 100644 index 00000000..0d34f9ec --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,25 @@ +#Tue Jun 06 23:08:14 ULAT 2023 +path.4=13/classes.dex +path.3=12/classes.dex +path.2=11/classes.dex +path.1=0/classes.dex +path.7=5/classes.dex +path.6=4/classes.dex +path.5=15/classes.dex +path.0=classes.dex +base.4=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.3=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.2=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.1=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.0=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +renamed.3=classes4.dex +renamed.2=classes3.dex +renamed.1=classes2.dex +renamed.0=classes.dex +renamed.7=classes8.dex +renamed.6=classes7.dex +base.7=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +renamed.5=classes6.dex +base.6=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +renamed.4=classes5.dex +base.5=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources new file mode 100644 index 00000000..c467c434 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 new file mode 100644 index 00000000..baf6503e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class new file mode 100644 index 00000000..d0ec2727 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class new file mode 100644 index 00000000..a7948fd1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/LoginData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/LoginData.class new file mode 100644 index 00000000..dc94548e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/LoginData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class new file mode 100644 index 00000000..42394b73 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class new file mode 100644 index 00000000..569dbdc1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class new file mode 100644 index 00000000..76ef96eb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class new file mode 100644 index 00000000..36c8d495 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class new file mode 100644 index 00000000..42461a28 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class new file mode 100644 index 00000000..413745e5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class new file mode 100644 index 00000000..64fe9eb5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class new file mode 100644 index 00000000..0b075b48 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class new file mode 100644 index 00000000..f50998a6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class new file mode 100644 index 00000000..20ff3f7a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class new file mode 100644 index 00000000..5236c5e6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class new file mode 100644 index 00000000..099f3bac Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class new file mode 100644 index 00000000..2783ae32 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class new file mode 100644 index 00000000..5aaf1d4e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class new file mode 100644 index 00000000..359609e5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class new file mode 100644 index 00000000..1a059cea Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class new file mode 100644 index 00000000..75665c2f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class new file mode 100644 index 00000000..dacd5fa8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class new file mode 100644 index 00000000..f73069cb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class new file mode 100644 index 00000000..6d482b64 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class new file mode 100644 index 00000000..afe7a57c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class new file mode 100644 index 00000000..325bd2a3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class new file mode 100644 index 00000000..f246eb87 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class new file mode 100644 index 00000000..18da491b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class new file mode 100644 index 00000000..c40e9450 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class new file mode 100644 index 00000000..d2041ccf Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class new file mode 100644 index 00000000..15f1f775 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class new file mode 100644 index 00000000..371c8ff2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class new file mode 100644 index 00000000..3091c3e1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class new file mode 100644 index 00000000..9ea668c0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/CheckUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/CheckUtils.class new file mode 100644 index 00000000..78ff0f3a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/CheckUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class new file mode 100644 index 00000000..6af32006 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class new file mode 100644 index 00000000..d320e3ed Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/PictureaddUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/PictureaddUtils.class new file mode 100644 index 00000000..0dc6ce18 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/PictureaddUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class new file mode 100644 index 00000000..3a43d3e3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class new file mode 100644 index 00000000..7428d4e7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class new file mode 100644 index 00000000..5868ba77 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class new file mode 100644 index 00000000..d18db826 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class new file mode 100644 index 00000000..f2e1b626 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class new file mode 100644 index 00000000..73ac017c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class new file mode 100644 index 00000000..a1d202d1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class new file mode 100644 index 00000000..a41b7758 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class new file mode 100644 index 00000000..029286f0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class new file mode 100644 index 00000000..e65c35c2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class new file mode 100644 index 00000000..de51badc Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class new file mode 100644 index 00000000..d04cbe7d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class new file mode 100644 index 00000000..255a4e6a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class new file mode 100644 index 00000000..53cdce67 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class new file mode 100644 index 00000000..415e755c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class new file mode 100644 index 00000000..70481dd7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class new file mode 100644 index 00000000..bfb9f559 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class new file mode 100644 index 00000000..ddd74fd6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class new file mode 100644 index 00000000..d805d20f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class new file mode 100644 index 00000000..e4f97b67 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class new file mode 100644 index 00000000..d37e908b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class new file mode 100644 index 00000000..04dd918e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class new file mode 100644 index 00000000..56672699 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$3.class new file mode 100644 index 00000000..83eab9fc Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$4.class new file mode 100644 index 00000000..bc986ded Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class new file mode 100644 index 00000000..f5a32847 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class new file mode 100644 index 00000000..c6957b32 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class new file mode 100644 index 00000000..aaabbd56 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class new file mode 100644 index 00000000..bad74630 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class new file mode 100644 index 00000000..e1413113 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class new file mode 100644 index 00000000..d0b8ade0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class new file mode 100644 index 00000000..eaede672 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class new file mode 100644 index 00000000..2040186e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class new file mode 100644 index 00000000..9874f47b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class new file mode 100644 index 00000000..494c98a6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class new file mode 100644 index 00000000..771aa912 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class new file mode 100644 index 00000000..2d4b5fb5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class new file mode 100644 index 00000000..84636175 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class new file mode 100644 index 00000000..8934fad9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class new file mode 100644 index 00000000..3626f03e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class new file mode 100644 index 00000000..1affd11b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class new file mode 100644 index 00000000..d5fd50ae Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class new file mode 100644 index 00000000..f54cc321 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class new file mode 100644 index 00000000..62f5df13 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class new file mode 100644 index 00000000..8412cadd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class new file mode 100644 index 00000000..fadd4fcb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class new file mode 100644 index 00000000..2edab7b3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class new file mode 100644 index 00000000..3981f169 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class new file mode 100644 index 00000000..99e161f8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class new file mode 100644 index 00000000..38f403c9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class new file mode 100644 index 00000000..1e7b9f0d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class new file mode 100644 index 00000000..593d16fa Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class new file mode 100644 index 00000000..32941e92 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class new file mode 100644 index 00000000..2bdb58bc Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class new file mode 100644 index 00000000..5e432e90 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class new file mode 100644 index 00000000..c5557beb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class new file mode 100644 index 00000000..50790d84 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class new file mode 100644 index 00000000..85232285 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class new file mode 100644 index 00000000..d91bc851 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class new file mode 100644 index 00000000..99c7a64f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class new file mode 100644 index 00000000..17e4d3bb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class new file mode 100644 index 00000000..7b800360 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class new file mode 100644 index 00000000..d9abeb93 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class new file mode 100644 index 00000000..39e534ac Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class new file mode 100644 index 00000000..e5e6fc96 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class new file mode 100644 index 00000000..3b90ca2d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class new file mode 100644 index 00000000..cd6182ad Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class new file mode 100644 index 00000000..4ae6350d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class new file mode 100644 index 00000000..69c28cbc Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 00000000..b34746fd --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,432 @@ +1 +2 +6 +21 +29 +33 +39 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:5-44 +40 android:minSdkVersion="22" +40-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:15-41 +41 android:targetSdkVersion="22" /> +41-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:5-44 +42 +48 +49 +49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:5-81 +49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:22-78 +50 +54 +54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:5-88 +54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:22-85 +55 +56 +56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:5-67 +56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:22-64 +57 +58 +58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:5-72 +58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:22-69 +59 +60 +60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:5-74 +60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:22-71 +61 +62 +62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:5-80 +62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:22-77 +63 +64 +64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:5-71 +64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:22-68 +65 +66 +66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:5-74 +66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:22-71 +67 +68 +68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:5-81 +68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:22-78 +69 +70 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:87:5-351:19 +71 android:debuggable="true" +72 android:icon="@drawable/icon_app" +72-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-42 +73 android:label="@string/app_name" > +73-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:89:9-41 +74 +75 +80 +81 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:96:9-105:20 +82 android:name="net.micode.notes.ui.LoginActivity" +82-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-45 +83 android:launchMode="standard" > +83-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:98:13-42 +84 +84-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:100:13-104:29 +85 +85-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:101:17-68 +85-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:101:25-66 +86 +87 +87-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-76 +87-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:102:27-74 +88 +89 +90 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:107:9-153:20 +91 android:name="net.micode.notes.ui.NotesListActivity" +91-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:108:13-49 +92 android:configChanges="keyboardHidden|orientation|screenSize" +92-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:109:13-74 +93 android:label="@string/app_name" +93-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:110:13-45 +94 android:launchMode="singleTop" +94-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:111:13-43 +95 android:theme="@style/NoteTheme" +95-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-45 +96 android:uiOptions="splitActionBarWhenNarrow" +96-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:113:13-57 +97 android:windowSoftInputMode="adjustPan" > +97-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:114:13-52 +98 +99 +114 +115 +115-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:132:13-152:29 +116 +117 +122 +122-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:17-68 +122-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:25-66 +123 +129 +130 +136 +137 +138 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:155:9-229:20 +139 android:name="net.micode.notes.ui.NoteEditActivity" +139-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:156:13-48 +140 android:configChanges="keyboardHidden|orientation|screenSize" +140-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:157:13-74 +141 android:launchMode="singleTop" +141-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:158:13-43 +142 android:theme="@style/NoteTheme" > +142-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:159:13-45 +143 +144 +150 +151 +151-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:167:13-188:29 +152 +152-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:17-68 +152-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:138:25-66 +153 +157 +157-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:17-76 +157-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:27-73 +158 +159 +159-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:17-78 +159-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:23-75 +160 +166 +166-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:17-78 +166-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:23-75 +167 +168 +169 +169-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:190:13-207:29 +170 +170-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:191:17-79 +170-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:191:25-76 +171 +172 +172-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:17-76 +172-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:27-73 +173 +174 +174-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:17-78 +174-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:23-75 +175 +176 +176-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:17-78 +176-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:177:23-75 +177 +178 +179 +179-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:209:13-218:29 +180 +180-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:210:17-71 +180-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:210:25-68 +181 +182 +182-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:17-76 +182-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:173:27-73 +183 +184 +185 +186 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:220:13-222:54 +187 android:name="android.app.searchable" +187-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:221:17-54 +188 android:resource="@xml/searchable" /> +188-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:222:17-51 +189 +195 +196 +197 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:231:9-234:43 +198 android:name="net.micode.notes.data.NotesProvider" +198-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:232:13-63 +199 android:authorities="micode_notes" +199-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:233:13-47 +200 android:multiprocess="true" /> +200-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:234:13-40 +201 +207 +208 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:242:9-272:20 +209 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +209-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:243:13-57 +210 android:label="@string/app_widget2x2" > +210-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:244:13-50 +211 +212 +218 +218-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:251:13-264:29 +219 +219-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:252:17-84 +219-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:252:25-81 +220 +221 +221-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:17-85 +221-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:25-82 +222 +223 +223-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:260:17-85 +223-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:260:25-82 +224 +225 +226 +227 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:266:13-268:58 +228 android:name="android.appwidget.provider" +228-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:267:17-58 +229 android:resource="@xml/widget_2x_info" /> +229-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:268:17-55 +230 +231 +232 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:273:9-295:20 +233 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +233-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:274:13-57 +234 android:label="@string/app_widget4x4" > +234-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:275:13-50 +235 +236 +240 +240-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:251:13-264:29 +241 +241-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:252:17-84 +241-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:252:25-81 +242 +242-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:17-85 +242-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:25-82 +243 +243-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:260:17-85 +243-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:260:25-82 +244 +245 +246 +247 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:266:13-268:58 +248 android:name="android.appwidget.provider" +248-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:267:17-58 +249 android:resource="@xml/widget_4x_info" /> +249-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:268:17-55 +250 +251 +252 +252-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:297:9-304:20 +252-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:297:19-55 +253 +253-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:298:13-300:29 +254 +254-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:299:17-79 +254-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:299:25-76 +255 +256 +257 +258 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:306:9-312:20 +259 android:name="net.micode.notes.ui.AlarmReceiver" +259-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:307:13-61 +260 android:process=":remote" > +260-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:308:13-38 +261 +262 +263 +264 +265 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:314:9-323:20 +266 android:name="net.micode.notes.ui.AlarmAlertActivity" +266-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:315:13-50 +267 android:label="@string/app_name" +267-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:316:13-45 +268 android:launchMode="singleInstance" +268-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:317:13-48 +269 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +269-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:318:13-75 +270 +271 +275 +276 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:325:9-333:20 +277 android:name="net.micode.notes.ui.NotesPreferenceActivity" +277-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:326:13-71 +278 android:label="@string/preferences_title" +278-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:327:13-54 +279 android:launchMode="singleTop" +279-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:328:13-43 +280 android:theme="@android:style/Theme.Holo.Light" > +280-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:329:13-60 +281 +282 +283 +284 +285 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:335:9-342:19 +286 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +286-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:336:13-74 +287 android:exported="false" > +287-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:337:13-37 +288 +289 +293 +294 +295 E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:344:9-346:52 +296 android:name="android.app.default_searchable" +296-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:345:13-58 +297 android:value=".ui.NoteEditActivity" /> +297-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:346:13-49 +298 +302 +303 +304 diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar new file mode 100644 index 00000000..bd7ee902 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 00000000..5a5960cb --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml new file mode 100644 index 00000000..5a5960cb --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json new file mode 100644 index 00000000..a56d03a4 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat new file mode 100644 index 00000000..802be344 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat new file mode 100644 index 00000000..2d9ddb41 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat new file mode 100644 index 00000000..a783113c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat new file mode 100644 index 00000000..a9576bb4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat new file mode 100644 index 00000000..06928760 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat new file mode 100644 index 00000000..a5cd8ef1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat new file mode 100644 index 00000000..b5e283d6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat new file mode 100644 index 00000000..74c78c03 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat new file mode 100644 index 00000000..54369265 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat new file mode 100644 index 00000000..4d95a89b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat new file mode 100644 index 00000000..ce52bc13 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat new file mode 100644 index 00000000..b376e80f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 00000000..b8cc9ab2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat new file mode 100644 index 00000000..2af509b4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 00000000..f3a6c603 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat new file mode 100644 index 00000000..8828ae3a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 00000000..8a98c38e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat new file mode 100644 index 00000000..4c9bdf9a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat new file mode 100644 index 00000000..14225733 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat new file mode 100644 index 00000000..704993a2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 00000000..9a4b9890 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat new file mode 100644 index 00000000..11857a49 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat new file mode 100644 index 00000000..2227ab8a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat new file mode 100644 index 00000000..27a84125 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_imageeee.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_imageeee.png.flat new file mode 100644 index 00000000..5fb6f041 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_imageeee.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat new file mode 100644 index 00000000..0bda0bc4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat new file mode 100644 index 00000000..75f3cd0f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 00000000..f82dd6db Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 00000000..d57fe3a8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat new file mode 100644 index 00000000..683b6f18 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 00000000..e75e0563 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat new file mode 100644 index 00000000..3f892439 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat new file mode 100644 index 00000000..6b24efc6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat new file mode 100644 index 00000000..4f7fa61a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat new file mode 100644 index 00000000..725a39fd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 00000000..f7b11e83 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat new file mode 100644 index 00000000..82de7394 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 00000000..224f6990 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 00000000..6c1bc358 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat new file mode 100644 index 00000000..d29584e6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 00000000..394cf644 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat new file mode 100644 index 00000000..6a55c1fe Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 00000000..d3094aa6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat new file mode 100644 index 00000000..a3558dd0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat new file mode 100644 index 00000000..e9e827a8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 00000000..812fbcea Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat new file mode 100644 index 00000000..c4a34ba5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 00000000..a0b29638 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat new file mode 100644 index 00000000..0d0a7c73 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat new file mode 100644 index 00000000..7b7b9c90 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat new file mode 100644 index 00000000..ac802ba1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat new file mode 100644 index 00000000..ee82d6c5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat new file mode 100644 index 00000000..8d48e8e9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat new file mode 100644 index 00000000..dbeee0bb Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat new file mode 100644 index 00000000..e55822d3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat new file mode 100644 index 00000000..be2aeddd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat new file mode 100644 index 00000000..8f6daec1 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 00000000..87aeb207 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat new file mode 100644 index 00000000..825e93dd Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat new file mode 100644 index 00000000..e039b026 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat new file mode 100644 index 00000000..a2eb42b4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat new file mode 100644 index 00000000..c7eff781 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat new file mode 100644 index 00000000..decfaad7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat new file mode 100644 index 00000000..7c3cf3a8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat new file mode 100644 index 00000000..1c75d026 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat new file mode 100644 index 00000000..e82e879d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat new file mode 100644 index 00000000..366fd2c0 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat new file mode 100644 index 00000000..ac23b116 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat new file mode 100644 index 00000000..8b4b3a5b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat new file mode 100644 index 00000000..5fdf154a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat new file mode 100644 index 00000000..f2fd34a9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat new file mode 100644 index 00000000..16cf2ef8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat new file mode 100644 index 00000000..afee10fe Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat new file mode 100644 index 00000000..b3d34f55 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_login.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_login.xml.flat new file mode 100644 index 00000000..326a74b8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_login.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat new file mode 100644 index 00000000..1ccaf811 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat new file mode 100644 index 00000000..544cfb67 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat new file mode 100644 index 00000000..2ae3d38e Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat new file mode 100644 index 00000000..b092461c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat new file mode 100644 index 00000000..ef9a6900 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat new file mode 100644 index 00000000..48aa9605 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat new file mode 100644 index 00000000..4b1a1cd5 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat new file mode 100644 index 00000000..c923e719 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat new file mode 100644 index 00000000..bd9974e8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat new file mode 100644 index 00000000..c89b09d6 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat new file mode 100644 index 00000000..504fc9c8 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat new file mode 100644 index 00000000..c2c61cc2 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat new file mode 100644 index 00000000..9473797c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat new file mode 100644 index 00000000..6e3c761d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat new file mode 100644 index 00000000..60513de4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat new file mode 100644 index 00000000..4e4f099b Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat new file mode 100644 index 00000000..e25eb7b7 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat new file mode 100644 index 00000000..608c6fd4 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat new file mode 100644 index 00000000..c1d0308f Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat new file mode 100644 index 00000000..0bf7afde Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat new file mode 100644 index 00000000..3d4a3b7a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat new file mode 100644 index 00000000..e36a3382 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat new file mode 100644 index 00000000..c4dc076d Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat new file mode 100644 index 00000000..b960844a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat new file mode 100644 index 00000000..1605ca0a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 00000000..2e7d1272 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "130,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "7023,3936,3869,3795,3744,1216,1257,1306,6565,6611,1029,6968,6917,1595,4308,4377,4248,4182,4118,5052,4991,4927,4511,3307,1768,1822,4566,4010,6669,3684,1168,984,891,937,1075,846,3467,2206,2493,2744,2260,3246,3192,3140,2941,2892,2796,2845,2988,3036,2537,3624,3087,3511,2449,2696,2639,2583,3411,2404,3368,2311,2353,3564,1716,2027,2125,1979,2077,1931,1885,1543,1489,5434,5374,5577,6490,5893,5823,5958,6037,6222,6148,5510,5767,5635,5701,5324,6327,6411,1122,6878,6769,6720,6815,1658,4455,4867,5167,5108,5235,4818,4772,4723,4671,1355,1422", + "endLines": "132,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32", + "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7197,4004,3930,3863,3789,1251,1300,1349,6605,6663,1069,7017,6962,1652,4371,4449,4302,4242,4176,5102,5046,4985,4560,3362,1816,1879,4646,4086,6714,3738,1208,1023,931,978,1116,885,3505,2254,2531,2790,2305,3301,3240,3186,2982,2935,2839,2886,3030,3081,2577,3678,3134,3558,2487,2738,2690,2633,3461,2443,3405,2347,2398,3618,1762,2071,2169,2021,2119,1973,1925,1589,1537,5504,5428,5629,6559,5952,5887,6031,6142,6321,6216,5571,5817,5695,5761,5368,6405,6484,1162,6911,6809,6763,6872,1710,4505,4921,5229,5161,5292,4861,4812,4766,4717,1416,1483" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,929,983,1033,1095,1163,1240,1299,1364,1427,1482,1542,1605,1659,1719,1772,1834,1919,2000,2050,2109,2154,2198,2243,2289,2335,2379,2422,2475,2518,2569,2619,2679,2732,2783,2829,2877,2925,2971,3018,3068,3113,3172,3224,3276,3319,3366,3422,3477,3532,3576,3618,3659,3709,3768,3819,3868,3917,3964,4011,4058,4103,4154,4207,4282,4341,4398,4472,4536,4605,4683,4793,4897,4970,5036,5091,5156,5221,5270,5353,5431,5476,5514,5559,5607,5669,5726,5781,5840,5907,5965,6027,6075,6120,6168,6219,6285", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,924,978,1028,1090,1158,1235,1294,1359,1422,1477,1537,1600,1654,1714,1767,1829,1914,1995,2045,2104,2149,2193,2238,2284,2330,2374,2417,2470,2513,2564,2614,2674,2727,2778,2824,2872,2920,2966,3013,3063,3108,3167,3219,3271,3314,3361,3417,3472,3527,3571,3613,3654,3704,3763,3814,3863,3912,3959,4006,4053,4098,4149,4202,4277,4336,4393,4467,4531,4600,4678,4788,4892,4965,5031,5086,5151,5216,5265,5348,5426,5471,5509,5554,5602,5664,5721,5776,5835,5902,5960,6022,6070,6115,6163,6214,6280,6346" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "133,137,141,144,147,151,155,159,163,167,171", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8540,8744,8955,9119,9279,9462,9647,9832,10035,10241,10424", + "endLines": "136,140,143,146,150,154,158,162,166,170,174", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8739,8950,9114,9274,9457,9642,9827,10030,10236,10419,10620" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "138,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8583,4417,4681,4584,4514,1293,1337,1390,8071,8121,1077,8524,8472,1755,5141,5236,5069,4984,4900,6115,6031,5928,5414,2490,2438,3908,1962,2016,5476,2585,4765,8185,4345,1238,1029,924,976,1132,867,4096,2645,2966,3272,2704,3836,3774,3716,3490,3437,3332,3386,3541,3592,3014,4278,3653,4146,2918,3216,3127,3068,4033,2867,3987,2762,2806,4210,1906,2231,2341,2183,2287,2126,2077,1699,1645,6578,6510,6822,7972,7191,7109,7266,7356,7600,7520,6663,6739,7049,6887,6968,6454,7745,7868,1185,8430,8301,8243,8355,1840,5345,5841,6252,6182,6333,5781,5725,5662,5601,1443,1554", + "endLines": "142,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33", + "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8991,4508,4759,4675,4578,1331,1384,1437,8115,8179,1126,8577,8518,1834,5230,5339,5135,5063,4978,6176,6109,6025,5470,2547,2484,3981,2010,2071,5576,2639,4862,8235,4411,1285,1071,970,1023,1179,918,4140,2698,3008,3326,2756,3902,3830,3768,3535,3484,3380,3431,3586,3647,3062,4339,3710,4204,2960,3266,3210,3121,4090,2912,4027,2800,2861,4272,1956,2281,2389,2225,2335,2177,2120,1749,1693,6657,6572,6881,8063,7260,7185,7350,7514,7739,7594,6733,6816,7103,6962,7043,6504,7862,7966,1232,8466,8349,8295,8424,1900,5408,5922,6327,6246,6422,5835,5775,5719,5656,1548,1639" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3807,3854,3913,3970,4041,4102,4159,4209,4261,4314,4364,4414,4474,4527,4593,4655,4718,4765,4820,4908,4966,5028,5078,5123,5166,5226,5293,5348,5403,5456,5503,5556,5612,5660,5715,5768,5852,5919,5983,6079,6153,6234,6323,6486,6630,6709,6784,6866,6925,7005,7085,7140,7262,7365,7417,7458,7511,7568,7642,7707,7775,7861,7941,8010,8104,8163,8218,8280,8340,8450", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", + "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3802,3849,3908,3965,4036,4097,4154,4204,4256,4309,4359,4409,4469,4522,4588,4650,4713,4760,4815,4903,4961,5023,5073,5118,5161,5221,5288,5343,5398,5451,5498,5551,5607,5655,5710,5763,5847,5914,5978,6074,6148,6229,6318,6481,6625,6704,6779,6861,6920,7000,7080,7135,7257,7360,7412,7453,7506,7563,7637,7702,7770,7856,7936,8005,8099,8158,8213,8275,8335,8445,8535" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "131,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6999,4017,3950,3876,3825,1216,1257,1306,6539,6585,1029,6944,6893,1595,4281,4350,4221,4154,4090,5024,4963,4899,4484,3388,1768,1822,4539,2175,6643,3765,1168,984,891,937,1075,846,3548,2287,2574,2825,2341,3327,3273,3221,3022,2973,2877,2926,3069,3117,2618,3705,3168,3592,2530,2777,2720,2664,3492,2485,3449,2392,2434,3645,1716,2027,2125,1979,2077,1931,1885,1543,1489,5406,5346,5549,6462,5865,5795,5930,6009,6194,6120,5482,5739,5607,5673,5296,6299,6383,1122,6854,6745,6696,6791,1658,4428,4839,5139,5080,5207,4790,4744,4695,4643,1355,1422", + "endLines": "133,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32", + "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7173,4084,4011,3944,3870,1251,1300,1349,6579,6637,1069,6993,6938,1652,4344,4422,4275,4215,4148,5074,5018,4957,4533,3443,1816,1879,4618,2250,6688,3819,1208,1023,931,978,1116,885,3586,2335,2612,2871,2386,3382,3321,3267,3063,3016,2920,2967,3111,3162,2658,3759,3215,3639,2568,2819,2771,2714,3542,2524,3486,2428,2479,3699,1762,2071,2169,2021,2119,1973,1925,1589,1537,5476,5400,5601,6531,5924,5859,6003,6114,6293,6188,5543,5789,5667,5733,5340,6377,6456,1162,6887,6785,6739,6848,1710,4478,4893,5201,5133,5264,4833,4784,4738,4689,1416,1483" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,928,982,1032,1094,1162,1239,1298,1364,1427,1482,1542,1605,1659,1719,1772,1834,1918,1998,2048,2107,2152,2196,2241,2287,2333,2377,2420,2473,2516,2567,2617,2677,2730,2781,2827,2875,2923,2969,3016,3066,3111,3170,3222,3274,3317,3364,3420,3475,3530,3574,3616,3657,3707,3766,3817,3866,3915,3962,4009,4056,4101,4152,4205,4280,4339,4396,4470,4534,4603,4681,4791,4895,4968,5034,5089,5154,5219,5268,5351,5429,5474,5512,5557,5605,5667,5724,5779,5838,5905,5963,6025,6073,6118,6166,6217,6283", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,923,977,1027,1089,1157,1234,1293,1359,1422,1477,1537,1600,1654,1714,1767,1829,1913,1993,2043,2102,2147,2191,2236,2282,2328,2372,2415,2468,2511,2562,2612,2672,2725,2776,2822,2870,2918,2964,3011,3061,3106,3165,3217,3269,3312,3359,3415,3470,3525,3569,3611,3652,3702,3761,3812,3861,3910,3957,4004,4051,4096,4147,4200,4275,4334,4391,4465,4529,4598,4676,4786,4890,4963,5029,5084,5149,5214,5263,5346,5424,5469,5507,5552,5600,5662,5719,5774,5833,5900,5958,6020,6068,6113,6161,6212,6278,6344" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 00000000..022213fd --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "130,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "7023,3936,3869,3795,3744,1216,1257,1306,6565,6611,1029,6968,6917,1595,4308,4377,4248,4182,4118,5052,4991,4927,4511,3307,1768,1822,4566,4010,6669,3684,1168,984,891,937,1075,846,3467,2206,2493,2744,2260,3246,3192,3140,2941,2892,2796,2845,2988,3036,2537,3624,3087,3511,2449,2696,2639,2583,3411,2404,3368,2311,2353,3564,1716,2027,2125,1979,2077,1931,1885,1543,1489,5434,5374,5577,6490,5893,5823,5958,6037,6222,6148,5510,5767,5635,5701,5324,6327,6411,1122,6878,6769,6720,6815,1658,4455,4867,5167,5108,5235,4818,4772,4723,4671,1355,1422", + "endLines": "132,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32", + "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7197,4004,3930,3863,3789,1251,1300,1349,6605,6663,1069,7017,6962,1652,4371,4449,4302,4242,4176,5102,5046,4985,4560,3362,1816,1879,4646,4086,6714,3738,1208,1023,931,978,1116,885,3505,2254,2531,2790,2305,3301,3240,3186,2982,2935,2839,2886,3030,3081,2577,3678,3134,3558,2487,2738,2690,2633,3461,2443,3405,2347,2398,3618,1762,2071,2169,2021,2119,1973,1925,1589,1537,5504,5428,5629,6559,5952,5887,6031,6142,6321,6216,5571,5817,5695,5761,5368,6405,6484,1162,6911,6809,6763,6872,1710,4505,4921,5229,5161,5292,4861,4812,4766,4717,1416,1483" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,929,983,1033,1095,1163,1240,1299,1364,1427,1482,1542,1605,1659,1719,1772,1834,1919,2000,2050,2109,2154,2198,2243,2289,2335,2379,2422,2475,2518,2569,2619,2679,2732,2783,2829,2877,2925,2971,3018,3068,3113,3172,3224,3276,3319,3366,3422,3477,3532,3576,3618,3659,3709,3768,3819,3868,3917,3964,4011,4058,4103,4154,4207,4282,4341,4398,4472,4536,4605,4683,4793,4897,4970,5036,5091,5156,5221,5270,5353,5431,5476,5514,5559,5607,5669,5726,5781,5840,5907,5965,6027,6075,6120,6168,6219,6285", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,924,978,1028,1090,1158,1235,1294,1359,1422,1477,1537,1600,1654,1714,1767,1829,1914,1995,2045,2104,2149,2193,2238,2284,2330,2374,2417,2470,2513,2564,2614,2674,2727,2778,2824,2872,2920,2966,3013,3063,3108,3167,3219,3271,3314,3361,3417,3472,3527,3571,3613,3654,3704,3763,3814,3863,3912,3959,4006,4053,4098,4149,4202,4277,4336,4393,4467,4531,4600,4678,4788,4892,4965,5031,5086,5151,5216,5265,5348,5426,5471,5509,5554,5602,5664,5721,5776,5835,5902,5960,6022,6070,6115,6163,6214,6280,6346" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 00000000..9ee5e123 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "131,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6999,4017,3950,3876,3825,1216,1257,1306,6539,6585,1029,6944,6893,1595,4281,4350,4221,4154,4090,5024,4963,4899,4484,3388,1768,1822,4539,2175,6643,3765,1168,984,891,937,1075,846,3548,2287,2574,2825,2341,3327,3273,3221,3022,2973,2877,2926,3069,3117,2618,3705,3168,3592,2530,2777,2720,2664,3492,2485,3449,2392,2434,3645,1716,2027,2125,1979,2077,1931,1885,1543,1489,5406,5346,5549,6462,5865,5795,5930,6009,6194,6120,5482,5739,5607,5673,5296,6299,6383,1122,6854,6745,6696,6791,1658,4428,4839,5139,5080,5207,4790,4744,4695,4643,1355,1422", + "endLines": "133,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32", + "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7173,4084,4011,3944,3870,1251,1300,1349,6579,6637,1069,6993,6938,1652,4344,4422,4275,4215,4148,5074,5018,4957,4533,3443,1816,1879,4618,2250,6688,3819,1208,1023,931,978,1116,885,3586,2335,2612,2871,2386,3382,3321,3267,3063,3016,2920,2967,3111,3162,2658,3759,3215,3639,2568,2819,2771,2714,3542,2524,3486,2428,2479,3699,1762,2071,2169,2021,2119,1973,1925,1589,1537,5476,5400,5601,6531,5924,5859,6003,6114,6293,6188,5543,5789,5667,5733,5340,6377,6456,1162,6887,6785,6739,6848,1710,4478,4893,5201,5133,5264,4833,4784,4738,4689,1416,1483" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,928,982,1032,1094,1162,1239,1298,1364,1427,1482,1542,1605,1659,1719,1772,1834,1918,1998,2048,2107,2152,2196,2241,2287,2333,2377,2420,2473,2516,2567,2617,2677,2730,2781,2827,2875,2923,2969,3016,3066,3111,3170,3222,3274,3317,3364,3420,3475,3530,3574,3616,3657,3707,3766,3817,3866,3915,3962,4009,4056,4101,4152,4205,4280,4339,4396,4470,4534,4603,4681,4791,4895,4968,5034,5089,5154,5219,5268,5351,5429,5474,5512,5557,5605,5667,5724,5779,5838,5905,5963,6025,6073,6118,6166,6217,6283", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114", + "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,923,977,1027,1089,1157,1234,1293,1359,1422,1477,1537,1600,1654,1714,1767,1829,1913,1993,2043,2102,2147,2191,2236,2282,2328,2372,2415,2468,2511,2562,2612,2672,2725,2776,2822,2870,2918,2964,3011,3061,3106,3165,3217,3269,3312,3359,3415,3470,3525,3569,3611,3652,3702,3761,3812,3861,3910,3957,4004,4051,4096,4147,4200,4275,4334,4391,4465,4529,4598,4676,4786,4890,4963,5029,5084,5149,5214,5263,5346,5424,5469,5507,5552,5600,5662,5719,5774,5833,5900,5958,6020,6068,6113,6161,6212,6278,6344" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json new file mode 100644 index 00000000..0221b11c --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "133,137,141,144,147,151,155,159,163,167,171", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8540,8744,8955,9119,9279,9462,9647,9832,10035,10241,10424", + "endLines": "136,140,143,146,150,154,158,162,166,170,174", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8739,8950,9114,9274,9457,9642,9827,10030,10236,10419,10620" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "138,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8583,4417,4681,4584,4514,1293,1337,1390,8071,8121,1077,8524,8472,1755,5141,5236,5069,4984,4900,6115,6031,5928,5414,2490,2438,3908,1962,2016,5476,2585,4765,8185,4345,1238,1029,924,976,1132,867,4096,2645,2966,3272,2704,3836,3774,3716,3490,3437,3332,3386,3541,3592,3014,4278,3653,4146,2918,3216,3127,3068,4033,2867,3987,2762,2806,4210,1906,2231,2341,2183,2287,2126,2077,1699,1645,6578,6510,6822,7972,7191,7109,7266,7356,7600,7520,6663,6739,7049,6887,6968,6454,7745,7868,1185,8430,8301,8243,8355,1840,5345,5841,6252,6182,6333,5781,5725,5662,5601,1443,1554", + "endLines": "142,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33", + "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8991,4508,4759,4675,4578,1331,1384,1437,8115,8179,1126,8577,8518,1834,5230,5339,5135,5063,4978,6176,6109,6025,5470,2547,2484,3981,2010,2071,5576,2639,4862,8235,4411,1285,1071,970,1023,1179,918,4140,2698,3008,3326,2756,3902,3830,3768,3535,3484,3380,3431,3586,3647,3062,4339,3710,4204,2960,3266,3210,3121,4090,2912,4027,2800,2861,4272,1956,2281,2389,2225,2335,2177,2120,1749,1693,6657,6572,6881,8063,7260,7185,7350,7514,7739,7594,6733,6816,7103,6962,7043,6504,7862,7966,1232,8466,8349,8295,8424,1900,5408,5922,6327,6246,6422,5835,5775,5719,5656,1548,1639" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3807,3854,3913,3970,4041,4102,4159,4209,4261,4314,4364,4414,4474,4527,4593,4655,4718,4765,4820,4908,4966,5028,5078,5123,5166,5226,5293,5348,5403,5456,5503,5556,5612,5660,5715,5768,5852,5919,5983,6079,6153,6234,6323,6486,6630,6709,6784,6866,6925,7005,7085,7140,7262,7365,7417,7458,7511,7568,7642,7707,7775,7861,7941,8010,8104,8163,8218,8280,8340,8450", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", + "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3802,3849,3908,3965,4036,4097,4154,4204,4256,4309,4359,4409,4469,4522,4588,4650,4713,4760,4815,4903,4961,5023,5073,5118,5161,5221,5288,5343,5398,5451,5498,5551,5607,5655,5710,5763,5847,5914,5978,6074,6148,6229,6318,6481,6625,6704,6779,6861,6920,7000,7080,7135,7257,7360,7412,7453,7506,7563,7637,7702,7770,7856,7936,8005,8099,8158,8213,8275,8335,8445,8535" + } + }, + { + "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json new file mode 100644 index 00000000..50d2e6ef --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -0,0 +1,390 @@ +[ + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_imageeee.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/imageeee.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_login.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/login.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + } +] \ No newline at end of file