diff --git a/doc/~$资源-开源软件维护方案及成果模板.docx b/doc/~$资源-开源软件维护方案及成果模板.docx new file mode 100644 index 0000000..ce626e2 Binary files /dev/null and b/doc/~$资源-开源软件维护方案及成果模板.docx differ diff --git a/doc/实践资源-开源软件维护方案及成果模板.docx b/doc/实践资源-开源软件维护方案及成果模板.docx new file mode 100644 index 0000000..09a5a0d Binary files /dev/null and b/doc/实践资源-开源软件维护方案及成果模板.docx differ diff --git a/doc/软件工程汇报.pptx b/doc/软件工程汇报.pptx new file mode 100644 index 0000000..d8946c5 Binary files /dev/null and b/doc/软件工程汇报.pptx differ diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/.gradle/7.3.3/executionHistory/executionHistory.bin index fc87926..89ad804 100644 Binary files a/src/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/.gradle/7.3.3/executionHistory/executionHistory.lock index 02ff183..32b98be 100644 Binary files a/src/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/.gradle/7.3.3/fileHashes/fileHashes.bin index 9dfc229..d6dbae2 100644 Binary files a/src/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/.gradle/7.3.3/fileHashes/fileHashes.lock index 9554d0e..41cef79 100644 Binary files a/src/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 648f815..1b873fd 100644 Binary files a/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 731731c..cd126d5 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index 5e687bb..aefd738 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index de326e2..f437aa0 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml index 8c1805d..e46875b 100644 --- a/src/.idea/deploymentTargetDropDown.xml +++ b/src/.idea/deploymentTargetDropDown.xml @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml index 4d53a45..cb51b25 100644 --- a/src/.idea/misc.xml +++ b/src/.idea/misc.xml @@ -4,6 +4,27 @@ diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml new file mode 100644 index 0000000..f669a0e --- /dev/null +++ b/src/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/0/2/0268ec648e2fc0139b30ed13396174b7392c1ae2 b/src/.idea/sonarlint/issuestore/0/2/0268ec648e2fc0139b30ed13396174b7392c1ae2 new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c new file mode 100644 index 0000000..f648f1a --- /dev/null +++ b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c @@ -0,0 +1,48 @@ + +t +java:S2293X"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ +t +java:S2293a"YReplace the type specification in this constructor call with the diamond operator ("<>").( +t +java:S2293j"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293r"YReplace the type specification in this constructor call with the diamond operator ("<>").( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +D +java:S1604"(Make this anonymous inner class a lambda(ʜ +? +java:S1604"(Make this anonymous inner class a lambda(ά +? +java:S1604"(Make this anonymous inner class a lambda(ߒ +q +java:S1104O"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ +r +java:S1104Q"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න +r +java:S1104S"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( +s +java:S1104U"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( +O +java:S3516"9Refactor this method to not always return the same value.(l +n java:S116"XRename this field "PHOTO_REQUEST" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +8 +java:S1170"!Make this final field static too.( +n +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +n +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ +K +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ +N +java:S1135"2Complete the task associated to this TODO comment.( +8 +java:S1116"Remove this empty statement.( +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +8 +java:S1116"Remove this empty statement.( +d +java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( +H +java:S1068"1Remove this unused "PHOTO_REQUEST" private field.( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/5/8/58052a8597c5f01595e1c849728bcae66c27a1a6 b/src/.idea/sonarlint/issuestore/5/8/58052a8597c5f01595e1c849728bcae66c27a1a6 new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad b/src/.idea/sonarlint/issuestore/5/d/5dfe6902d8ec740690f88d644e74362c3be08fad new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af b/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 b/src/.idea/sonarlint/issuestore/d/a/da57ce446af85bbd9aefee65e969869f0cff78b0 new file mode 100644 index 0000000..e69de29 diff --git a/src/.idea/sonarlint/issuestore/index.pb b/src/.idea/sonarlint/issuestore/index.pb index db1efda..0123b36 100644 --- a/src/.idea/sonarlint/issuestore/index.pb +++ b/src/.idea/sonarlint/issuestore/index.pb @@ -1,7 +1,23 @@ p @app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 +l + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index ff47be4..57c841a 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdk 14 + compileSdk 21 buildToolsVersion "33.0.0" defaultConfig { applicationId "net.micode.notes" - minSdkVersion 14 - targetSdkVersion 14 + minSdkVersion 21 + targetSdkVersion 21 } buildTypes { diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 16920f9..1e89f9c 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 767aac4..89bf897 100644 Binary files a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 3832999..36598a2 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 078a1ed..299bfd0 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 2b7b45a..601f245 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 4682488..e56e978 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin index 1a0e110..cfb8243 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin index 44df1f7..50d303f 100644 Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_0/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_0/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_0/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_1/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_1/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_1/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_2/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_2/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_2/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_3/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_3/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_3/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_4/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_4/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_4/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_5/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_5/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_5/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_6/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_6/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_6/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_6/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_7/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_7/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_701a2129c970653ec6f48023806e07e502fb9980ef2a89f0e1a889841464cb2d_bucket_7/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_1dc6c81243807e8d07a19afb92cac86edea35bb03f58b2029ca162fca07c95e7_bucket_7/graph.bin diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 0595070..74ef4a7 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex new file mode 100644 index 0000000..6713bcd Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex new file mode 100644 index 0000000..4c589dc Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex new file mode 100644 index 0000000..855fc54 Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex new file mode 100644 index 0000000..135883c Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex new file mode 100644 index 0000000..1c82d3c Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex new file mode 100644 index 0000000..d4ac96c Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex new file mode 100644 index 0000000..b757943 Binary files /dev/null and b/src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index aa73e06..7775257 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index e983be7..e7ec942 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,103 @@ -#Mon Sep 26 17:25:05 CST 2022 -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Sun Oct 30 16:30:35 CST 2022 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_2.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_2.jpg.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_3.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_3.jpg.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_1.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_1.jpg.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_wall.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_wall.jpg.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_wood.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_wood.jpg.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_0.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_0.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background_4.jpg=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background_4.jpg.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\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=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index c71fd03..0000000 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%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 - 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 - 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 - 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/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index ede8b91..7167dab 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 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 + #335b5b5b33sp26sp20sp17sp14spNotesNotes 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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 7690809..b0aea24 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 48099a9..11cd2a0 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index d43fa3b..10729bc 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 641360d..cd8b6e5 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,22 @@ -#Mon Sep 26 17:25:12 CST 2022 -base.0=D\:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Sun Oct 30 16:39:13 CST 2022 +path.4=15/classes.dex +path.3=13/classes.dex +path.2=12/classes.dex +path.1=11/classes.dex +path.6=5/classes.dex +path.5=4/classes.dex +path.0=0/classes.dex +base.4=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.3=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.2=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.1=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.0=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +renamed.3=classes4.dex +renamed.2=classes3.dex +renamed.1=classes2.dex renamed.0=classes.dex -path.0=classes.dex +renamed.6=classes7.dex +renamed.5=classes6.dex +base.6=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +renamed.4=classes5.dex +base.5=D\:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index ba43cf2..ec9f748 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 976265d..cbeedca 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index f4f4ad1..4ad6d36 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index e9f5b68..a44b3a2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 34b5c02..2f402a0 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 595f36d..9b7b4db 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index ff95cab..df75a15 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 5012ef9..615cdba 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 4064ac0..394106f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 19383ea..41af6ff 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 29d4cf9..7b0a0d7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class new file mode 100644 index 0000000..9e58852 Binary files /dev/null and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 432dd4e..9429693 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index ad7cce4..fdfe575 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 1588b99..1da050d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index d4e78a1..eddbdce 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index e7ac3f6..10c9d43 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 11e437f..f056de2 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index df2d946..34e99e9 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index dbd12f5..78c3fcb 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 4981765..37b774c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 64f15ff..b248b92 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 817bf17..69d25d7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 77d2608..f04f716 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index b979434..08f3556 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index e8eaf4b..6df04a1 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index b243892..ab46e57 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 06036f1..0b05417 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 08ab9fa..4ccf38e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index ff543cd..4e2e610 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index d42da3c..17cfcb1 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 9ec847b..0d4836a 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 5053337..efd2b98 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index f6e1ed8..df4f5a7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index fabc84f..9bfa2a5 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index fca7e1b..78e3b93 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,252 +20,253 @@ 20 android:versionName="0.1" > 21 22 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 +23 android:minSdkVersion="21" +23-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:15-41 +24 android:targetSdkVersion="21" /> +24-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:35:5-148:19 +36-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:36:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" -39-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:38:9-41 40 android:testOnly="true" > 41 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:38:9-50:20 +41-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:39:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:40:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:41:13-74 44 android:label="@string/app_name" -44-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:42:13-45 45 android:launchMode="singleTop" -45-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:43:13-43 46 android:theme="@style/NoteTheme" -46-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:44:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:44:13-52 +47-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:45:13-52 48 -48-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:46:13-49:29 +48-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:47:13-50:29 49 -49-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:47:17-69 -49-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:47:25-66 +49-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:48:17-69 +49-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:48:25-66 50 51 -51-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:48:17-77 -51-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:48:27-74 +51-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:49:17-77 +51-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:49:27-74 52 53 54 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:52:9-80:20 +54-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:53:9-81:20 55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:53:13-48 +55-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:54:13-48 56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:54:13-74 +56-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:55:13-74 57 android:launchMode="singleTop" -57-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:55:13-43 +57-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:56:13-43 58 android:theme="@style/NoteTheme" > -58-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:56:13-45 -59 -59-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:58:13-63:29 +58-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:57:13-45 +59 +59-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:59:13-64:29 +59-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:59:28-49 60 -60-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:59:17-69 -60-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:59:25-66 +60-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:60:17-69 +60-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:60:25-66 61 62 -62-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:17-76 -62-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:27-73 +62-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:17-76 +62-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:27-73 63 64 -64-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:17-78 -64-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:23-75 +64-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:17-78 +64-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:23-75 65 -65-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:17-78 -65-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:23-75 +65-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:23-75 66 67 -67-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:65:13-70:29 +67-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:66:13-71:29 68 -68-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:66:17-79 -68-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:66:25-76 +68-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:67:17-79 +68-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:67:25-76 69 70 -70-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:17-76 -70-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:27-73 +70-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:17-76 +70-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:27-73 71 72 -72-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:17-78 -72-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:23-75 +72-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:17-78 +72-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:23-75 73 -73-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:17-78 -73-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:23-75 +73-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:23-75 74 75 -75-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:72:13-75:29 +75-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:73:13-76:29 76 -76-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:73:17-71 -76-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:73:25-68 +76-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:74:17-71 +76-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:74:25-68 77 78 -78-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:17-76 -78-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:27-73 +78-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:17-76 +78-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:27-73 79 80 81 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:77:13-79:54 +81-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:78:13-80:54 82 android:name="android.app.searchable" -82-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:78:17-54 +82-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:79:17-54 83 android:resource="@xml/searchable" /> -83-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:79:17-51 +83-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:80:17-51 84 85 86 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:82:9-85:43 +86-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:83:9-86:43 87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:83:13-63 +87-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:84:13-63 88 android:authorities="micode_notes" -88-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:84:13-47 +88-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:85:13-47 89 android:multiprocess="true" /> -89-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:85:13-40 +89-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:86:13-40 90 91 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:87:9-99:20 +91-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:88:9-100:20 92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:88:13-57 +92-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:89:13-57 93 android:label="@string/app_widget2x2" > -93-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:89:13-50 +93-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:90:13-50 94 -94-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:90:13-94:29 +94-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:91:13-95:29 95 -95-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:17-84 -95-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:25-81 +95-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:17-84 +95-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:25-81 96 -96-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:17-85 -96-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:25-82 +96-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:17-85 +96-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:25-82 97 -97-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:17-85 +97-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:25-82 98 99 100 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:96:13-98:58 +100-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:97:13-99:58 101 android:name="android.appwidget.provider" -101-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:97:17-58 +101-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:98:17-58 102 android:resource="@xml/widget_2x_info" /> -102-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:98:17-55 +102-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:99:17-55 103 104 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:100:9-113:20 +104-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:101:9-114:20 105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:101:13-57 +105-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:102:13-57 106 android:label="@string/app_widget4x4" > -106-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:102:13-50 +106-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:103:13-50 107 -107-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:90:13-94:29 +107-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:91:13-95:29 108 -108-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:17-84 -108-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:25-81 +108-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:17-84 +108-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:25-81 109 -109-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:17-85 -109-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:25-82 +109-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:17-85 +109-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:25-82 110 -110-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:17-85 +110-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:25-82 111 112 113 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:96:13-98:58 +113-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:97:13-99:58 114 android:name="android.appwidget.provider" -114-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:97:17-58 +114-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:98:17-58 115 android:resource="@xml/widget_4x_info" /> -115-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:98:17-55 +115-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:99:17-55 116 117 -117-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:115:9-119:20 -117-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:115:19-55 +117-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:116:9-120:20 +117-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:116:19-55 118 -118-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:116:13-118:29 +118-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:117:13-119:29 119 -119-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:117:17-79 -119-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:117:25-76 +119-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:118:17-79 +119-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:118:25-76 120 121 122 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:121:9-124:20 +122-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:122:9-125:20 123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:122:13-61 +123-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:123:13-61 124 android:process=":remote" > -124-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:123:13-38 +124-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:124:13-38 125 126 127 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:126:9-131:20 +127-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:127:9-132:20 128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:127:13-50 +128-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:128:13-50 129 android:label="@string/app_name" -129-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:128:13-45 +129-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:129:13-45 130 android:launchMode="singleInstance" -130-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:129:13-48 +130-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:130:13-48 131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:130:13-75 +131-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:131:13-75 132 133 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:133:9-138:20 +133-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:134:9-139:20 134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:134:13-71 +134-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:135:13-71 135 android:label="@string/preferences_title" -135-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:135:13-54 +135-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:136:13-54 136 android:launchMode="singleTop" -136-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:136:13-43 +136-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:137:13-43 137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:137:13-60 +137-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:138:13-60 138 139 140 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:140:9-143:19 +140-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:141:9-144:19 141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:141:13-74 +141-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:142:13-74 142 android:exported="false" > -142-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:142:13-37 +142-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:143:13-37 143 144 145 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:145:9-147:52 +145-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:146:9-148:52 146 android:name="android.app.default_searchable" -146-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:146:13-58 +146-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:147:13-58 147 android:value=".ui.NoteEditActivity" /> -147-->D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:147:13-49 +147-->D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:148:13-49 148 149 150 diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 5ffd361..a3d0ba1 100644 --- a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="21" + android:targetSdkVersion="21" /> @@ -56,7 +56,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 5ffd361..a3d0ba1 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="21" + android:targetSdkVersion="21" /> @@ -56,7 +56,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_0.png.flat similarity index 99% rename from src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat rename to src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_0.png.flat index 0bda0bc..54681fe 100644 Binary files a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_0.png.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_1.jpg.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_1.jpg.flat new file mode 100644 index 0000000..22e7a05 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_1.jpg.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_2.jpg.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_2.jpg.flat new file mode 100644 index 0000000..72188b0 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_2.jpg.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_3.jpg.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_3.jpg.flat new file mode 100644 index 0000000..90aa35c Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_3.jpg.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_4.jpg.flat b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_4.jpg.flat new file mode 100644 index 0000000..70a5433 Binary files /dev/null and b/src/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background_4.jpg.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 6cb2484..832eca1 100644 Binary files a/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index d507a80..40f95ab 100644 Binary files a/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 7af0b53..b9f57c8 100644 Binary files a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index c0e5804..8dd3545 100644 Binary files a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 9394306..61f27f8 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,7 +4,7 @@ "outputFile": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "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", @@ -47,26 +47,7 @@ "outputFile": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -83,24 +64,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "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", @@ -119,66 +83,13 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "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" - } - }, - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { "startLines": "12", @@ -189,38 +100,41 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "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,2326,2722,2543,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": "2318,2535,2891,2714,1098,1287,1476,1685,1897,911,2104" }, "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", - "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", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "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", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,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,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,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "125,129,133,136,139,143,147,151,155,159,163", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8332,8543,8715,8889,9072,9257,9442,9645,9851,10034", + "endLines": "128,132,135,138,142,146,150,154,158,162,166", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8327,8538,8710,8884,9067,9252,9437,9640,9846,10029,10230" } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } } ] @@ -229,7 +143,7 @@ "outputFile": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "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", @@ -248,7 +162,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index e5f7f47..1127c24 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "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", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 4f91ce1..725b914 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "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", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 92eb366..262a4c9 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,29 +1,10 @@ { "logs": [ { - "outputFile": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -40,24 +21,7 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "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", @@ -76,66 +40,13 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\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,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", - "map": [ - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "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" - } - }, - { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { "startLines": "12", @@ -146,38 +57,41 @@ } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "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,2326,2722,2543,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": "2318,2535,2891,2714,1098,1287,1476,1685,1897,911,2104" }, "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", - "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", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "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", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,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,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,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "125,129,133,136,139,143,147,151,155,159,163", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8332,8543,8715,8889,9072,9257,9442,9645,9851,10034", + "endLines": "128,132,135,138,142,146,150,154,158,162,166", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8327,8538,8710,8884,9067,9252,9437,9640,9846,10029,10230" } }, { - "source": "D:\\ProjectX\\22Autumn\\SoftEng\\git_test\\src\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\ProjectX\\22Autumn\\SoftEng\\minote_maintainance\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } } ] diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 2a106a9..6e90b25 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,410 @@ [ { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.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:/drawable-hdpi_list_background_3.jpg.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background_3.jpg" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\preferences.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "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:/drawable-hdpi_list_background_4.jpg.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background_4.jpg" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_record_folder.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\searchable.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_options.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_footer.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background_1.jpg.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background_1.jpg" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background_wall.jpg.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background_wall.jpg" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background_0.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background_0.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background_2.jpg.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background_2.jpg" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_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" + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\primary_text_dark.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.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": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background_wood.jpg.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background_wood.jpg" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" + }, + { + "merged": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\41485\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" } ] \ No newline at end of file diff --git a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 5ffd361..a3d0ba1 100644 --- a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="21" + android:targetSdkVersion="21" /> @@ -56,7 +56,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 7cfd2f2..b993697 100644 Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/62b150511dc86536f0941854218820db6936c41b485e98ec9ef2bb77dda9452f_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/62b150511dc86536f0941854218820db6936c41b485e98ec9ef2bb77dda9452f_5.jar new file mode 100644 index 0000000..253470d Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/62b150511dc86536f0941854218820db6936c41b485e98ec9ef2bb77dda9452f_5.jar differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar deleted file mode 100644 index 947edfd..0000000 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar and /dev/null differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex index f29c886..07744fa 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index e5c7d09..398c431 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index d8ec2c4..8b43d74 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex index 983f364..e8e3afc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index eceecda..1750b9e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index e32f11d..7769b0c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2f5ecfb..529d746 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index e9e44c0..58b528c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index 3fe4a9b..0874dbd 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index ea6f71e..df4af64 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index fe6429f..b59f8c3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index ce7cad2..bda0be4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index d97427c..bb7a679 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index f5f5909..0c9722b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index 72f7f19..47b2c22 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 99b707a..8086300 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 3367df5..dc761e9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index 3864095..2d3e192 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index ae8724a..7cbe068 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index b6c2fc1..bd6af55 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index 3229f07..67b3aa7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index d1fa158..f3b05b2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 24a8789..6e03199 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 7ac0689..1bb80ff 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index bc7ec41..6b210f2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index 71af18e..f2d2b6f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 3d1900e..6d032b3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index eb6b38f..1fe7079 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 2115569..0a500f0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 414b538..38aad49 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 1885fff..9a5efc5 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 1107ccc..45d9720 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 341cb7a..5c21213 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex index 144cf9c..96cb511 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index ffbb9b0..c00157d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index b6a3528..e5e1f18 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index ae6e2a4..f6295d6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 869e07c..c86f23c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index f67c640..ed428e8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 1de4373..e37522f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 525fa4f..603b077 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 261b9bc..cb5bc87 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index 238447e..e5eba8f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index bb825ba..402ee8c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index bf17cb1..c145353 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index b3346ee..cfb7238 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index 5d89d10..1b0b615 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 0b49183..9743765 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index eaa7650..6f0ee4f 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index fea922e..bd5aa52 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 5f69d8d..de37f39 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index 8f6696d..bdffd21 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 63acb0d..0b63b38 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index dca62bf..1973991 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index d339f97..a21c5a9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 4d23f7e..40f9667 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 213abb6..ce15859 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 91b250c..6a4c26c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex new file mode 100644 index 0000000..8b09a41 Binary files /dev/null and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 60573ff..c41bcc4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index c7caa5b..b62ee94 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index d2b4e3e..2cca446 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index c5e6113..2d787a5 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index c94758c..5ce43da 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 5e2cb53..488fd26 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 824e394..0402edb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 68ded96..1ecc776 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 67e1670..8d24f99 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index bcac2ec..0f91954 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index d511096..d583db3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index c225369..aecd57c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 8a40d27..3c9f7a2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 2aa9d47..b4695d7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index e75d783..38c781c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 4286590..cc80c71 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index eb9700e..1ba05dc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 0c3d635..dd98ec2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 48c303e..af258af 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ee10b63..e46ad2e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 1a8c370..12165c8 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index c9d8d94..63cbe83 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 872685d..f9339e1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index 311f487..38b9474 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index d38040f..7863383 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index d151862..5ec880a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 631e973..ba09e25 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index e15a061..b04e8bc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 3c7c3d5..8389ef2 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 0883a78..2c2b2f0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index a4132a8..4e1b695 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 9dcc1b5..c9c513c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index 4436b28..4dd05a6 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 371948e..22cbad0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index da80f06..291644d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 1ef790d..942d893 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 9c2fd31..9ade75d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 995370f..98582ff 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 73f6100..9ff91f0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..4edeb53 100644 --- a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -30,117 +30,123 @@ int drawable font_size_selector_bg 0x7f040012 int drawable font_small 0x7f040013 int drawable font_super 0x7f040014 int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 +int drawable list_background_0 0x7f040016 +int drawable list_background_1 0x7f040017 +int drawable list_background_2 0x7f040018 +int drawable list_background_3 0x7f040044 +int drawable list_background_4 0x7f040045 +int drawable list_blue_down 0x7f040019 +int drawable list_blue_middle 0x7f04001a +int drawable list_blue_single 0x7f04001b +int drawable list_blue_up 0x7f04001c +int drawable list_folder 0x7f04001d +int drawable list_footer_bg 0x7f04001e +int drawable list_green_down 0x7f04001f +int drawable list_green_middle 0x7f040020 +int drawable list_green_single 0x7f040021 +int drawable list_green_up 0x7f040022 +int drawable list_red_down 0x7f040023 +int drawable list_red_middle 0x7f040024 +int drawable list_red_single 0x7f040025 +int drawable list_red_up 0x7f040026 +int drawable list_white_down 0x7f040027 +int drawable list_white_middle 0x7f040028 +int drawable list_white_single 0x7f040029 +int drawable list_white_up 0x7f04002a +int drawable list_yellow_down 0x7f04002b +int drawable list_yellow_middle 0x7f04002c +int drawable list_yellow_single 0x7f04002d +int drawable list_yellow_up 0x7f04002e +int drawable menu_delete 0x7f04002f +int drawable menu_move 0x7f040030 +int drawable new_note 0x7f040031 +int drawable new_note_normal 0x7f040032 +int drawable new_note_pressed 0x7f040033 +int drawable note_edit_color_selector_panel 0x7f040034 +int drawable notification 0x7f040035 +int drawable search_result 0x7f040036 +int drawable selected 0x7f040037 +int drawable title_alert 0x7f040038 +int drawable title_bar_bg 0x7f040039 +int drawable widget_2x_blue 0x7f04003a +int drawable widget_2x_green 0x7f04003b +int drawable widget_2x_red 0x7f04003c +int drawable widget_2x_white 0x7f04003d +int drawable widget_2x_yellow 0x7f04003e +int drawable widget_4x_blue 0x7f04003f +int drawable widget_4x_green 0x7f040040 +int drawable widget_4x_red 0x7f040041 +int drawable widget_4x_white 0x7f040042 +int drawable widget_4x_yellow 0x7f040043 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 +int id add_img_btn 0x7f050003 +int id amPm 0x7f050004 +int id btn_new_note 0x7f050005 +int id btn_set_bg_color 0x7f050006 +int id cb_edit_item 0x7f050007 +int id date 0x7f050008 +int id delete 0x7f050009 +int id et_edit_text 0x7f05000a +int id et_foler_name 0x7f05000b +int id font_size_selector 0x7f05000c +int id hour 0x7f05000d +int id iv_alert_icon 0x7f05000e +int id iv_bg_blue 0x7f05000f +int id iv_bg_blue_select 0x7f050010 +int id iv_bg_green 0x7f050011 +int id iv_bg_green_select 0x7f050012 +int id iv_bg_red 0x7f050013 +int id iv_bg_red_select 0x7f050014 +int id iv_bg_white 0x7f050015 +int id iv_bg_white_select 0x7f050016 +int id iv_bg_yellow 0x7f050017 +int id iv_bg_yellow_select 0x7f050018 +int id iv_large_select 0x7f050019 +int id iv_medium_select 0x7f05001a +int id iv_small_select 0x7f05001b +int id iv_super_select 0x7f05001c +int id ll_font_large 0x7f05001d +int id ll_font_normal 0x7f05001e +int id ll_font_small 0x7f05001f +int id ll_font_super 0x7f050020 +int id menu_alert 0x7f050021 +int id menu_change_background 0x7f050022 +int id menu_delete 0x7f050023 +int id menu_delete_remind 0x7f050024 +int id menu_export_text 0x7f050025 +int id menu_font_size 0x7f050026 +int id menu_list_mode 0x7f050027 +int id menu_new_folder 0x7f050028 +int id menu_new_note 0x7f050029 +int id menu_search 0x7f05002a +int id menu_send_to_desktop 0x7f05002b +int id menu_setting 0x7f05002c +int id menu_share 0x7f05002d +int id menu_sync 0x7f05002e +int id minute 0x7f05002f +int id move 0x7f050030 +int id navigation_bar 0x7f050031 +int id note_bg_color_selector 0x7f050032 +int id note_edit_list 0x7f050033 +int id note_edit_view 0x7f050034 +int id note_item 0x7f050035 +int id note_title 0x7f050036 +int id notes_list 0x7f050037 +int id prefenerece_sync_status_textview 0x7f050038 +int id preference_sync_button 0x7f050039 +int id selection_menu 0x7f05003a +int id sv_note_edit 0x7f05003b +int id tv_alert_date 0x7f05003c +int id tv_folder_name 0x7f05003d +int id tv_modified_date 0x7f05003e +int id tv_name 0x7f05003f +int id tv_time 0x7f050040 +int id tv_title 0x7f050041 +int id tv_title_bar 0x7f050042 +int id widget_bg_image 0x7f050043 +int id widget_text 0x7f050044 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 6cab5bb..151dc5b 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\debug\res -net.micode.notes.app-main-7 D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\res +net.micode.notes.app-pngs-0 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\debug\res +net.micode.notes.app-main-7 D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\res diff --git a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 65f17f8..8f71c79 100644 --- a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,283 +1,289 @@ -net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 +net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:drawable/list_yellow_single = 0x7f04002d +net.micode.notes:id/amPm = 0x7f050004 net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:drawable/widget_4x_green = 0x7f040040 +net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:id/widget_text = 0x7f050044 +net.micode.notes:drawable/list_background_3 = 0x7f040044 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:drawable/edit_title_white = 0x7f04000c +net.micode.notes:drawable/menu_delete = 0x7f04002f +net.micode.notes:string/sync_progress_login = 0x7f0a005e net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/tv_folder_name = 0x7f05003d +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:id/tv_alert_date = 0x7f05003c net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:string/note_alert_expired = 0x7f0a003b net.micode.notes:string/notelist_menu_new = 0x7f0a0042 +net.micode.notes:drawable/list_yellow_down = 0x7f04002b +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/preferences_add_account = 0x7f0a0046 net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d +net.micode.notes:id/note_edit_list = 0x7f050033 +net.micode.notes:string/menu_delete = 0x7f0a0021 +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 +net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d +net.micode.notes:string/menu_select_title = 0x7f0a0034 net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 net.micode.notes:string/menu_setting = 0x7f0a0036 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:id/menu_delete_remind = 0x7f050024 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:string/menu_list_mode = 0x7f0a002c net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_size = 0x7f0a0029 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/search_hint = 0x7f0a0057 net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/notelist_string_info = 0x7f0a0043 net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:string/error_sdcard_export = 0x7f0a000f +net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:layout/note_item = 0x7f060007 +net.micode.notes:id/tv_name = 0x7f05003f +net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:id/move = 0x7f05002e +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:layout/folder_list_item = 0x7f060004 +net.micode.notes:id/move = 0x7f050030 net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:drawable/list_blue_down = 0x7f040017 -net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/widget_bg_image = 0x7f050041 +net.micode.notes:id/note_edit_view = 0x7f050034 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 +net.micode.notes:drawable/list_yellow_middle = 0x7f04002c +net.micode.notes:id/iv_bg_red = 0x7f050013 +net.micode.notes:id/widget_bg_image = 0x7f050043 net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:drawable/list_blue_down = 0x7f040019 +net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:menu/note_list = 0x7f070003 -net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003e +net.micode.notes:string/menu_font_size = 0x7f0a0029 net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 net.micode.notes:string/error_sync_internal = 0x7f0a0012 -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:id/iv_large_select = 0x7f050019 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 +net.micode.notes:id/ll_font_super = 0x7f050020 +net.micode.notes:string/format_date_ymd = 0x7f0a0018 net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:id/menu_share = 0x7f05002b +net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:id/menu_share = 0x7f05002d net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:id/menu_setting = 0x7f05002c +net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:drawable/list_green_up = 0x7f040022 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/widget_text = 0x7f050042 +net.micode.notes:id/tv_title_bar = 0x7f050042 net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:id/tv_title_bar = 0x7f050040 -net.micode.notes:id/tv_folder_name = 0x7f05003b -net.micode.notes:id/tv_alert_date = 0x7f05003a +net.micode.notes:id/iv_bg_blue_select = 0x7f050010 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:id/note_edit_view = 0x7f050032 +net.micode.notes:id/sv_note_edit = 0x7f05003b +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038 +net.micode.notes:id/note_bg_color_selector = 0x7f050032 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:id/navigation_bar = 0x7f05002f -net.micode.notes:id/ll_font_normal = 0x7f05001d -net.micode.notes:id/minute = 0x7f05002d -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:id/menu_setting = 0x7f05002a +net.micode.notes:id/navigation_bar = 0x7f050031 +net.micode.notes:id/ll_font_normal = 0x7f05001e +net.micode.notes:id/minute = 0x7f05002f +net.micode.notes:id/menu_sync = 0x7f05002e net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:id/menu_new_note = 0x7f050027 -net.micode.notes:id/menu_new_folder = 0x7f050026 +net.micode.notes:id/menu_search = 0x7f05002a +net.micode.notes:id/menu_new_note = 0x7f050029 +net.micode.notes:id/menu_new_folder = 0x7f050028 +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:id/menu_change_background = 0x7f050022 net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:id/ll_font_small = 0x7f05001e -net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:id/iv_bg_red_select = 0x7f050013 -net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:id/date = 0x7f050007 -net.micode.notes:id/menu_delete_remind = 0x7f050022 -net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:id/menu_alert = 0x7f050021 +net.micode.notes:id/iv_bg_green = 0x7f050011 +net.micode.notes:id/tv_time = 0x7f050040 +net.micode.notes:id/et_foler_name = 0x7f05000b +net.micode.notes:id/ll_font_small = 0x7f05001f +net.micode.notes:id/iv_super_select = 0x7f05001c +net.micode.notes:drawable/widget_2x_white = 0x7f04003d +net.micode.notes:id/iv_medium_select = 0x7f05001a +net.micode.notes:drawable/list_blue_up = 0x7f04001c +net.micode.notes:id/date = 0x7f050008 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:id/font_size_selector = 0x7f05000c +net.micode.notes:id/notes_list = 0x7f050037 +net.micode.notes:id/btn_set_bg_color = 0x7f050006 +net.micode.notes:id/iv_bg_red_select = 0x7f050014 +net.micode.notes:id/et_edit_text = 0x7f05000a +net.micode.notes:id/iv_bg_yellow = 0x7f050017 +net.micode.notes:drawable/selected = 0x7f040037 +net.micode.notes:drawable/list_white_middle = 0x7f040028 net.micode.notes:string/menu_move = 0x7f0a002d net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:drawable/new_note_pressed = 0x7f040033 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:drawable/list_red_single = 0x7f040023 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:drawable/widget_4x_white = 0x7f040042 +net.micode.notes:id/ll_font_large = 0x7f05001d +net.micode.notes:drawable/list_red_single = 0x7f040025 +net.micode.notes:drawable/widget_4x_red = 0x7f040041 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:drawable/widget_4x_red = 0x7f04003f net.micode.notes:string/note_link_other = 0x7f0a003d net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:drawable/widget_4x_green = 0x7f04003e +net.micode.notes:drawable/widget_2x_green = 0x7f04003b +net.micode.notes:drawable/title_alert = 0x7f040038 +net.micode.notes:drawable/widget_2x_blue = 0x7f04003a net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:drawable/dropdown_icon = 0x7f040005 +net.micode.notes:drawable/new_note_normal = 0x7f040032 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 +net.micode.notes:drawable/list_white_down = 0x7f040027 +net.micode.notes:drawable/dropdown_icon = 0x7f040005 +net.micode.notes:id/menu_send_to_desktop = 0x7f05002b net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:drawable/menu_delete = 0x7f04002d -net.micode.notes:id/cb_edit_item = 0x7f050006 +net.micode.notes:drawable/new_note = 0x7f040031 +net.micode.notes:id/cb_edit_item = 0x7f050007 +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:drawable/list_background_0 = 0x7f040016 +net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:id/add_img_btn = 0x7f050003 net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:id/note_edit_list = 0x7f050031 -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:drawable/list_yellow_up = 0x7f04002e +net.micode.notes:drawable/widget_2x_red = 0x7f04003c net.micode.notes:drawable/edit_title_yellow = 0x7f04000d net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/hour = 0x7f05000c -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:drawable/list_red_up = 0x7f040024 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:id/menu_export_text = 0x7f050023 -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 -net.micode.notes:drawable/list_red_down = 0x7f040021 +net.micode.notes:drawable/list_red_down = 0x7f040023 net.micode.notes:string/error_note_not_exist = 0x7f0a000e net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:id/menu_font_size = 0x7f050024 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:drawable/list_white_up = 0x7f040028 +net.micode.notes:id/iv_bg_green_select = 0x7f050012 +net.micode.notes:drawable/icon_app = 0x7f040015 +net.micode.notes:drawable/list_background_2 = 0x7f040018 +net.micode.notes:id/menu_font_size = 0x7f050026 +net.micode.notes:drawable/list_background_4 = 0x7f040045 +net.micode.notes:id/iv_bg_blue = 0x7f05000f +net.micode.notes:drawable/list_green_middle = 0x7f040020 +net.micode.notes:drawable/list_footer_bg = 0x7f04001e +net.micode.notes:string/sync_progress_syncing = 0x7f0a005f +net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:drawable/list_blue_middle = 0x7f04001a +net.micode.notes:drawable/list_white_single = 0x7f040029 +net.micode.notes:drawable/list_white_up = 0x7f04002a net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/preference_sync_button = 0x7f050037 +net.micode.notes:drawable/list_green_down = 0x7f04001f +net.micode.notes:id/preference_sync_button = 0x7f050039 net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 net.micode.notes:id/account_dialog_title = 0x7f050001 net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:id/note_item = 0x7f050033 +net.micode.notes:id/note_item = 0x7f050035 net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:id/hour = 0x7f05000d +net.micode.notes:id/iv_bg_white_select = 0x7f050016 +net.micode.notes:drawable/list_red_up = 0x7f040026 +net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:drawable/list_background_1 = 0x7f040017 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_folder_delete = 0x7f0a0025 net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:drawable/icon_app = 0x7f040015 +net.micode.notes:id/menu_delete = 0x7f050023 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/list_red_middle = 0x7f040022 +net.micode.notes:drawable/list_blue_single = 0x7f04001b +net.micode.notes:drawable/list_red_middle = 0x7f040024 net.micode.notes:string/menu_normal_mode = 0x7f0a002f net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:drawable/title_bar_bg = 0x7f040037 -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:drawable/title_bar_bg = 0x7f040039 +net.micode.notes:id/delete = 0x7f050009 +net.micode.notes:drawable/search_result = 0x7f040036 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:id/tv_modified_date = 0x7f05003c +net.micode.notes:id/tv_modified_date = 0x7f05003e net.micode.notes:string/menu_font_small = 0x7f0a002a net.micode.notes:drawable/font_large = 0x7f040010 -net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:drawable/list_green_single = 0x7f04001f +net.micode.notes:id/iv_alert_icon = 0x7f05000e +net.micode.notes:drawable/list_green_single = 0x7f040021 net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:drawable/edit_title_red = 0x7f04000b net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:id/menu_list_mode = 0x7f050025 +net.micode.notes:id/menu_list_mode = 0x7f050027 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:drawable/menu_move = 0x7f040030 +net.micode.notes:id/btn_new_note = 0x7f050005 +net.micode.notes:drawable/edit_title_red = 0x7f04000b +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040034 +net.micode.notes:drawable/list_folder = 0x7f04001d +net.micode.notes:id/iv_small_select = 0x7f05001b net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:id/tv_title = 0x7f050041 net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d +net.micode.notes:drawable/widget_4x_blue = 0x7f04003f net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 +net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:id/menu_export_text = 0x7f050025 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040043 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:id/selection_menu = 0x7f050038 +net.micode.notes:id/selection_menu = 0x7f05003a net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:drawable/notification = 0x7f040033 +net.micode.notes:drawable/notification = 0x7f040035 net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:id/note_title = 0x7f050034 +net.micode.notes:id/note_title = 0x7f050036 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index c0e1765..8465aae 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,233 +1,239 @@ -- Merging decision tree log --- manifest -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:1-149:12 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + xmlns:tools + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml - INJECTED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml + INJECTED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:35:5-148:19 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:36:5-149:19 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:38:9-41 android:icon - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:37:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:38:9-50:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:39:9-51:20 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:42:13-45 android:launchMode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:43:13-43 android:windowSoftInputMode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:44:13-52 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:45:13-52 android:configChanges - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:41:13-74 android:theme - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:44:13-45 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:40:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:46:13-49:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:47:17-69 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:47:25-66 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:48:17-77 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:48:27-74 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:52:9-80:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:55:13-43 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:54:13-74 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:56:13-45 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:53:13-48 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:58:13-63:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:59:13-64:29 + android:scheme + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:59:28-49 + tools:ignore + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:59:50-80 action#android.intent.action.VIEW -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:59:17-69 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:59:25-66 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:17-76 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:60:27-73 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:17-78 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:61:23-75 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:65:13-70:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:66:17-79 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:66:25-76 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:72:13-75:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:73:17-71 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:73:25-68 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:77:13-79:54 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:79:17-51 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:78:17-54 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:82:9-85:43 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:84:13-47 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:85:13-40 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:83:13-63 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:87:9-99:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:89:13-50 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:88:13-57 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:90:13-94:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:17-84 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:91:25-81 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:17-85 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:92:25-82 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:96:13-98:58 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:98:17-55 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:97:17-58 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:100:9-113:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:102:13-50 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:101:13-57 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:115:9-119:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:115:19-55 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:116:13-118:29 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:117:17-79 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:117:25-76 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:121:9-124:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:123:13-38 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:122:13-61 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:126:9-131:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:128:13-45 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:129:13-48 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:130:13-75 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:127:13-50 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:133:9-138:20 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:135:13-54 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:136:13-43 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:137:13-60 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:134:13-71 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:140:9-143:19 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:142:13-37 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:141:13-74 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:145:9-147:52 +ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:147:13-49 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\ProjectX\22Autumn\SoftEng\git_test\src\app\src\main\AndroidManifest.xml:146:13-58 + ADDED from D:\ProjectX\22Autumn\SoftEng\minote_maintainance\src\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index cf78007..ec2517c 100644 Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index 566b8d9..6241903 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -16,11 +16,12 @@ --> - + @@ -55,7 +56,7 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + diff --git a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..a1a2455 100644 --- a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -38,7 +38,7 @@ public class WorkingNote { // Note Id private long mNoteId; // Note content - private String mContent; + public String mContent; // Note mode private int mMode; diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index a674d7a..f39be2c 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -22,19 +22,34 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Matrix; import android.graphics.Paint; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; +import android.os.Environment; import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -43,10 +58,12 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -65,6 +82,7 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -149,6 +167,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; + private final int PHOTO_REQUEST = 1;//请求码 + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -159,12 +179,23 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); + + + //根据id获取添加图片按钮 + final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn); + //为点击图片按钮设置监听器 + add_img_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: click add image button"); + Intent loadImage = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + loadImage.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,"image/*"); + startActivityForResult(loadImage, PHOTO_REQUEST); + } + }); } - /** - * Current activity may be killed when the memory is low. Once it is killed, for another time - * user load this activity, we should restore the former state - */ + @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); @@ -263,14 +294,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onResume() { + protected void onResume() {//能获得用户焦点：可以操作 super.onResume(); - initNoteScreen(); + initNoteScreen();//初始化便签屏幕 } private void initNoteScreen() { - mNoteEditor.setTextAppearance(this, TextAppearanceResources - .getTexAppearanceResource(mFontSizeId)); + mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { @@ -288,11 +318,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR)); - /** - * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker - * is not ready - */ showAlertHeader(); + //将有图片路径的位置转换为图片 + convertToImage(); } private void showAlertHeader() { @@ -312,6 +340,53 @@ public class NoteEditActivity extends Activity implements OnClickListener, }; } + //converting related path to pic + private void convertToImage() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + Editable editable = noteEditText.getText();//1.获取text + String noteText = editable.toString(); //2.将note内容转换为字符串 + int length = editable.length(); //内容的长度 + //3.截取img片段 [local]+uri+[local]，提取uri + for(int i = 0; i < length; i++) { + for(int j = i; j < length; j++) { + String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段 + if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + int limit = 7; //[local]为7个字符 + //[local][/local]共15个字符，剩下的为真正的path长度 + int len = img_fragment.length()-15; + //从[local]之后的len个字符就是path + String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是："+path); + try { + bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + } catch (Exception e) { + e.printStackTrace(); + } + if(bitmap!=null) { //若图片存在 + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + //5.将指定的标记对象附加到文本的开始...结束范围 + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 + edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 + } + else { //does not exist + Log.d(TAG, "image file not found"); + Toast.makeText(this, "Invalid Image Path!", Toast.LENGTH_SHORT).show(); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); + } + } + } + } + } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -358,8 +433,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + return false; + } return true; } @@ -418,7 +493,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() + mWorkingNote.getWidgetId() }); sendBroadcast(intent); @@ -563,10 +638,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, d.show(); } - /** - * Share note to apps that support {@link Intent#ACTION_SEND} action - * and {@text/plain} type - */ private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); intent.putExtra(Intent.EXTRA_TEXT, info); @@ -773,12 +844,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, switchToListMode(mNoteEditor.getText().toString()); } else { if (!getWorkingText()) { - mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", - "")); + mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); } mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + convertToImage(); //退出清单模式，应该将有图片的地方显示出来 } } @@ -870,4 +941,116 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + @Override + //猜测：onActivityResult函数能够获取各种种类的activity返回值。 + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + if (intent == null){ + break;//防止没有选择内容造成不正常的退出 + } + Uri originalUri = intent.getData(); //1.获得图片的真实路径 + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if(bitmap != null){ + //3.根据Bitmap对象创建ImageSpan对象 + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this,originalUri); + //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 + String img_fragment= "[local]" + path + "[/local]"; + //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + //5.将选择的图片追加到EditText中光标所在位置 + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); //获取光标所在位置 + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); //将图片插入到光标所在位置 + + mWorkingNote.mContent = e.getText().toString(); + //6.把改动提交到数据库中,两个数据库表都要改的 + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues,"_id=?",new String[]{""+id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content",mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1,"mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note",""+id}); + + }else{ + Toast.makeText(NoteEditActivity.this, "Failed to get pic", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + + + //获取文件的real path + public String getPath(final Context context, final Uri uri) { + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aec..d0d9d31 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -27,10 +27,16 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Resources; import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; +import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.MediaStore; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -73,12 +79,15 @@ import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; import java.io.BufferedReader; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { + private int cur_bg = 0; // additional feature: bg switching + private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -139,6 +148,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + getWindow().setBackgroundDrawableResource(R.drawable.list_background_0); initResources(); /** @@ -809,9 +819,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt createNewNote(); break; } - case R.id.menu_search: + case R.id.menu_search: { onSearchRequested(); break; + } + case R.id.menu_change_background: { + int counts = 5; //所有的图片数 + int random_id = (int)(Math.random()*counts); + while (random_id == cur_bg){ + random_id = (int)(Math.random()*counts); + }// 生成一个新的图片编号（与上一次不同） + String s = String.valueOf(random_id); + Resources resources = this.getResources(); + int id_bg = resources.getIdentifier("list_background_"+s,"drawable","net.micode.notes");//获取编号对应的资源序号 + getWindow().setBackgroundDrawableResource(id_bg);//更改背景图片 + cur_bg = random_id;//记录更改之后图片的序号 + break; + } default: break; } diff --git a/src/app/src/main/res/drawable-hdpi/list_background.png b/src/app/src/main/res/drawable-hdpi/list_background_0.png similarity index 100% rename from src/app/src/main/res/drawable-hdpi/list_background.png rename to src/app/src/main/res/drawable-hdpi/list_background_0.png diff --git a/src/app/src/main/res/drawable-hdpi/list_background_1.jpg b/src/app/src/main/res/drawable-hdpi/list_background_1.jpg new file mode 100644 index 0000000..bdd6dba Binary files /dev/null and b/src/app/src/main/res/drawable-hdpi/list_background_1.jpg differ diff --git a/src/app/src/main/res/drawable-hdpi/list_background_2.jpg b/src/app/src/main/res/drawable-hdpi/list_background_2.jpg new file mode 100644 index 0000000..864aadc Binary files /dev/null and b/src/app/src/main/res/drawable-hdpi/list_background_2.jpg differ diff --git a/src/app/src/main/res/drawable-hdpi/list_background_3.jpg b/src/app/src/main/res/drawable-hdpi/list_background_3.jpg new file mode 100644 index 0000000..4416520 Binary files /dev/null and b/src/app/src/main/res/drawable-hdpi/list_background_3.jpg differ diff --git a/src/app/src/main/res/drawable-hdpi/list_background_4.jpg b/src/app/src/main/res/drawable-hdpi/list_background_4.jpg new file mode 100644 index 0000000..26750ea Binary files /dev/null and b/src/app/src/main/res/drawable-hdpi/list_background_4.jpg differ diff --git a/src/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml index 10b2aa7..ca0f5b0 100644 --- a/src/app/src/main/res/layout/note_edit.xml +++ b/src/app/src/main/res/layout/note_edit.xml @@ -18,7 +18,7 @@ + + + + + diff --git a/src/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml index 6b25d38..ef857ad 100644 --- a/src/app/src/main/res/layout/note_list.xml +++ b/src/app/src/main/res/layout/note_list.xml @@ -18,8 +18,7 @@ + android:layout_height="fill_parent"> + + + diff --git a/src/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml index 486abc0..7454ce2 100644 --- a/src/app/src/main/res/values/styles.xml +++ b/src/app/src/main/res/values/styles.xml @@ -49,7 +49,7 @@ @@ -58,12 +58,11 @@ @color/secondary_text_dark - - \ No newline at end of file