diff --git a/doc/实践资源-开源软件维护方案及成果模板.docx b/doc/实践资源-开源软件维护方案及成果模板.docx
deleted file mode 100644
index 83b43d57..00000000
Binary files a/doc/实践资源-开源软件维护方案及成果模板.docx and /dev/null differ
diff --git a/doc/小米便签开源软件维护方案及成果.docx b/doc/小米便签开源软件维护方案及成果.docx
new file mode 100644
index 00000000..d32ec70f
Binary files /dev/null and b/doc/小米便签开源软件维护方案及成果.docx differ
diff --git a/doc/小米便签开源软件维护方案及成果.pdf b/doc/小米便签开源软件维护方案及成果.pdf
new file mode 100644
index 00000000..4a6f011c
Binary files /dev/null and b/doc/小米便签开源软件维护方案及成果.pdf differ
diff --git a/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 01f9c711..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin
deleted file mode 100644
index 5c554fdd..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock
deleted file mode 100644
index 55867a4f..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileChanges/last-build.bin b/src/Notes-master1/.gradle/7.0.2/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/fileChanges/last-build.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin
deleted file mode 100644
index c7d8c654..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock
deleted file mode 100644
index 50480468..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
deleted file mode 100644
index e25e07e7..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin
deleted file mode 100644
index a96ccc77..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin
deleted file mode 100644
index e803d1a2..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock
deleted file mode 100644
index 77f72398..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin
deleted file mode 100644
index 32f14fac..00000000
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin and /dev/null differ
diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin
index e138630e..b8dbe2a5 100644
Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock
index 6862cfd1..b94a2467 100644
Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin
index f6be94d2..b8aa0173 100644
Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock
index 61b137d2..52851cbe 100644
Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin
index 6aad8650..d812035d 100644
Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 37bc3fd1..c56b7af8 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
index 5fb1355b..9ab3710d 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master1/.gradle/checksums/checksums.lock b/src/Notes-master1/.gradle/checksums/checksums.lock
index 2d0a5bbd..c0a02aba 100644
Binary files a/src/Notes-master1/.gradle/checksums/checksums.lock and b/src/Notes-master1/.gradle/checksums/checksums.lock differ
diff --git a/src/Notes-master1/.gradle/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/checksums/md5-checksums.bin
index 0b416ea4..767341d7 100644
Binary files a/src/Notes-master1/.gradle/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/checksums/md5-checksums.bin differ
diff --git a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin
index 63b2a135..f42e3c91 100644
Binary files a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin differ
diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml
index a9c3b07d..ef06d1d0 100644
--- a/src/Notes-master1/.idea/dbnavigator.xml
+++ b/src/Notes-master1/.idea/dbnavigator.xml
@@ -25,13 +25,13 @@
-
+
-
+
@@ -39,11 +39,11 @@
-
+
-
-
+
+
@@ -72,7 +72,7 @@
-
+
diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml
index acae8c17..c1cffa9d 100644
--- a/src/Notes-master1/.idea/misc.xml
+++ b/src/Notes-master1/.idea/misc.xml
@@ -26,16 +26,23 @@
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/.gradle/7.0.2/dependencies-accessors/gc.properties b/src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/dependencies-accessors/gc.properties
rename to src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b
diff --git a/src/Notes-master1/.gradle/7.0.2/gc.properties b/src/Notes-master1/.idea/sonarlint/issuestore/0/7/0712df971a99ac4d2fccb8e0fb19f377f3374cca
similarity index 100%
rename from src/Notes-master1/.gradle/7.0.2/gc.properties
rename to src/Notes-master1/.idea/sonarlint/issuestore/0/7/0712df971a99ac4d2fccb8e0fb19f377f3374cca
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2
new file mode 100644
index 00000000..e52aeadf
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2
@@ -0,0 +1,3 @@
+
+>
+java:S1604)"(Make this anonymous inner class a lambda(ʩ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b
new file mode 100644
index 00000000..194a5b70
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b
@@ -0,0 +1,13 @@
+
+U
+java:S11182":Add a private constructor to hide the implicit public one.(͓
+^
+java:S1214I"CMove constants defined in this interfaces to another class or enum.(⸫
+Z
+java:S1214"CMove constants defined in this interfaces to another class or enum.(
+V
+java:S1118":Add a private constructor to hide the implicit public one.(
+Q
+java:S1118":Add a private constructor to hide the implicit public one.(߀
+g
+java:S1192:"LDefine a constant instead of duplicating this literal "content://" 11 times.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
deleted file mode 100644
index 461af098..00000000
--- a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6
+++ /dev/null
@@ -1,12 +0,0 @@
-
-m
-java:S37768"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.(
-O
-java:S1874D"9Remove this use of "setTextAppearance"; it is deprecated.(
-O
-java:S1874K"9Remove this use of "setTextAppearance"; it is deprecated.(
-O
-java:S1874U"9Remove this use of "setTextAppearance"; it is deprecated.(
-f java:S117s"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
-f java:S117x"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔
-f java:S117y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c
new file mode 100644
index 00000000..a73f24ee
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c
@@ -0,0 +1,41 @@
+
+7
+java:S1116-"Remove this empty statement.(
+K
+java:S18740"5Remove this use of "CursorAdapter"; it is deprecated.(
+J
+java:S2864_"4Iterate over the "entrySet" instead of the "keySet".(
+B
+java:S1125`"'Remove the unnecessary boolean literal.(ɯ
+J
+java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(
+B
+java:S1125p"'Remove the unnecessary boolean literal.(ɯ
+A
+java:S1168~"+Return an empty collection instead of null.(
+C
+java:S1125"'Remove the unnecessary boolean literal.(
+t
+java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə
+o
+java:S2293^"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+o
+java:S2293n"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ
+J
+java:S1066V"/Merge this if statement with the enclosing one.(ڧ
+
+java:S1319]"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+
+java:S1319m"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+j
+java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ
+q
+java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬
+r
+java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.(
+E
+java:S5411`"*Use the primitive boolean expression here.(ɯ
+E
+java:S5411p"*Use the primitive boolean expression here.(ɯ
+F
+java:S5411"*Use the primitive boolean expression here.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6
new file mode 100644
index 00000000..c6990ee6
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6
@@ -0,0 +1,115 @@
+
+
+java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(ۛ
+n
+java:S1450"WRemove the "editText" field and declare it as a local variable in the relevant methods.(
+n
+java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(
+{
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲
+{
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(Ȍ
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+n
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ
+W
+java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ
+\
+java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң
+O
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((
+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.(
+P
+java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(
+Z
+java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(
+U
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(
+G
+java:S1874"0Remove this use of "getColor"; it is deprecated.(
+d
+java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(
+U
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(
+T
+java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð
+R
+java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(
+[
+java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ְ
+F
+java:S1197"*Move the array designators [] to the type.(Ŋ
+A
+java:S1197"*Move the array designators [] to the type.(Ԅ
+
+java:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(\
+{
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(Ȍ
+O
+java:S1854"8Remove this useless assignment to local variable "edit".(ߛ
+O java:S106"9Replace this use of System.out or System.err by a logger.(
+O java:S106"9Replace this use of System.out or System.err by a logger.(
+@
+java:S1481")Remove this unused "edit" local variable.(ߛ
+P
+java:S2864"4Iterate over the "entrySet" instead of the "keySet".(
+
+java:S1186 "Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Կ4
+O java:S106"9Replace this use of System.out or System.err by a logger.(
+C
+java:S1068",Remove this unused "editText" private field.(
+H
+java:S1068"1Remove this unused "mRecoListener" private field.(ڕ
+t
+java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ
+t
+java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+u
+java:S2293"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 ("<>").(
+p
+java:S2293"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 ("<>").(艥
+p
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ
+?
+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(ߒ
+?
+java:S1604"(Make this anonymous inner class a lambda(
+D
+java:S1604"(Make this anonymous inner class a lambda(
+?
+java:S1604"(Make this anonymous inner class a lambda(ά
+q
+java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ
+r
+java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න
+r
+java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(
+s
+java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(
+h
+java:S1104l"RMake ivLock a static final constant or non-public and provide accessors if needed.(ؕ
+n
+java:S1104n"SMake ivRadio 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
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/2/72971ba5cd5eebd08ece719bc9283211cd06a429 b/src/Notes-master1/.idea/sonarlint/issuestore/7/2/72971ba5cd5eebd08ece719bc9283211cd06a429
new file mode 100644
index 00000000..7c438270
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/2/72971ba5cd5eebd08ece719bc9283211cd06a429
@@ -0,0 +1,9 @@
+
+z
+java:S1149 "_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(
+z
+java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(
+z
+java:S11498"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(
+U
+java:S1118":Add a private constructor to hide the implicit public one.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
index 3c70d629..6ce817eb 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477
@@ -1,169 +1,177 @@
-i java:S116f"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
-i
-java:S3008x"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
-c java:S119e"IRename this generic name to match the regular expression '^[A-Z][0-9]?$'.(礪
+i java:S116o"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+o java:S116q"URename this field "succ_login" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+j
+java:S3008"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+^ java:S119m"IRename this generic name to match the regular expression '^[A-Z][0-9]?$'.(
8
-java:S1116"Remove this empty statement.(
+java:S1116"Remove this empty statement.(
a
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
[
-java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk
+F
+java:S1874"/Remove this use of "Handler"; it is deprecated.(ǟ
i
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(
M
-java:S1874"6Remove this use of "BitmapDrawable"; it is deprecated.(ٕ
+java:S1874"6Remove this use of "BitmapDrawable"; it is deprecated.(ٕ
+R java:S125"").(艥
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥
b
-java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.(
+java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.(
]
-java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.(
-g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.(
+]
+java:S1192"FDefine a constant instead of duplicating this literal "first" 3 times.(
+g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
>
-java:S1604"(Make this anonymous inner class a lambda(̺V
+java:S1604"(Make this anonymous inner class a lambda(̺V
?
-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(ܴ
+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(
D
-java:S1604"(Make this anonymous inner class a lambda(
+java:S1604"(Make this anonymous inner class a lambda(
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(
?
-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(ά
+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(ά
+>
+java:S1604
+"(Make this anonymous inner class a lambda(
?
-java:S1604
+java:S1604
"(Make this anonymous inner class a lambda(
D
-java:S1604
+java:S1604
"(Make this anonymous inner class a lambda(
?
-java:S1604
+java:S1604
"(Make this anonymous inner class a lambda(î
?
-java:S1604
+java:S1604
"(Make this anonymous inner class a lambda(
D
-java:S1604
+java:S1604
"(Make this anonymous inner class a lambda(
?
-java:S1604
+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(î
?
-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(
+java:S1604"(Make this anonymous inner class a lambda(
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(Ζ
+g
+java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(
g
-java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
\ No newline at end of file
+java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3090deb50adc3dab06c8adbacdac2adbb5fdad b/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3090deb50adc3dab06c8adbacdac2adbb5fdad
new file mode 100644
index 00000000..e9776b20
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/9/a/9a3090deb50adc3dab06c8adbacdac2adbb5fdad
@@ -0,0 +1,106 @@
+
+P
+java:S1118":Add a private constructor to hide the implicit public one.(
+h java:S100}"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ƕ
+m
+java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 19 to the 15 allowed.(ƕ
+D
+java:S4925"-Remove this "Class.forName()", it is useless.(ƅȟ
+N java:S106"9Replace this use of System.out or System.err by a logger.(&
+N java:S106"9Replace this use of System.out or System.err by a logger.($
+i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+J
+java:S1172".Remove this unused method parameter "context".(
+D
+java:S4925"-Remove this "Class.forName()", it is useless.(ƅȟ
+W java:S125"
+java:S1125^"(Remove the unnecessary boolean literals.(
+m
+java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 22 to the 15 allowed.(
+C
+java:S1125~"(Remove the unnecessary boolean literals.(
+>
+java:S1125"(Remove the unnecessary boolean literals.(
+l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ٮ
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index 28082668..bb203d47 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -89,9 +89,29 @@ h
build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
A
gradle.properties,2\a\2afbb999f001938c88fa43fc2ef52abf0f8213e4
+^
+.src/main/java/net/micode/notes/data/Notes.java,3\2\322f2bcce3dd21425ff2a882b59142fb9d0cef8b
l
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -22,7 +716,7 @@
-
+
@@ -102,7 +796,7 @@
-
+
diff --git a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java
index e8fe9b00..83cb1719 100644
--- a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java
+++ b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NavHeaderMainBinding.java
@@ -6,6 +6,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.viewbinding.ViewBinding;
@@ -22,9 +23,14 @@ public final class NavHeaderMainBinding implements ViewBinding {
@NonNull
public final ImageView imageView;
- private NavHeaderMainBinding(@NonNull LinearLayout rootView, @NonNull ImageView imageView) {
+ @NonNull
+ public final TextView navTvUser;
+
+ private NavHeaderMainBinding(@NonNull LinearLayout rootView, @NonNull ImageView imageView,
+ @NonNull TextView navTvUser) {
this.rootView = rootView;
this.imageView = imageView;
+ this.navTvUser = navTvUser;
}
@Override
@@ -60,7 +66,13 @@ public final class NavHeaderMainBinding implements ViewBinding {
break missingId;
}
- return new NavHeaderMainBinding((LinearLayout) rootView, imageView);
+ id = R.id.nav_tv_user;
+ TextView navTvUser = ViewBindings.findChildViewById(rootView, id);
+ if (navTvUser == null) {
+ break missingId;
+ }
+
+ return new NavHeaderMainBinding((LinearLayout) rootView, imageView, navTvUser);
}
String missingId = rootView.getResources().getResourceName(id);
throw new NullPointerException("Missing required view with ID: ".concat(missingId));
diff --git a/src/Notes-master1/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java b/src/Notes-master1/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
index 8492a646..b067bc18 100644
--- a/src/Notes-master1/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
+++ b/src/Notes-master1/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
@@ -1,10 +1,10 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package net.micode.notes.test;
-
-public final class BuildConfig {
- public static final boolean DEBUG = Boolean.parseBoolean("true");
- public static final String APPLICATION_ID = "net.micode.notes.test";
- public static final String BUILD_TYPE = "debug";
-}
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes.test;
+
+public final class BuildConfig {
+ public static final boolean DEBUG = Boolean.parseBoolean("true");
+ public static final String APPLICATION_ID = "net.micode.notes.test";
+ public static final String BUILD_TYPE = "debug";
+}
diff --git a/src/Notes-master1/app/build/intermediates/app_classes/debug/classes.jar b/src/Notes-master1/app/build/intermediates/app_classes/debug/classes.jar
index dbb7bb77..cf861e29 100644
Binary files a/src/Notes-master1/app/build/intermediates/app_classes/debug/classes.jar and b/src/Notes-master1/app/build/intermediates/app_classes/debug/classes.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index fca7a8fd..210b001d 100644
Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar
index bf72be7c..e34ccc3c 100644
Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json
index 118fbd52..c2612373 100644
Binary files a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json and b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json differ
diff --git a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debugAndroidTest/out/net.micode.notes.test-binding_classes.json b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debugAndroidTest/out/net.micode.notes.test-binding_classes.json
new file mode 100644
index 00000000..2bea4465
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debugAndroidTest/out/net.micode.notes.test-binding_classes.json differ
diff --git a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml
index 6a84ede0..b23b9a19 100644
--- a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml
+++ b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/nav_header_main-layout.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 0a2fca9c..909e6d64 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
index 35371923..ee16fab7 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
index 9b015f26..9743edae 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
index 6087cd7f..2fdd09d4 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
index eeafd482..7b3a0ee7 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
index c3b648b8..b6e6bdb4 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin
deleted file mode 100644
index 601f245f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 15b8a285..c78a5c7d 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 72d578a6..1e01ae39 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
index bf0d87ab..62f94575 100644
--- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
@@ -1 +1 @@
-4
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json
index cdfc584c..b7a1a33c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json and b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebugAndroidTest/base_builder_log.json b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebugAndroidTest/base_builder_log.json
new file mode 100644
index 00000000..dca24b26
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebugAndroidTest/base_builder_log.json differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index 30e18f94..30427aa0 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0D2yDvZl4lEhlaxhdAzQOT4TmLE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0D2yDvZl4lEhlaxhdAzQOT4TmLE=
deleted file mode 100644
index 67a105b6..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0D2yDvZl4lEhlaxhdAzQOT4TmLE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE=
index 530044c0..ffb61dad 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0O+thHfp2Nei7nuFVmYtcJHNqxE= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0Q42Jc7gh_SqfN4_UPnJekZ6UEk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0Q42Jc7gh_SqfN4_UPnJekZ6UEk=
deleted file mode 100644
index 1588f21d..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0Q42Jc7gh_SqfN4_UPnJekZ6UEk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1O4oIvbLsNtuHroKk8SvgBbDJrw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1O4oIvbLsNtuHroKk8SvgBbDJrw=
deleted file mode 100644
index 78c8ee6f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1O4oIvbLsNtuHroKk8SvgBbDJrw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bKz5JhRBCSadZyyBFaT0vv8ra0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bKz5JhRBCSadZyyBFaT0vv8ra0=
deleted file mode 100644
index a769844f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bKz5JhRBCSadZyyBFaT0vv8ra0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2dHiU85JvaFdJrBVYrdOuHjRYWA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2dHiU85JvaFdJrBVYrdOuHjRYWA=
new file mode 100644
index 00000000..bcd160da
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2dHiU85JvaFdJrBVYrdOuHjRYWA= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y=
deleted file mode 100644
index e7159a9a..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2g6Cx59kgGMmC3vaiF1Nkjciv6Y= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3d9enWVJFlN+EGH8JD7RrhJzIOI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3d9enWVJFlN+EGH8JD7RrhJzIOI=
deleted file mode 100644
index 4beb7440..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3d9enWVJFlN+EGH8JD7RrhJzIOI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3uyBSeuyO2Q3zhtRhxvZ8nxbvL8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3uyBSeuyO2Q3zhtRhxvZ8nxbvL8=
deleted file mode 100644
index c3ee2fde..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3uyBSeuyO2Q3zhtRhxvZ8nxbvL8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/492ynwLq6u571X3PZnWQb9Tye5k= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/492ynwLq6u571X3PZnWQb9Tye5k=
deleted file mode 100644
index 25b20a67..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/492ynwLq6u571X3PZnWQb9Tye5k= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4E8b+5nNugo2ffhXxYucDY_sXm0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4E8b+5nNugo2ffhXxYucDY_sXm0=
new file mode 100644
index 00000000..2510a5ae
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4E8b+5nNugo2ffhXxYucDY_sXm0= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5sk0bMuFckoM9zQ3t83QR0bJETU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5sk0bMuFckoM9zQ3t83QR0bJETU=
deleted file mode 100644
index 5707aa88..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5sk0bMuFckoM9zQ3t83QR0bJETU= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4=
index 11fa7f5e..b7ec4f61 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/68JSZElYqGfKmbHSD14VmCiHrs4= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY=
index c3ee2fde..6c3f095c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6T3N5XuFvPYc3l2s76DVY94w0MY= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc=
deleted file mode 100644
index 2dae2f9b..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6Tu3HOkTDHE5aYDXmS2dolySIEc= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks=
deleted file mode 100644
index 25547cc9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6iSx44oUggla66KKnhTGNtQ+Kks= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6wOK_spmRYiPH38XyoZjr0fYtuA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6wOK_spmRYiPH38XyoZjr0fYtuA=
deleted file mode 100644
index 1d2c72ac..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6wOK_spmRYiPH38XyoZjr0fYtuA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw=
deleted file mode 100644
index 8d3e7638..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/8iAo7TSwCmQqWlRXt6U0tna86kw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0=
deleted file mode 100644
index 483b42ca..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/90zBq0rJwfZ6_3Adzsxbfu2xPh0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9WEud9jWWFXAF7N6IeWtcP7wX5k= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9WEud9jWWFXAF7N6IeWtcP7wX5k=
deleted file mode 100644
index 2f359f51..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9WEud9jWWFXAF7N6IeWtcP7wX5k= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9hyhtkqKZThXedPp3JEuDEkRhbI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9hyhtkqKZThXedPp3JEuDEkRhbI=
deleted file mode 100644
index f86d05d5..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9hyhtkqKZThXedPp3JEuDEkRhbI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY=
index 80b59ff5..b2e18066 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/AjxHFnGNab4lckzQe8N6tZRgRaY= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4=
index 7759253c..144d863c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVDfBLndCfBRCVIDSjiHbfFYgK4= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTJABmMbmgqSqx2I95fhtDjsXRg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTJABmMbmgqSqx2I95fhtDjsXRg=
new file mode 100644
index 00000000..fe063546
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTJABmMbmgqSqx2I95fhtDjsXRg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTrTZNPnyNUS_ycxB4n2hvM3pRU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTrTZNPnyNUS_ycxB4n2hvM3pRU=
new file mode 100644
index 00000000..f0205ce8
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DTrTZNPnyNUS_ycxB4n2hvM3pRU= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI=
index 7c1a630a..25e19330 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D__J7peuFluGZCckbewJG6hjbJI= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DimYq3SrhBMmEDUq6G_u4hF0u8E= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DimYq3SrhBMmEDUq6G_u4hF0u8E=
deleted file mode 100644
index 189e23f2..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DimYq3SrhBMmEDUq6G_u4hF0u8E= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F8Bk3N1BZ6kaCKHDRTRxdkgCh1o= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F8Bk3N1BZ6kaCKHDRTRxdkgCh1o=
deleted file mode 100644
index b12b2871..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F8Bk3N1BZ6kaCKHDRTRxdkgCh1o= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F9fDhgiXkWKmmbO4Drnke_i1rBY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F9fDhgiXkWKmmbO4Drnke_i1rBY=
new file mode 100644
index 00000000..bb7d174c
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F9fDhgiXkWKmmbO4Drnke_i1rBY= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FKAOeNPJYbpPaIIlKU5M4OMTfdA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FKAOeNPJYbpPaIIlKU5M4OMTfdA=
deleted file mode 100644
index 4b56a487..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FKAOeNPJYbpPaIIlKU5M4OMTfdA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI=
index a769844f..8fd6cd4c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FRRlUnUyhtavQZClHcctgSKurAI= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg=
index 90a59aa1..189e23f2 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9+gGpAadLhe1LfCoDi9kibvxvg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80=
index 2f359f51..846dea11 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G9hNMoOnCVke1aWLwuAHMaUMw80= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960=
deleted file mode 100644
index 82d7050c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgWGKtcdhRITYqlknqdiHk5u960= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gk7rLAkrpl8oDGGxue3nr036dDg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gk7rLAkrpl8oDGGxue3nr036dDg=
new file mode 100644
index 00000000..33463df9
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gk7rLAkrpl8oDGGxue3nr036dDg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GoeWLhmEYw7N2QCPIVudRAR9KMY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GoeWLhmEYw7N2QCPIVudRAR9KMY=
new file mode 100644
index 00000000..d1033862
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GoeWLhmEYw7N2QCPIVudRAR9KMY= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg=
index 2bdfa521..d0a17a98 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Gu+kcXT1ow3gIutL6c0sWYPP9xg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GzLKXjPWcpGQpXxBI0AXNuYf7Ww= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GzLKXjPWcpGQpXxBI0AXNuYf7Ww=
deleted file mode 100644
index 30185e4d..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GzLKXjPWcpGQpXxBI0AXNuYf7Ww= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hukiy+IwqrQzI8YKag3ST9fWjyY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hukiy+IwqrQzI8YKag3ST9fWjyY=
deleted file mode 100644
index 7c1a630a..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hukiy+IwqrQzI8YKag3ST9fWjyY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M=
deleted file mode 100644
index 06e914d8..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/I0l9tvmCFo3y7e_4Mp7aJToYy1M= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw=
index 4b56a487..de755d1a 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IEU02alb5_7N97mvz7VJ4A6F9Rw= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IF4G1vM5fYzNXcscBsKi1IH13Go= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IF4G1vM5fYzNXcscBsKi1IH13Go=
deleted file mode 100644
index c063f2b9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IF4G1vM5fYzNXcscBsKi1IH13Go= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IRFfOIVyLvKI5krXfMNHzPRGhc0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IRFfOIVyLvKI5krXfMNHzPRGhc0=
deleted file mode 100644
index 98ec8865..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IRFfOIVyLvKI5krXfMNHzPRGhc0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXAN0UZuwlzBXpbdr6F6zv4Rlow= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXAN0UZuwlzBXpbdr6F6zv4Rlow=
deleted file mode 100644
index 5b48f3d7..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXAN0UZuwlzBXpbdr6F6zv4Rlow= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXqsn_asbgYwD8J1a9h12tBi0sg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXqsn_asbgYwD8J1a9h12tBi0sg=
deleted file mode 100644
index 2bdfa521..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JXqsn_asbgYwD8J1a9h12tBi0sg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0=
deleted file mode 100644
index feebff2e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JqdoOlvdqa7mnlg4E0EDxi+jQR0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jy8pl10hIerKH5GEFbEZmAExDVs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jy8pl10hIerKH5GEFbEZmAExDVs=
deleted file mode 100644
index e85dd393..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jy8pl10hIerKH5GEFbEZmAExDVs= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KRPD2Y4TAb90m+3GsgC8ZHmZbOE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KRPD2Y4TAb90m+3GsgC8ZHmZbOE=
deleted file mode 100644
index b23adcd1..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KRPD2Y4TAb90m+3GsgC8ZHmZbOE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg=
deleted file mode 100644
index 2365cb90..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KbmFVS0HILi3SqyJqjYtZlBwvzg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KwRtgYViIPnDsmfrlxciDkiSYDI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KwRtgYViIPnDsmfrlxciDkiSYDI=
deleted file mode 100644
index 75f552db..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KwRtgYViIPnDsmfrlxciDkiSYDI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc=
index cb7d4faf..84d308f7 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KyxiwpB61m5z5nL2ZJ0bWRDghtc= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc=
index 474706f0..98ec8865 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LBm9N9fDv7HyJl1OjsVRReN7VZc= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LnrX5jMeRwGkSyDnnxThyGLBmS8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LnrX5jMeRwGkSyDnnxThyGLBmS8=
deleted file mode 100644
index e550972b..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LnrX5jMeRwGkSyDnnxThyGLBmS8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E=
deleted file mode 100644
index 644b6d1c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MrzqV7AGJBUz3348JgM5TA0bNhI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MrzqV7AGJBUz3348JgM5TA0bNhI=
deleted file mode 100644
index 530044c0..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MrzqV7AGJBUz3348JgM5TA0bNhI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/My0J4TAbhGpTNQQhAYc4uZhQTdI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/My0J4TAbhGpTNQQhAYc4uZhQTdI=
deleted file mode 100644
index 27924dd4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/My0J4TAbhGpTNQQhAYc4uZhQTdI= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk=
index 13914543..8568b5b7 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N7z_V0d20dBOOdBljbS049jdrrk= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NETHWWhePdU5gQCrnBAhKm34hbs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NETHWWhePdU5gQCrnBAhKm34hbs=
deleted file mode 100644
index 80b59ff5..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NETHWWhePdU5gQCrnBAhKm34hbs= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nua0SiErzdtQ90B74q1k0VT1ecE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nua0SiErzdtQ90B74q1k0VT1ecE=
deleted file mode 100644
index 22a6ffc5..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Nua0SiErzdtQ90B74q1k0VT1ecE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O03xvi6J0iYZmywc22E0zhq_Jvs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O03xvi6J0iYZmywc22E0zhq_Jvs=
deleted file mode 100644
index fd7a41fa..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/O03xvi6J0iYZmywc22E0zhq_Jvs= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OCuFa8_PCXZfJlnm9FzjDn2O5dg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OCuFa8_PCXZfJlnm9FzjDn2O5dg=
new file mode 100644
index 00000000..7db2cc2f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OCuFa8_PCXZfJlnm9FzjDn2O5dg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ooc8nSKjn+ahESns9aoyKlLGFp0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ooc8nSKjn+ahESns9aoyKlLGFp0=
deleted file mode 100644
index 78ac06c4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ooc8nSKjn+ahESns9aoyKlLGFp0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PpzHs6gjrA6ErVG0rLeRfuGh2Bo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PpzHs6gjrA6ErVG0rLeRfuGh2Bo=
deleted file mode 100644
index c2d1030a..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PpzHs6gjrA6ErVG0rLeRfuGh2Bo= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q5P1eQmeWpmd_dH28+0XuK0nNYY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q5P1eQmeWpmd_dH28+0XuK0nNYY=
deleted file mode 100644
index 71460a18..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q5P1eQmeWpmd_dH28+0XuK0nNYY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs=
index 57065067..87d37d17 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QHdTdYYWKFvS07hyik80KJGSsNs= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs=
deleted file mode 100644
index e9e76081..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QMA3Hi4iw5c9B98I+RQFbVxBOGs= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg=
index 398ebb9b..6ccda32b 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRjkieaXdzjZHRWO06NItmCu8fg= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Qa9ktMjgd30V+OTjNWpC7OyFozg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Qa9ktMjgd30V+OTjNWpC7OyFozg=
deleted file mode 100644
index b42ca4fc..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Qa9ktMjgd30V+OTjNWpC7OyFozg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SI17k9iwzS2xyeQcz690D42vABQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SI17k9iwzS2xyeQcz690D42vABQ=
deleted file mode 100644
index fdab8359..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SI17k9iwzS2xyeQcz690D42vABQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A=
deleted file mode 100644
index e27d24ae..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SMxpaCj2KxONY+Knb0nIWNeTn0A= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA=
index 1588f21d..33a69667 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UJGjVPkEwYo7pUwMdYaL85WyuDA= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WCmu+cHcvbQPRE+uhCNqlU0Bjgk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WCmu+cHcvbQPRE+uhCNqlU0Bjgk=
deleted file mode 100644
index c4398b2e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WCmu+cHcvbQPRE+uhCNqlU0Bjgk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WMDVltuVFAIAUoZMe8PQcnVf6Qo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WMDVltuVFAIAUoZMe8PQcnVf6Qo=
new file mode 100644
index 00000000..dd51769e
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WMDVltuVFAIAUoZMe8PQcnVf6Qo= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE=
index 5b48f3d7..94ab24c1 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xek0j0fdR8UYOrJ1IJ4pn3uWSCE= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YYSflyRoZfcb6_egRb14Svg9NSo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YYSflyRoZfcb6_egRb14Svg9NSo=
deleted file mode 100644
index 6d9b38cb..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YYSflyRoZfcb6_egRb14Svg9NSo= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m1MFs00EVR+PRUJYH+tEN0l50p0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Yui2uGUQBjl59kXGDxG1zsTNMdc=
similarity index 72%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m1MFs00EVR+PRUJYH+tEN0l50p0=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Yui2uGUQBjl59kXGDxG1zsTNMdc=
index 124f128d..06695124 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m1MFs00EVR+PRUJYH+tEN0l50p0= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Yui2uGUQBjl59kXGDxG1zsTNMdc= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZFXVEE0Q+_pgwM9zIlOfTE3hKWk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZFXVEE0Q+_pgwM9zIlOfTE3hKWk=
deleted file mode 100644
index f1f7e720..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZFXVEE0Q+_pgwM9zIlOfTE3hKWk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZNJB8z+Rx8QG_MHAXH7dxGbaPr8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZNJB8z+Rx8QG_MHAXH7dxGbaPr8=
deleted file mode 100644
index b3c19c82..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZNJB8z+Rx8QG_MHAXH7dxGbaPr8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zp7efoOCjN8A3FP9hMeF1uHz3xs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zp7efoOCjN8A3FP9hMeF1uHz3xs=
new file mode 100644
index 00000000..e7537bfb
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Zp7efoOCjN8A3FP9hMeF1uHz3xs= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_UztfyfbfN4X1NKXgvUO7_LmIn8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_UztfyfbfN4X1NKXgvUO7_LmIn8=
new file mode 100644
index 00000000..458ae464
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_UztfyfbfN4X1NKXgvUO7_LmIn8= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk=
deleted file mode 100644
index 2b56acdb..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_d2RL4OQAJk8U11_R+QRAA1v+Hk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aUsoarN1tozjq35XSMwQvryUThA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aUsoarN1tozjq35XSMwQvryUThA=
deleted file mode 100644
index b4c6c3e5..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aUsoarN1tozjq35XSMwQvryUThA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aZwAD4RR2M5p7N9rnu6g1Wd35Sk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aZwAD4RR2M5p7N9rnu6g1Wd35Sk=
deleted file mode 100644
index 649b73f9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aZwAD4RR2M5p7N9rnu6g1Wd35Sk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU=
deleted file mode 100644
index 083d96b0..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/adw7QYibDRLBF+sXs16Ev0zmEEU= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aujIChqebceixHR+A4PnzAK6Tiw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aujIChqebceixHR+A4PnzAK6Tiw=
deleted file mode 100644
index 64222523..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/aujIChqebceixHR+A4PnzAK6Tiw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bW1MIvhhVzZ2X_+L7Fa6YLEd9lE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bW1MIvhhVzZ2X_+L7Fa6YLEd9lE=
deleted file mode 100644
index 87d37d17..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bW1MIvhhVzZ2X_+L7Fa6YLEd9lE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ=
deleted file mode 100644
index e49acf79..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bvZ7tsg4LnFnp+GUzkNcUj13hQQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY=
index b2389f79..c3eef538 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ckBSyLsOMQZRFVnaUpcFut3PBlY= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw=
index 78c8ee6f..c42746e8 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cuswIUJ_XVBMvnLITScwP9XvmVw= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g=
index c91b4b7c..dbcfb158 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d1GVdz3af2_mVVhrYbj8IpL7d3g= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kJOsB4vJfdADBK1dp379kwTjAHM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d282QTzZ4C05SJYxD7wlKHVx++8=
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kJOsB4vJfdADBK1dp379kwTjAHM=
rename to src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d282QTzZ4C05SJYxD7wlKHVx++8=
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d39mCe0TVnHgIFL0eFaZr_Ir4So= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d39mCe0TVnHgIFL0eFaZr_Ir4So=
deleted file mode 100644
index 1df45570..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/d39mCe0TVnHgIFL0eFaZr_Ir4So= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM=
index 4ad1f783..d05d5f78 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dF4sgZwx4b+bv0JSomEgqR81+xM= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dLTnCqGkbd71_T_Y7gyZzPUNmZk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dLTnCqGkbd71_T_Y7gyZzPUNmZk=
deleted file mode 100644
index 339f6ff7..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dLTnCqGkbd71_T_Y7gyZzPUNmZk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eFgLsL_hw3aKKzMsyFQvf043v6A= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eFgLsL_hw3aKKzMsyFQvf043v6A=
deleted file mode 100644
index fc338031..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eFgLsL_hw3aKKzMsyFQvf043v6A= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eObdOiv0PdIpYIIJydLoCTSe3_w= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eObdOiv0PdIpYIIJydLoCTSe3_w=
deleted file mode 100644
index c91b4b7c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eObdOiv0PdIpYIIJydLoCTSe3_w= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fX9PdX1Kd2zZ6g8sXIlVnBF33OY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fX9PdX1Kd2zZ6g8sXIlVnBF33OY=
deleted file mode 100644
index 84d308f7..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fX9PdX1Kd2zZ6g8sXIlVnBF33OY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fXR0Gy_d2VeiFuNLlEgAfwSSOoE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fXR0Gy_d2VeiFuNLlEgAfwSSOoE=
deleted file mode 100644
index 45189c1f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fXR0Gy_d2VeiFuNLlEgAfwSSOoE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc=
index c2da9682..e550972b 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fqWY2qVL4_Ez5Kv0dfX3jMn9qDc= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/g373oxwayQBpO92Mmz0wYxsqbLE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/g373oxwayQBpO92Mmz0wYxsqbLE=
deleted file mode 100644
index 9a0bccb1..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/g373oxwayQBpO92Mmz0wYxsqbLE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQ+7Pobujbf+Lv8j+PGmfCoBqcw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQ+7Pobujbf+Lv8j+PGmfCoBqcw=
deleted file mode 100644
index ce8af08b..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQ+7Pobujbf+Lv8j+PGmfCoBqcw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA=
deleted file mode 100644
index d0dcd9ca..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gZsvIWthOdyBHb2ImuuV3ummgYA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/h1lB6aAw_UJrcVmykUIvVz2C1IQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/h1lB6aAw_UJrcVmykUIvVz2C1IQ=
new file mode 100644
index 00000000..761fe3bf
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/h1lB6aAw_UJrcVmykUIvVz2C1IQ= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j3MYmUjAZ09L9KPgQRGOTHgFuMY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j3MYmUjAZ09L9KPgQRGOTHgFuMY=
deleted file mode 100644
index 8f9517e4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j3MYmUjAZ09L9KPgQRGOTHgFuMY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg=
deleted file mode 100644
index 6bb2c493..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j4yejSjIDyNRJruXTLrRH1goQfg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c=
index f86d05d5..dc7b90ea 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jO92wKRGGEuMOXOWG15hJIY9a9c= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE=
deleted file mode 100644
index 87586a52..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jTL3nVyltHJWTayuQpfpi2l3jVE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jldW6upa2DouwpT4HKfGOK86AFE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jldW6upa2DouwpT4HKfGOK86AFE=
deleted file mode 100644
index d05d5f78..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jldW6upa2DouwpT4HKfGOK86AFE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kEMWC86DX9Ma1XZNXXNRcHek2PU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kEMWC86DX9Ma1XZNXXNRcHek2PU=
deleted file mode 100644
index b7ec4f61..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kEMWC86DX9Ma1XZNXXNRcHek2PU= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A=
deleted file mode 100644
index f61d7629..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVuWFk3v38bk_s3DhT3HBimZi5A= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA=
deleted file mode 100644
index 865488d1..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kxOJ6omnkGTGSLkWkK6uvE3WPbA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lAjQK_esGKsaMqa0ehgHCEHtLx0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lAjQK_esGKsaMqa0ehgHCEHtLx0=
deleted file mode 100644
index e361f36e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lAjQK_esGKsaMqa0ehgHCEHtLx0= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM=
index 0d3fc677..71460a18 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lOd5M8rdUcg3SxiGkOSVGZ3z2eM= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lQXS655Y1f0ikALw8KJ2XGRqTCM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lQXS655Y1f0ikALw8KJ2XGRqTCM=
deleted file mode 100644
index b2389f79..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lQXS655Y1f0ikALw8KJ2XGRqTCM= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4=
deleted file mode 100644
index 45e8d00a..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m7FxWFqXfcpk7O5I1kawOMgjELM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m7FxWFqXfcpk7O5I1kawOMgjELM=
deleted file mode 100644
index 6ccda32b..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m7FxWFqXfcpk7O5I1kawOMgjELM= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUv59e9ScSRkCSoEg6uIeYMPJZw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUv59e9ScSRkCSoEg6uIeYMPJZw=
new file mode 100644
index 00000000..8007b156
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nUv59e9ScSRkCSoEg6uIeYMPJZw= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U=
deleted file mode 100644
index 32d47c06..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oMRbVSO127SynEO0PF52lM6BI0U= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oR8H6kekyT+uk+aILpd6hPCAjEo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oR8H6kekyT+uk+aILpd6hPCAjEo=
new file mode 100644
index 00000000..2641da2c
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/oR8H6kekyT+uk+aILpd6hPCAjEo= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pps2cRtF_490SE7zrkXgTGyKWJU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pps2cRtF_490SE7zrkXgTGyKWJU=
new file mode 100644
index 00000000..cbd222df
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pps2cRtF_490SE7zrkXgTGyKWJU= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas=
deleted file mode 100644
index 371b4414..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pwD31j3uqAmZXTP9V1JknNCyqas= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZalQQtqmIOiIROHJ4su9Awk2hY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZalQQtqmIOiIROHJ4su9Awk2hY=
deleted file mode 100644
index 13914543..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZalQQtqmIOiIROHJ4su9Awk2hY= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak=
deleted file mode 100644
index 69b5bbb9..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg=
deleted file mode 100644
index a69b1ec0..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qy5QdwgYhkqfo9rupIMs5Zct0xg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rOcwFWYGO9U_WKOCDyl2mw1eCZ8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rOcwFWYGO9U_WKOCDyl2mw1eCZ8=
new file mode 100644
index 00000000..950761bd
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rOcwFWYGO9U_WKOCDyl2mw1eCZ8= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw=
deleted file mode 100644
index 1423435f..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rnWhB17wx6vpupDzhGOxQJ7WRrw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8=
deleted file mode 100644
index 3c086f36..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rp6ras1ObNzlZRWN6IWuQckK_Y8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc=
deleted file mode 100644
index b6ac9fe4..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rqTNaZPL59fCsVwBdjnx5tMkjkc= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcXRAGRG9XqV0zNhssCeSUF0bCQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcXRAGRG9XqV0zNhssCeSUF0bCQ=
deleted file mode 100644
index b36ab8e6..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tcXRAGRG9XqV0zNhssCeSUF0bCQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0=
index 1d2c72ac..2cec677c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uKFWa2MSAnwcyI7+5Krula_64p0= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM=
index 059b6808..1df45570 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ulvMB7l9pe7u3_2baIViwVz2BbM= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uvYlxeM45N8j6BeoqATmsL5BtlE= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uvYlxeM45N8j6BeoqATmsL5BtlE=
deleted file mode 100644
index 424fa8fa..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uvYlxeM45N8j6BeoqATmsL5BtlE= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vC9X2WfF4nX7eEzjs5PoF2U24L8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vC9X2WfF4nX7eEzjs5PoF2U24L8=
deleted file mode 100644
index a19a2a51..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vC9X2WfF4nX7eEzjs5PoF2U24L8= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A=
index a0a426bb..45189c1f 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A= and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vCKwT20Bhlx6HkiLdWwK_xdZK4A= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M=
deleted file mode 100644
index 1c79806c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vHe4xZfNMnHIevDWSOtu8t6vf_M= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vRBeI1qBCtDN6Zqo6egGHGJ84x4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vRBeI1qBCtDN6Zqo6egGHGJ84x4=
new file mode 100644
index 00000000..f8fa3a11
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vRBeI1qBCtDN6Zqo6egGHGJ84x4= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vuMT1WlNbnonXG0n6Ct5pFdtWlk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vuMT1WlNbnonXG0n6Ct5pFdtWlk=
new file mode 100644
index 00000000..4c9f52f7
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vuMT1WlNbnonXG0n6Ct5pFdtWlk= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wPpgwunQ7sR03T6bK2SIW6ZgVyw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wPpgwunQ7sR03T6bK2SIW6ZgVyw=
deleted file mode 100644
index 46bf9601..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wPpgwunQ7sR03T6bK2SIW6ZgVyw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wmZQ30QFZPmSC9tWFkItQ_aFQ3A= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wmZQ30QFZPmSC9tWFkItQ_aFQ3A=
new file mode 100644
index 00000000..62a09069
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wmZQ30QFZPmSC9tWFkItQ_aFQ3A= differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xJkIlW5q2WnJZgfJXh8Ets0kdls= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xJkIlW5q2WnJZgfJXh8Ets0kdls=
deleted file mode 100644
index a2b21b65..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xJkIlW5q2WnJZgfJXh8Ets0kdls= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yNbCdk6+kIGF6eeyNwShKzMzYQg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yNbCdk6+kIGF6eeyNwShKzMzYQg=
deleted file mode 100644
index a0010339..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yNbCdk6+kIGF6eeyNwShKzMzYQg= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk=
deleted file mode 100644
index 0fb7130e..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ynHVpgIVzjlbrmfz8TCVsRMqMYk= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zsfM+WAMYXAKUNEo4yG4F_fCy9o= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zsfM+WAMYXAKUNEo4yG4F_fCy9o=
deleted file mode 100644
index 144d863c..00000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zsfM+WAMYXAKUNEo4yG4F_fCy9o= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 85e42a1c..b0d503e1 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Wed Sep 15 21:32:59 CST 2021
+#Wed Nov 24 10:38:58 CST 2021
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
index aa17aff8..27387853 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml
@@ -1,2 +1,2 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 34b2978f..e86b8be7 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master1/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/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 20ec6eed..11c3baf1 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master1/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/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 003da674..7809e0e3 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,119 +1,119 @@
-#Mon Nov 22 17:15:40 CST 2021
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\app_bar_main.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_app_bar_main.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_ungrouped.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_ungrouped.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_life.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_life.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_all.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_all.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\side_nav_bar.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_side_nav_bar.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_login.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_login.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_recycle.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_recycle.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_launcher.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\activity_main_drawer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_activity_main_drawer.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\background.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_background.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\nav_header_main.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_nav_header_main.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_work.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_work.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\file_paths.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_file_paths.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\user_img.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_user_img.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_register.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_register.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\radio.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+#Wed Nov 24 09:40:52 CST 2021
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\radio.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_register.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_register.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\background.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_background.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\user_img.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_user_img.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_launcher.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_ungrouped.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_ungrouped.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_all.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_all.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\app_bar_main.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_app_bar_main.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\side_nav_bar.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_side_nav_bar.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\file_paths.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_file_paths.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_login.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_login.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_life.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_life.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_work.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_work.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\nav_header_main.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_nav_header_main.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\activity_main_drawer.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_activity_main_drawer.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_recycle.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_recycle.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index 18529a8a..7a562580 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
+ - 短信
+ - 邮件
+ 字数便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消日间模式夜间模式最近删除改变视图按时间排序初始排序添加密码删除密码确认删除该便签的密码吗?输入描述语输入密码输入密码输入用户名从相册选择背景相机拍摄背景图片登录注册退出登录
+ - %1$s 条符合“%2$s”的搜索结果
+
+ - 短信
+ - 郵件
+ 字數便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ - %1$s 條符合”%2$s“的搜尋結果
+
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_login.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_login.xml
deleted file mode 100644
index d16b2a7e..00000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_login.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_register.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_register.xml
deleted file mode 100644
index 2038ae3c..00000000
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_register.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 8b924a7a..c95d575a 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master1/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/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index f74fd33d..a4b85e3a 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Mon Nov 22 19:42:23 CST 2021
-base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Tue Jan 11 18:22:41 CST 2022
+base.0=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index de98955c..77d3027c 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
index 196e02cd..517673fc 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
index f101911d..8d420d59 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index b17f88b8..8d11c708 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class
index 1736c0b3..921ab4d1 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/AppBarMainBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class
index 0e8533e2..733b300a 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class
index d1d71a8f..e1ae1115 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class
index 385cd711..c14aebb3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NavHeaderMainBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class
index ab8883e0..ccb9c2fb 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class
index e0dfc1c3..62369531 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class
index 71306c7e..9686a5e2 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class
index 0461b6f1..83814e74 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class
index f4dd3db7..4a85f655 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class
index 2efb565d..1a628e51 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class
index 37a723e4..625844ee 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class
index c2b38564..e32eb849 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DBConnection.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 7baafa77..21fa518d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 98888d45..0a717e41 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 6a6701c3..4c32a7fc 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index aa64bc74..fc109073 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
index dde3f7cd..b555b7bd 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11$1.class
deleted file mode 100644
index a92ec93d..00000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11$1.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
index baedbb8b..29906953 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12$1.class
new file mode 100644
index 00000000..61d3cbdb
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
index 2d157393..31f34850 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
index d1f2fe59..9dc986ca 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14$1.class
similarity index 66%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13$1.class
rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14$1.class
index c6fa1cdb..097d5855 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class
index a5debb17..ded0718c 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class
index ca57a24a..dcd51e64 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$15.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class
index b928b570..3b54b22d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$16.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class
index bf1fe603..0070c157 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18$1.class
similarity index 59%
rename from src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17$1.class
rename to src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18$1.class
index 4ef1a2c1..66987d3d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$17$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class
index 04c41f88..cad5b4b9 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$18.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class
index 1e61b5e7..408e7bf3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$19.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index a98c1893..4bafe2bd 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$20.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$20.class
new file mode 100644
index 00000000..cfcfbbc3
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$20.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$21.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$21.class
new file mode 100644
index 00000000..d7ef1574
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$21.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index c1096002..8d9316e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 9daa29f3..9621c254 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index eff9c4ce..5b5252b9 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 0e11d6fa..42f589b2 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 6a77a359..3fd22fc3 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index d5d1f147..54c94db8 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 6f54cf5b..ee8cbe37 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 9098e74f..6e13f7e5 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index 6ff2e6be..bb5339ad 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index fdb532f3..8d06c65f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index f884a594..7b6e9556 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 5bf3c98d..d16f609a 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 830267bc..6d77eea0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index d4a9fafd..6667a024 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index bcaa8df6..0dafc6d9 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index d980483e..37d965ca 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index f4c48255..344c6146 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index 815d35c1..2c8bc691 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index 40e59282..05d90ae1 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index c4a91bb2..4de2fef1 100644
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -5,302 +5,302 @@
5 android:versionName="0.1" >
6
7 D:\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
+7-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
8 android:minSdkVersion="16"
-8-->D:\Notes-master1\app\src\main\AndroidManifest.xml:8:15-41
+8-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:15-41
9 android:targetSdkVersion="23" />
-9-->D:\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
+9-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
10
11
-11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
-11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
+11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
+11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
12
-12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:5-88
-12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:22-85
+12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:5-88
+12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:22-85
13
-13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
-13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
+13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
+13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
14
-14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:5-72
-14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:22-69
+14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:5-72
+14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:22-69
15
-15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:5-74
-15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:22-71
+15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:5-74
+15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:22-71
16
-16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:5-80
-16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:22-77
+16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:5-80
+16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:22-77
17
-17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:5-71
-17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:22-68
+17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:5-71
+17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:22-68
18
-18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:5-74
-18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:22-71
+18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:5-74
+18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:22-71
19
-19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:18:5-81
-19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:18:22-78
+19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:5-81
+19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:22-78
20
-20-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
-20-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
+20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
+20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
21
-21-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:5-71
-21-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:22-68
+21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:131:5-71
+21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:131:22-68
22
-22-->D:\Notes-master1\app\src\main\AndroidManifest.xml:132:5-79
-22-->D:\Notes-master1\app\src\main\AndroidManifest.xml:132:22-76
+22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:132:5-79
+22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:132:22-76
23
-23-->D:\Notes-master1\app\src\main\AndroidManifest.xml:133:5-76
-23-->D:\Notes-master1\app\src\main\AndroidManifest.xml:133:22-73
+23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:133:5-76
+23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:133:22-73
24
-24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:134:5-79
-24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:134:22-76
+24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:134:5-79
+24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:134:22-76
25
-25-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:5-75
-25-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:22-72
+25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:135:5-75
+25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:135:22-72
26
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:5-80
-26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:22-77
+26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:136:5-80
+26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:136:22-77
27
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
-27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
+27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
+27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
28
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:132:5-79
-28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:132:22-76
+28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:132:5-79
+28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:132:22-76
29
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:139:5-140:47
-29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:139:22-70
+29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:139:5-140:47
+29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:139:22-70
30
31 D:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-129:19
+31-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-129:19
32 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
-32-->[androidx.core:core:1.3.0] C:\Users\fanyi\.gradle\caches\transforms-3\87c9b5cf7927446432e906fee083466c\transformed\core-1.3.0\AndroidManifest.xml:24:18-86
+32-->[androidx.core:core:1.3.0] C:\Users\小超人\.gradle\caches\transforms-3\87c9b5cf7927446432e906fee083466c\transformed\core-1.3.0\AndroidManifest.xml:24:18-86
33 android:debuggable="true"
34 android:icon="@drawable/icon_app"
-34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:21:9-42
+34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:9-42
35 android:label="@string/app_name"
-35-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:9-41
+35-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:23:9-41
36 android:requestLegacyExternalStorage="true"
-36-->D:\Notes-master1\app\src\main\AndroidManifest.xml:22:9-52
+36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:22:9-52
37 android:testOnly="true" >
38 D:\Notes-master1\app\src\main\AndroidManifest.xml:25:9-37:20
+38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:9-37:20
39 android:name="net.micode.notes.ui.NotesListActivity"
-39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:13-49
+39-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-49
40 android:configChanges="keyboardHidden|orientation|screenSize"
-40-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:13-74
+40-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-74
41 android:label="@string/app_name"
-41-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:13-45
+41-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-45
42 android:launchMode="singleTop"
-42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:13-43
+42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:13-43
43 android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:13-71
+43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:13-71
44 android:uiOptions="splitActionBarWhenNarrow"
-44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:13-57
+44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-57
45 android:windowSoftInputMode="adjustPan" >
-45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:13-52
+45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:13-52
46
-46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:13-36:29
+46-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:13-36:29
47
-47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:34:17-69
-47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:34:25-66
+47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:17-69
+47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:25-66
48
49
-49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:35:17-77
-49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:35:27-74
+49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:35:17-77
+49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:35:27-74
50
51
52 D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-60:20
+52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-60:20
53 android:name="net.micode.notes.ui.NoteEditActivity"
-53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-48
+53-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-48
54 android:configChanges="keyboardHidden|orientation|screenSize"
-54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
55 android:launchMode="singleTop"
-55-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-43
+55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-43
56 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
-56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-71
+56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-71
57
-57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-50:29
+57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-50:29
58
-58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:17-79
-58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:25-76
+58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:17-79
+58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:25-76
59
60
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-76
-60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:27-73
+60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-76
+60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:27-73
61
62
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-78
-62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:23-75
+62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-78
+62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:23-75
63
-63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-78
-63-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:23-75
+63-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-78
+63-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:48:23-75
64
65
-65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:51:13-55:29
+65-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:51:13-55:29
66
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:52:17-71
-66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:52:25-68
+66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:52:17-71
+66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:52:25-68
67
68
-68-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-76
-68-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:27-73
+68-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-76
+68-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:27-73
69
70
71 D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-59:54
+71-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-59:54
72 android:name="android.app.searchable"
-72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:58:17-54
+72-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:58:17-54
73 android:resource="@xml/searchable" />
-73-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:17-51
+73-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:59:17-51
74
75 D:\Notes-master1\app\src\main\AndroidManifest.xml:61:9-65:78
+75-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:9-65:78
76 android:name="net.micode.notes.ui.AlarmAlertActivity"
-76-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:13-50
+76-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-50
77 android:label="@string/app_name"
-77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:63:13-45
+77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-45
78 android:launchMode="singleInstance"
-78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:64:13-48
+78-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:64:13-48
79 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
-79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:65:13-75
+79-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:65:13-75
80 D:\Notes-master1\app\src\main\AndroidManifest.xml:66:9-70:63
+80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:9-70:63
81 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-81-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:13-55
+81-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-55
82 android:label="@string/preferences_title"
-82-->D:\Notes-master1\app\src\main\AndroidManifest.xml:68:13-54
+82-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:68:13-54
83 android:launchMode="singleTop"
-83-->D:\Notes-master1\app\src\main\AndroidManifest.xml:69:13-43
+83-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:69:13-43
84 android:theme="@android:style/Theme.Holo.Light" />
-84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:70:13-60
+84-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:70:13-60
85
86 D:\Notes-master1\app\src\main\AndroidManifest.xml:72:9-74:52
+86-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:72:9-74:52
87 android:name="android.app.default_searchable"
-87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-58
+87-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-58
88 android:value=".ui.NoteEditActivity" />
-88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:13-49
+88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:13-49
89
90 D:\Notes-master1\app\src\main\AndroidManifest.xml:76:9-79:43
+90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:76:9-79:43
91 android:name="net.micode.notes.data.NotesProvider"
-91-->D:\Notes-master1\app\src\main\AndroidManifest.xml:77:13-47
+91-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:77:13-47
92 android:authorities="micode_notes"
-92-->D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-47
+92-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-47
93 android:multiprocess="true" />
-93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:13-40
+93-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:79:13-40
94
95 D:\Notes-master1\app\src\main\AndroidManifest.xml:81:9-93:20
+95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:81:9-93:20
96 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:82:13-57
+96-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-57
97 android:label="@string/app_widget2x2" >
-97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:13-50
+97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-50
98
-98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-88:29
+98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-88:29
99
-99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-84
-99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-81
+99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-84
+99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-81
100
-100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
-100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
+100-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
+100-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
101
-101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:87:17-85
-101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:87:25-82
+101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:87:17-85
+101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:87:25-82
102
103
104 D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:58
+104-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:58
105 android:name="android.appwidget.provider"
-105-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:17-58
+105-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-58
106 android:resource="@xml/widget_2x_info" />
-106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-55
+106-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-55
107
108 D:\Notes-master1\app\src\main\AndroidManifest.xml:94:9-106:20
+108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:9-106:20
109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:95:13-57
+109-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:95:13-57
110 android:label="@string/app_widget4x4" >
-110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:96:13-50
+110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:96:13-50
111
-111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-88:29
+111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-88:29
112
-112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-84
-112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-81
+112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-84
+112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-81
113
-113-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
-113-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
+113-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
+113-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
114
-114-->D:\Notes-master1\app\src\main\AndroidManifest.xml:87:17-85
-114-->D:\Notes-master1\app\src\main\AndroidManifest.xml:87:25-82
+114-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:87:17-85
+114-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:87:25-82
115
116
117 D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:58
+117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-92:58
118 android:name="android.appwidget.provider"
-118-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:17-58
+118-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-58
119 android:resource="@xml/widget_4x_info" />
-119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-55
+119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-55
120
121
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:9-111:20
-121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:19-55
+121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:9-111:20
+121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:19-55
122
-122-->D:\Notes-master1\app\src\main\AndroidManifest.xml:108:13-110:29
+122-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:108:13-110:29
123
-123-->D:\Notes-master1\app\src\main\AndroidManifest.xml:109:17-79
-123-->D:\Notes-master1\app\src\main\AndroidManifest.xml:109:25-76
+123-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:109:17-79
+123-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:109:25-76
124
125
126 D:\Notes-master1\app\src\main\AndroidManifest.xml:112:9-114:41
+126-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:112:9-114:41
127 android:name="net.micode.notes.ui.AlarmReceiver"
-127-->D:\Notes-master1\app\src\main\AndroidManifest.xml:113:13-45
+127-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:113:13-45
128 android:process=":remote" />
-128-->D:\Notes-master1\app\src\main\AndroidManifest.xml:114:13-38
+128-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:114:13-38
129
130 D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-118:40
+130-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-118:40
131 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-131-->D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-58
+131-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-58
132 android:exported="false" />
-132-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:13-37
+132-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:118:13-37
133
134 D:\Notes-master1\app\src\main\AndroidManifest.xml:119:9-128:20
+134-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:119:9-128:20
135 android:name="androidx.core.content.FileProvider"
-135-->D:\Notes-master1\app\src\main\AndroidManifest.xml:121:13-62
+135-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:121:13-62
136 android:authorities="com.example.cameraalbumtest.fileprovider"
-136-->D:\Notes-master1\app\src\main\AndroidManifest.xml:120:13-75
+136-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:120:13-75
137 android:exported="false"
-137-->D:\Notes-master1\app\src\main\AndroidManifest.xml:122:13-37
+137-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:13-37
138 android:grantUriPermissions="true" >
-138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-47
+138-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-47
139 D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-127:19
+139-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-127:19
140 android:name="android.support.FILE_PROVIDER_PATHS"
-140-->D:\Notes-master1\app\src\main\AndroidManifest.xml:125:17-67
+140-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:125:17-67
141 android:resource="@xml/file_paths" />
-141-->D:\Notes-master1\app\src\main\AndroidManifest.xml:126:17-51
+141-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:126:17-51
142
143
144
-144-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:9-73
-144-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:19-70
+144-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:9-73
+144-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:28:19-70
145
-145-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:9-87
-145-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:19-84
+145-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:9-87
+145-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:29:19-84
146
-146-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:9-90
-146-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\fanyi\.gradle\caches\transforms-3\53c79fecd0f35b4ed434f8248fa7ecfb\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:19-87
+146-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:9-90
+146-->[com.zhihu.android:matisse:0.5.2-beta4] C:\Users\小超人\.gradle\caches\transforms-3\d90a65d4ba4f9f63b01827ac34e90871\transformed\jetified-matisse-0.5.2-beta4\AndroidManifest.xml:30:19-87
147 [com.simple:spiderman:1.0.2] C:\Users\fanyi\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:12:9-16:20
+147-->[com.simple:spiderman:1.0.2] C:\Users\小超人\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:12:9-16:20
148 android:name="com.simple.spiderman.CrashActivity"
-148-->[com.simple:spiderman:1.0.2] C:\Users\fanyi\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:13:13-62
+148-->[com.simple:spiderman:1.0.2] C:\Users\小超人\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:13:13-62
149 android:launchMode="singleInstance"
-149-->[com.simple:spiderman:1.0.2] C:\Users\fanyi\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:14:13-48
+149-->[com.simple:spiderman:1.0.2] C:\Users\小超人\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:14:13-48
150 android:theme="@style/AppTheme" >
-150-->[com.simple:spiderman:1.0.2] C:\Users\fanyi\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:15:13-44
+150-->[com.simple:spiderman:1.0.2] C:\Users\小超人\.gradle\caches\transforms-3\7bd1a0e41b0fd55c93cf529ddb15a7aa\transformed\jetified-spiderman-1.0.2\AndroidManifest.xml:15:13-44
151
152
153
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index 78c77568..d937b302 100644
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -1,32 +1,32 @@
-1
-2
-4
-5 E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:5:5-74
-6 android:minSdkVersion="14"
-6-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:5:15-41
-7 android:targetSdkVersion="14" />
-7-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:5:42-71
-8
-9 E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:11:5-15:66
-10 android:name="android.test.InstrumentationTestRunner"
-10-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:11:22-75
-11 android:functionalTest="false"
-11-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:14:22-52
-12 android:handleProfiling="false"
-12-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:13:22-53
-13 android:label="Tests for net.micode.notes"
-13-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:15:22-64
-14 android:targetPackage="net.micode.notes" />
-14-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:12:22-62
-15
-16
-16-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:7:5-9:19
-17
-17-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:8:9-60
-17-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest3650653691502324255.xml:8:23-57
-18
-19
-20
+1
+2
+4
+5 E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:5:5-74
+6 android:minSdkVersion="16"
+6-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:5:15-41
+7 android:targetSdkVersion="23" />
+7-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:5:42-71
+8
+9 E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:11:5-15:66
+10 android:name="android.test.InstrumentationTestRunner"
+10-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:11:22-75
+11 android:functionalTest="false"
+11-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:14:22-52
+12 android:handleProfiling="false"
+12-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:13:22-53
+13 android:label="Tests for net.micode.notes"
+13-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:15:22-64
+14 android:targetPackage="net.micode.notes" />
+14-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:12:22-62
+15
+16
+16-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:7:5-9:19
+17
+17-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:8:9-60
+17-->E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17817325594987784537.xml:8:23-57
+18
+19
+20
diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar
index f5c85fe2..f544379b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar and b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
index 9a0e912e..7ee9470c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
index 3fcc8624..1ef1a874 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
index 636f43c5..a1e6dc99 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
index 71afe7ba..7114b2a6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
index 7fb6dfb0..9c16d510 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
index 654ac6b6..bcf90867 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
index 3aae5e2f..f5980f42 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
index 302aeff4..95a47f32 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
index e5eb8b41..d2a55eda 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
index 6cc95df3..4f12701d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
index ccc843af..34d2fd33 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
index 47429675..f5637f02 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
index 1398c535..06a903a1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
index 726619c2..6cef1dc9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
index 9c5a0148..c4252653 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
index 6ea7bf6d..f1c8d45a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
index 8d60ea50..b0d73c1d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
index f9c6ab97..8fe07065 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
index 1838cb68..4bf1e1ec 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
index a6dbcb93..b321a368 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
index 2880df8c..2aae04a3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
index 83c1c63b..292de1b5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
index 20017fcb..09779659 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat
index 4cb12d19..e6fe7823 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_launcher.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat
index e24f8205..6639d732 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_all.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat
index 97d61328..0399b8cb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_life.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat
index 02eaeda3..8fa1400b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_recycle.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat
index 029ef026..28daab86 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_ungrouped.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat
index 58ae3574..237e4157 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_ic_menu_nav_work.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
index d9d8f019..866c7724 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
index 8c750581..ae247e77 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
index 2047ac34..e0cae200 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
index 35d03f20..a09d977f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
index 2a2e4482..caa35a7d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
index 16696a84..ed5987f9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
index ca018404..196bf9b3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
index fe091133..885d9430 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
index 8250cfcb..c88d1ed4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
index 7d807faa..7c3bfd7d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
index 18056d59..a81463df 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
index ccb6e410..0c1a2401 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
index a5e25e0c..a1483200 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
index e2d684b7..cd1e49c2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
index 4865e3fa..a65cc8e6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
index 127dbc1b..ed02ff22 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
index 6fbb9b5e..95e0965b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
index 3efa49cf..d188b5db 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
index 8f653ea1..8a713dda 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
index e13fad77..7b3fb436 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
index e3579c58..d949d679 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
index 0b4a3252..a8533897 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
index 992026dc..41caa8d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
index 4502b78b..b64468e5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat
index 079d18f2..c2be9135 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
index cba8af00..bb4a3270 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
index f9d67b9c..b60fe70b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
index ca85394d..562e0377 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
index 76630b44..b1f87d06 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
index d16fb3a8..8ccce64e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
index 86df61c8..90c51d71 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat
index 493dc6f2..1833008c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat
index 0c020fc8..6dbfef9c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_radio.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
index 04c9b563..6ea0886b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
index 4b0436ab..2b11b104 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat
index fe2c271a..a1e4f16c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_side_nav_bar.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
index 10f5b226..c7c8e652 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
index e51619ce..99fba2d2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat
index 4352c647..89648f94 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_trash_background.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat
index baaac0a1..b082fbbe 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_user_img.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
index 4c621a1a..9b97ee39 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
index 0ec60341..a8ea428f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
index e2e3daf1..beb29da5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
index 49ec2627..ef913947 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
index e5ce872a..b0d701b5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
index 7bf3769f..89c73eed 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
index c99097e5..09abdb67 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
index 1a1164cc..c13ab022 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
index bfb1ac74..c991a5fa 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
index 9b25610d..bfc5250a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
index eccd6a69..5cd64cc9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
index dc8ec87d..e07dc2d6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
index 164e4ec2..44fa55aa 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat
index 3921a4d5..80637414 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_app_bar_main.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
index 5fc2be24..51a46913 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat
index 018b6653..3329bf43 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat
index ba46ab80..8835d9dd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_delete_senote.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
index d3f41223..c331db4f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat
index 81b9011b..6ce19cc6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat
index b25e6e73..b6d3c0cf 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_login.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat
index c44eec6b..d818382f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_register.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
index 47296b66..2f3c6fc7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat
index fabb5ab2..de54c7aa 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_nav_header_main.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index a9f4c7c2..c2fa9843 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
index f77e147a..3620e570 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
index c7b05bf3..1ceff90a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index b8cb37be..915b1c94 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
index 52bb46fe..65725737 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
index e1889476..75dd6377 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
index 6c17cc57..cf81282b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
index d2b3f997..20710da7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
index 391b0368..f817e223 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat
index a53948ed..5d5edd25 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_activity_main_drawer.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_background.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_background.xml.flat
index 86bc6e45..78945760 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_background.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_background.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
index 6936bfa6..7201eb05 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
index 3f221294..a319138e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c0557566..58122324 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index f1ab25de..be66d23e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
index 82984ff3..de681f70 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
index 902d00c6..d28a82e4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
index 451903a7..9455bfe6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat
index 8f466f54..05c0f748 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index b428c896..2f4826f9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat
index 61c08fe7..6b43b0f7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat
index 0d168ab4..bd001cc1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat
index 5d38499c..302d42e5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat
index 7cd8cb73..1e59e316 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat
index 173d0ff8..1f40eb50 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat
index fed9f152..f25ee4a9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat
index 32631651..33a76ef4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat
index f29506ce..21ec179e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat
index cf819b91..f8702d65 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat
index d7197521..b2edfdf4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat
index c3e65532..a22dc679 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat
index 086b4fdd..fa9d896c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat
index 01e8d1d8..2cb41486 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat
index fb18fa9c..e34c2845 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat
index 78056154..8836c735 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat
index 70cd0f79..f3bb787a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat
index 5ff4c73d..9dd4c64f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat
index 750715fd..3c881185 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat
index 1fd29950..75697d3e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat
index bbf57640..91d753c3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat
index 7aadb2e9..d1b6ca4a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat
index de10682a..3a5dfa9d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat
index 1f63995c..7205acbe 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat
index 2d35f856..f8057a2a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat
index b4f44e5d..24109af1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat
index ff61455b..a402c25b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat
index aea59ede..a4d3281c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat
index f6472111..c0a97bd7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat
index 9bc000fb..884cefaf 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat
index 4ad8d386..f3d781f2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat
index 875d9293..b37a1232 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat
index 739c181d..bb0e38c0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat
index 845ef43e..cfdcbc3a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat
index dd7278c0..65431aa5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat
index 721050c5..49edb15c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat
index b6b10d6d..6f252e8e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat
index 35a8a3c9..2bcd17d4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat
index adcfbeef..8241cac3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat
index 71245c09..36b2129a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat
index d78a53fd..38d3d63b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat
index f2fb3e05..ca9958e4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat
index 7fc7ac59..9d488011 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat
index 13e71696..a94a1c97 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat
index b0b93c6c..d35c486d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat
index 63a044f0..11327fea 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat
index 7ea5cdab..1df23e9d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat
index 9ce7dd99..818e21ea 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat
index 7a3b6538..e078c8f8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat
index 9ace9a6e..c3692156 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat
index 663963ad..4601ba77 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat
index f6fbe7cc..1c7c33e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat
index 068f9454..768416db 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat
index db9aa27a..c3a79051 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat
index 0f1e81d2..41ad5412 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat
index a2a826d9..68e836fe 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat
index 74571b63..998fe9b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat
index 0325e765..1627b523 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat
index 36bb94ad..2d292998 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat
index 0e2e2c51..85d0bde2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat
index 854d9948..5ffc9a31 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat
index 19a7a6c3..014f10ff 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat
index cc888c10..4a74b9fc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat
index e1243efd..3f44768c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat
index 733c6180..3029b3ab 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat
index 47a75abf..6fc1f58f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat
index 1e7d2702..9755817d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat
index 13786788..321237bc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat
index 9e0d5366..94ac650a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat
index 02f482b5..381805c8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat
index ac4eb5d8..b2c05da2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat
index 7e1d0994..4e716d50 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat
index 6dbda85b..96897f05 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat
index e5afdde4..f7de787c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat
index b30af218..5b396aa1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat
index 12fa271a..05c53c59 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat
index 6ef4efca..e910f7a6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat
index c15075ce..513adfa1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat
index e5e0e783..63301b30 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat
index 68457866..f93d8286 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat
index 3bc40c34..73c1c815 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat
index 41e0d021..d3dc9ccb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat
index 509c614d..943fe20d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat
index 6ae93777..cccccc7b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat
index f6ad263c..a208705a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat
index 14d49efc..d6682bdb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat
index 62f3f3fc..5e8e9aee 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr-rTR_values-tr-rTR.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat
index 4892129a..77b4cd82 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat
index 33833dd3..7087f76c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat
index cb6ff62e..bb28252c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat
index c0640f07..be8e0864 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat
index 6fdf6095..bf93468a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat
index 4eeb8baf..47e67e1f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat
index f97bb79b..d955c045 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat
index a5b2c932..22fe0a29 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat
index a57abf88..e8f5c549 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat
index a8b022af..ba8646d6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat
index ce29cc72..3722eb98 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat
index 960fd4a1..0d3e18c3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat
index 75401613..e1382096 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat
index ef855dbd..bc457d47 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat
index 26e0c0f8..7525b452 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat
index a92cfd29..22d48e0a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat
index 568dc861..741d2793 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat
index a1495667..52da35b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index a367edbd..6278026a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat
index 9bc9a5cc..ccbca9ae 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index 90bc1f1d..c92c213e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat
index f22f1859..f233cbdd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh_values-zh.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat
index ec0ab54d..69c3485a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 5ecff346..5276f25a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat
index 75962a7b..fbba3ea4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_file_paths.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
index a444fe8e..f9805a26 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
index 6bcba7af..b2d4d4cc 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
index 02fe8009..f7633074 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
index d85d6465..cf7f6ab4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 55ef4a09..ce5d7220 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,76 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ar\\values-ar.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "45",
- "startColumns": "4",
- "startOffsets": "3839",
- "endColumns": "100",
- "endOffsets": "3935"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ar\\values-ar.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,117,171,226,271,312,362,427,489,586,680,767,825,921,980",
- "endColumns": "61,53,54,44,40,49,64,61,96,93,86,57,95,58,53",
- "endOffsets": "112,166,221,266,307,357,422,484,581,675,762,820,916,975,1029"
- },
- "to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2779,2841,2895,2950,2995,3036,3086,3151,3213,3310,3404,3491,3549,3645,3704",
- "endColumns": "61,53,54,44,40,49,64,61,96,93,86,57,95,58,53",
- "endOffsets": "2836,2890,2945,2990,3031,3081,3146,3208,3305,3399,3486,3544,3640,3699,3753"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ar\\values-ar.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779",
- "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
- "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855"
- },
- "to": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
- "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",
- "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,3758",
- "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
- "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,3834"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tr\\values-tr.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786",
- "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78",
- "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860"
+ "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821",
+ "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83",
+ "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tr\\values-tr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -81,28 +25,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2865",
+ "startOffsets": "2905",
"endColumns": "100",
- "endOffsets": "2961"
+ "endOffsets": "3001"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es-rUS_values-es-rUS.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
- "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
- "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es-rUS\\values-es-rUS.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -117,94 +51,68 @@
"endColumns": "100",
"endOffsets": "3016"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
+ "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
+ "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
+ }
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-da\\values-da.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-night-v8\\values-night-v8.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765",
- "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78",
- "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839"
+ "startLines": "2,3,4,5,6,7,8",
+ "startColumns": "4,4,4,4,4,4,4",
+ "startOffsets": "55,125,209,293,389,491,593",
+ "endColumns": "69,83,83,95,101,101,93",
+ "endOffsets": "120,204,288,384,486,588,682"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-da\\values-da.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-night\\themes.xml",
"from": {
"startLines": "2",
"startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startOffsets": "19",
+ "endLines": "5",
+ "endColumns": "12",
+ "endOffsets": "252"
},
"to": {
- "startLines": "30",
+ "startLines": "9",
"startColumns": "4",
- "startOffsets": "2844",
- "endColumns": "100",
- "endOffsets": "2940"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v28\\values-v28.xml",
- "from": {
- "startLines": "2,3,4,8",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,130,217,447",
- "endLines": "2,3,7,11",
- "endColumns": "74,86,12,12",
- "endOffsets": "125,212,442,684"
+ "startOffsets": "687",
+ "endLines": "12",
+ "endColumns": "12",
+ "endOffsets": "917"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-si\\values-si.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2903",
- "endColumns": "100",
- "endOffsets": "2999"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-si\\values-si.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
- "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
- "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
+ "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834",
+ "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80",
+ "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ml\\values-ml.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -215,28 +123,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2955",
+ "startOffsets": "2915",
"endColumns": "100",
- "endOffsets": "3051"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ml\\values-ml.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873",
- "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81",
- "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950"
+ "endOffsets": "3011"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -247,69 +145,86 @@
"to": {
"startLines": "45",
"startColumns": "4",
- "startOffsets": "3988",
+ "startOffsets": "3942",
"endColumns": "100",
- "endOffsets": "4084"
+ "endOffsets": "4038"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
- "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
- "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
+ "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
+ "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
+ "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
},
"to": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
"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",
- "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,3906",
- "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
- "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,3983"
+ "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,3859",
+ "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
+ "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,3937"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,104,163,224,270,311,368,435,508,633,732,836,898,1004,1065",
- "endColumns": "48,58,60,45,40,56,66,72,124,98,103,61,105,60,53",
- "endOffsets": "99,158,219,265,306,363,430,503,628,727,831,893,999,1060,1114"
+ "startOffsets": "55,112,168,226,275,316,369,433,505,620,703,802,863,975,1037",
+ "endColumns": "56,55,57,48,40,52,63,71,114,82,98,60,111,61,53",
+ "endOffsets": "107,163,221,270,311,364,428,500,615,698,797,858,970,1032,1086"
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2842,2891,2950,3011,3057,3098,3155,3222,3295,3420,3519,3623,3685,3791,3852",
- "endColumns": "48,58,60,45,40,56,66,72,124,98,103,61,105,60,53",
- "endOffsets": "2886,2945,3006,3052,3093,3150,3217,3290,3415,3514,3618,3680,3786,3847,3901"
+ "startOffsets": "2823,2880,2936,2994,3043,3084,3137,3201,3273,3388,3471,3570,3631,3743,3805",
+ "endColumns": "56,55,57,48,40,52,63,71,114,82,98,60,111,61,53",
+ "endOffsets": "2875,2931,2989,3038,3079,3132,3196,3268,3383,3466,3565,3626,3738,3800,3854"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843",
- "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
- "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920"
+ "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834",
+ "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
+ "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910"
},
"to": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
"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",
- "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,3845",
- "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
- "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,3922"
+ "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,3877",
+ "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
+ "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,3953"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ca\\values-ca.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,103,161,221,268,309,366,427,496,613,711,814,876,981,1044",
+ "endColumns": "47,57,59,46,40,56,60,68,116,97,102,61,104,62,53",
+ "endOffsets": "98,156,216,263,304,361,422,491,608,706,809,871,976,1039,1093"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2834,2882,2940,3000,3047,3088,3145,3206,3275,3392,3490,3593,3655,3760,3823",
+ "endColumns": "47,57,59,46,40,56,60,68,116,97,102,61,104,62,53",
+ "endOffsets": "2877,2935,2995,3042,3083,3140,3201,3270,3387,3485,3588,3650,3755,3818,3872"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -320,45 +235,43 @@
"to": {
"startLines": "45",
"startColumns": "4",
- "startOffsets": "3927",
+ "startOffsets": "3958",
"endColumns": "100",
- "endOffsets": "4023"
+ "endOffsets": "4054"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,110,167,226,273,314,366,426,497,586,668,773,834,940,1003",
- "endColumns": "54,56,58,46,40,51,59,70,88,81,104,60,105,62,53",
- "endOffsets": "105,162,221,268,309,361,421,492,581,663,768,829,935,998,1052"
- },
- "to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2843,2898,2955,3014,3061,3102,3154,3214,3285,3374,3456,3561,3622,3728,3791",
- "endColumns": "54,56,58,46,40,51,59,70,88,81,104,60,105,62,53",
- "endOffsets": "2893,2950,3009,3056,3097,3149,3209,3280,3369,3451,3556,3617,3723,3786,3840"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "112",
+ "endOffsets": "163"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sr_values-sr.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bn\\values-bn.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,317,423,509,613,731,812,892,983,1076,1172,1266,1367,1460,1555,1660,1751,1842,1930,2035,2143,2244,2348,2456,2557,2724,2821",
- "endColumns": "108,102,105,85,103,117,80,79,90,92,95,93,100,92,94,104,90,90,87,104,107,100,103,107,100,166,96,83",
- "endOffsets": "209,312,418,504,608,726,807,887,978,1071,1167,1261,1362,1455,1550,1655,1746,1837,1925,2030,2138,2239,2343,2451,2552,2719,2816,2900"
+ "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857",
+ "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81",
+ "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bn\\values-bn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -369,50 +282,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2905",
+ "startOffsets": "2939",
"endColumns": "100",
- "endOffsets": "3001"
+ "endOffsets": "3035"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ky\\values-ky.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802",
- "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80",
- "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ky\\values-ky.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2883",
- "endColumns": "100",
- "endOffsets": "2979"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sv\\values-sv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -423,28 +304,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2863",
+ "startOffsets": "2891",
"endColumns": "100",
- "endOffsets": "2959"
+ "endOffsets": "2987"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sv\\values-sv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
- "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
- "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
+ "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809",
+ "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81",
+ "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr_values-tr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tr\\values-tr.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,309,421,506,612,732,811,887,978,1071,1164,1258,1356,1449,1551,1646,1737,1828,1907,2014,2119,2215,2322,2424,2532,2688,2786",
+ "endColumns": "104,98,111,84,105,119,78,75,90,92,92,93,97,92,101,94,90,90,78,106,104,95,106,101,107,155,97,78",
+ "endOffsets": "205,304,416,501,607,727,806,882,973,1066,1159,1253,1351,1444,1546,1641,1732,1823,1902,2009,2114,2210,2317,2419,2527,2683,2781,2860"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tr\\values-tr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -455,60 +346,52 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "2865",
"endColumns": "100",
- "endOffsets": "2942"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "endOffsets": "2961"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-land\\values-land.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "endLines": "5",
+ "endColumns": "10",
+ "endOffsets": "222"
},
"to": {
- "startLines": "30",
+ "startLines": "5",
"startColumns": "4",
- "startOffsets": "2846",
- "endColumns": "100",
- "endOffsets": "2942"
+ "startOffsets": "264",
+ "endLines": "8",
+ "endColumns": "10",
+ "endOffsets": "431"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-land\\values-land.xml",
+ "from": {
+ "startLines": "2,3,4",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,125,196",
+ "endColumns": "69,70,67",
+ "endOffsets": "120,191,259"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-it_values-it.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-es_values-es.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -519,137 +402,128 @@
"to": {
"startLines": "45",
"startColumns": "4",
- "startOffsets": "3942",
+ "startOffsets": "3988",
"endColumns": "100",
- "endOffsets": "4038"
+ "endOffsets": "4084"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,2823",
- "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
- "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,2901"
+ "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,2842",
+ "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
+ "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,2919"
},
"to": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
"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",
- "startOffsets": "105,214,314,423,507,616,741,818,894,986,1080,1174,1268,1370,1464,1561,1667,1759,1851,1932,2038,2146,2244,2348,2453,2560,2723,3859",
- "endColumns": "108,99,108,83,108,124,76,75,91,93,93,93,101,93,96,105,91,91,80,105,107,97,103,104,106,162,99,82",
- "endOffsets": "209,309,418,502,611,736,813,889,981,1075,1169,1263,1365,1459,1556,1662,1754,1846,1927,2033,2141,2239,2343,2448,2555,2718,2818,3937"
+ "startOffsets": "105,222,335,443,528,629,757,842,924,1016,1110,1208,1302,1403,1497,1593,1689,1781,1873,1955,2062,2162,2261,2369,2476,2583,2742,3906",
+ "endColumns": "116,112,107,84,100,127,84,81,91,93,97,93,100,93,95,95,91,91,81,106,99,98,107,106,106,158,99,81",
+ "endOffsets": "217,330,438,523,624,752,837,919,1011,1105,1203,1297,1398,1492,1588,1684,1776,1868,1950,2057,2157,2256,2364,2471,2578,2737,2837,3983"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,112,168,226,275,316,369,433,505,620,703,802,863,975,1037",
- "endColumns": "56,55,57,48,40,52,63,71,114,82,98,60,111,61,53",
- "endOffsets": "107,163,221,270,311,364,428,500,615,698,797,858,970,1032,1086"
+ "startOffsets": "55,104,163,224,270,311,368,435,508,633,732,836,898,1004,1065",
+ "endColumns": "48,58,60,45,40,56,66,72,124,98,103,61,105,60,53",
+ "endOffsets": "99,158,219,265,306,363,430,503,628,727,831,893,999,1060,1114"
},
"to": {
"startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2823,2880,2936,2994,3043,3084,3137,3201,3273,3388,3471,3570,3631,3743,3805",
- "endColumns": "56,55,57,48,40,52,63,71,114,82,98,60,111,61,53",
- "endOffsets": "2875,2931,2989,3038,3079,3132,3196,3268,3383,3466,3565,3626,3738,3800,3854"
+ "startOffsets": "2842,2891,2950,3011,3057,3098,3155,3222,3295,3420,3519,3623,3685,3791,3852",
+ "endColumns": "48,58,60,45,40,56,66,72,124,98,103,61,105,60,53",
+ "endOffsets": "2886,2945,3006,3052,3093,3150,3217,3290,3415,3514,3618,3680,3786,3847,3901"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v24\\values-v24.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
"from": {
- "startLines": "2,3",
- "startColumns": "4,4",
- "startOffsets": "55,212",
- "endColumns": "156,134",
- "endOffsets": "207,342"
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,124,193,263,337,413,472,543",
+ "endColumns": "68,68,69,73,75,58,70,67",
+ "endOffsets": "119,188,258,332,408,467,538,606"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v24\\values-v24.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
"from": {
- "startLines": "2,3,4,5",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,121,182,248",
- "endColumns": "65,60,65,66",
- "endOffsets": "116,177,243,310"
+ "startLines": "2,3,4,5,6,7,8,10,11,12",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,115,185,256,328,386,444,553,617,680",
+ "endLines": "2,3,4,5,6,7,9,10,11,15",
+ "endColumns": "59,69,70,71,57,57,10,63,62,10",
+ "endOffsets": "110,180,251,323,381,439,548,612,675,847"
},
"to": {
- "startLines": "4,5,6,7",
- "startColumns": "4,4,4,4",
- "startOffsets": "347,413,474,540",
- "endColumns": "65,60,65,66",
- "endOffsets": "408,469,535,602"
+ "startLines": "10,11,12,13,14,15,16,18,19,20",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "611,671,741,812,884,942,1000,1109,1173,1236",
+ "endLines": "10,11,12,13,14,15,17,18,19,23",
+ "endColumns": "59,69,70,71,57,57,10,63,62,10",
+ "endOffsets": "666,736,807,879,937,995,1104,1168,1231,1403"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-da_values-da.arsc.flat",
"map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-da\\values-da.xml",
"from": {
- "startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24",
- "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",
- "startOffsets": "6673,3691,3624,3550,3499,890,931,980,6213,6259,6618,6567,1269,3955,4024,3895,3828,3764,4698,4637,4573,4158,3062,1442,1496,4213,1849,6317,3439,3222,1961,2248,2499,2015,3001,2947,2895,2696,2647,2551,2600,2743,2791,2292,3379,2842,3266,2204,2451,2394,2338,3166,2159,3123,2066,2108,3319,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5080,5020,5223,6136,5539,5469,5604,5683,5868,5794,5156,5413,5281,5347,4970,5973,6057,6528,6419,6370,6465,1332,4102,4513,4813,4754,4881,4464,4418,4369,4317,1029,1096",
- "endLines": "125,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6847,3758,3685,3618,3544,925,974,1023,6253,6311,6667,6612,1326,4018,4096,3949,3889,3822,4748,4692,4631,4207,3117,1490,1553,4292,1924,6362,3493,3260,2009,2286,2545,2060,3056,2995,2941,2737,2690,2594,2641,2785,2836,2332,3433,2889,3313,2242,2493,2445,2388,3216,2198,3160,2102,2153,3373,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5150,5074,5275,6205,5598,5533,5677,5788,5967,5862,5217,5463,5341,5407,5014,6051,6130,6561,6459,6413,6522,1384,4152,4567,4875,4807,4938,4507,4458,4412,4363,1090,1157"
- },
- "to": {
- "startLines": "6,37,38,39,40,41,42,43,47,53,54,55,56,60,61,62,66,67,68,69,70,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,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
- "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",
- "startOffsets": "215,3000,3072,3138,3211,3261,3301,3349,3542,3823,3880,3934,3984,4213,4281,4358,4597,4663,4726,4781,4841,5019,5073,5133,5186,5248,5332,5412,5462,5521,5564,5617,5660,5711,5761,5821,5874,5925,5971,6019,6067,6113,6160,6210,6255,6314,6366,6418,6461,6508,6564,6619,6674,6718,6760,6801,6851,6910,6961,7004,7053,7102,7149,7196,7243,7288,7339,7443,7518,7577,7634,7708,7772,7841,7919,8029,8133,8206,8272,8327,8392,8457,8506,8589,8667,8705,8750,8876,8938,9096,9151,9210,9277,9335,9397,9445,9490,9538,9589,9655",
- "endLines": "8,37,38,39,40,41,42,43,47,53,54,55,56,60,61,62,66,67,68,69,70,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,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,3067,3133,3206,3256,3296,3344,3392,3582,3875,3929,3979,4041,4276,4353,4412,4658,4721,4776,4836,4899,5068,5128,5181,5243,5327,5407,5457,5516,5559,5612,5655,5706,5756,5816,5869,5920,5966,6014,6062,6108,6155,6205,6250,6309,6361,6413,6456,6503,6559,6614,6669,6713,6755,6796,6846,6905,6956,6999,7048,7097,7144,7191,7238,7283,7334,7387,7513,7572,7629,7703,7767,7836,7914,8024,8128,8201,8267,8322,8387,8452,8501,8584,8662,8700,8745,8793,8933,8990,9146,9205,9272,9330,9392,9440,9485,9533,9584,9650,9716"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,208,307,419,502,602,715,792,869,960,1053,1149,1243,1338,1431,1526,1624,1715,1806,1885,1994,2102,2198,2312,2414,2515,2668,2765",
+ "endColumns": "102,98,111,82,99,112,76,76,90,92,95,93,94,92,94,97,90,90,78,108,107,95,113,101,100,152,96,78",
+ "endOffsets": "203,302,414,497,597,710,787,864,955,1048,1144,1238,1333,1426,1521,1619,1710,1801,1880,1989,2097,2193,2307,2409,2510,2663,2760,2839"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-da\\values-da.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,101,151,203,246,289,336,382,431,482,530,583,649,710,775,829,889,944",
- "endColumns": "45,49,51,42,42,46,45,48,50,47,52,65,60,64,53,59,54,50",
- "endOffsets": "96,146,198,241,284,331,377,426,477,525,578,644,705,770,824,884,939,990"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "36,44,45,46,48,49,50,51,52,57,58,59,63,64,65,71,72,119",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2954,3397,3447,3499,3587,3630,3677,3723,3772,4046,4094,4147,4417,4478,4543,4904,4964,7392",
- "endColumns": "45,49,51,42,42,46,45,48,50,47,52,65,60,64,53,59,54,50",
- "endOffsets": "2995,3442,3494,3537,3625,3672,3718,3767,3818,4089,4142,4208,4473,4538,4592,4959,5014,7438"
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2844",
+ "endColumns": "100",
+ "endOffsets": "2940"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ky_values-ky.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
- },
- "to": {
- "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
- "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",
- "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8798",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8871"
+ "startOffsets": "105,209,304,423,507,614,731,809,888,979,1072,1168,1262,1363,1456,1551,1646,1737,1828,1909,2019,2126,2224,2330,2437,2538,2699,2802",
+ "endColumns": "103,94,118,83,106,116,77,78,90,92,95,93,100,92,94,94,90,90,80,109,106,97,105,106,100,160,102,80",
+ "endOffsets": "204,299,418,502,609,726,804,883,974,1067,1163,1257,1358,1451,1546,1641,1732,1823,1904,2014,2121,2219,2325,2432,2533,2694,2797,2878"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -658,49 +532,30 @@
"endOffsets": "151"
},
"to": {
- "startLines": "143",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "8995",
+ "startOffsets": "2883",
"endColumns": "100",
- "endOffsets": "9091"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
+ "endOffsets": "2979"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bn_values-bn.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,326,432,526,631,760,838,916,1007,1100,1195,1289,1390,1483,1578,1672,1763,1854,1941,2051,2159,2258,2368,2474,2587,2752,2857",
- "endColumns": "108,111,105,93,104,128,77,77,90,92,94,93,100,92,94,93,90,90,86,109,107,98,109,105,112,164,104,81",
- "endOffsets": "209,321,427,521,626,755,833,911,1002,1095,1190,1284,1385,1478,1573,1667,1758,1849,1936,2046,2154,2253,2363,2469,2582,2747,2852,2934"
+ "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864",
+ "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81",
+ "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -711,74 +566,82 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2939",
+ "startOffsets": "2946",
"endColumns": "100",
- "endOffsets": "3035"
+ "endOffsets": "3042"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ca_values-ca.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ml_values-ml.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ml\\values-ml.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,2834",
- "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
- "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,2910"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
- "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",
- "startOffsets": "105,223,329,436,519,627,753,837,918,1009,1102,1196,1291,1390,1483,1576,1670,1761,1852,1935,2046,2155,2253,2363,2467,2575,2735,3877",
- "endColumns": "117,105,106,82,107,125,83,80,90,92,93,94,98,92,92,93,90,90,82,110,108,97,109,103,107,159,98,80",
- "endOffsets": "218,324,431,514,622,748,832,913,1004,1097,1191,1286,1385,1478,1571,1665,1756,1847,1930,2041,2150,2248,2358,2462,2570,2730,2829,3953"
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2955",
+ "endColumns": "100",
+ "endOffsets": "3051"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ml\\values-ml.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,103,161,221,268,309,366,427,496,613,711,814,876,981,1044",
- "endColumns": "47,57,59,46,40,56,60,68,116,97,102,61,104,62,53",
- "endOffsets": "98,156,216,263,304,361,422,491,608,706,809,871,976,1039,1093"
- },
- "to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2834,2882,2940,3000,3047,3088,3145,3206,3275,3392,3490,3593,3655,3760,3823",
- "endColumns": "47,57,59,46,40,56,60,68,116,97,102,61,104,62,53",
- "endOffsets": "2877,2935,2995,3042,3083,3140,3201,3270,3387,3485,3588,3650,3755,3818,3872"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,342,457,550,655,787,864,940,1031,1124,1226,1320,1421,1515,1610,1709,1800,1891,1973,2084,2190,2288,2402,2502,2613,2772,2873",
+ "endColumns": "118,117,114,92,104,131,76,75,90,92,101,93,100,93,94,98,90,90,81,110,105,97,113,99,110,158,100,81",
+ "endOffsets": "219,337,452,545,650,782,859,935,1026,1119,1221,1315,1416,1510,1605,1704,1795,1886,1968,2079,2185,2283,2397,2497,2608,2767,2868,2950"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
+ "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
+ "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rXC\\values-en-rXC.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "endColumns": "203",
+ "endOffsets": "254"
},
"to": {
- "startLines": "45",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "3958",
- "endColumns": "100",
- "endOffsets": "4054"
+ "startOffsets": "5682",
+ "endColumns": "203",
+ "endOffsets": "5881"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-cs_values-cs.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-my\\values-my.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -789,102 +652,102 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2891",
+ "startOffsets": "2979",
"endColumns": "100",
- "endOffsets": "2987"
+ "endOffsets": "3075"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-my\\values-my.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,212,314,423,509,614,731,812,893,984,1077,1173,1267,1362,1455,1550,1647,1738,1829,1913,2017,2126,2225,2331,2441,2548,2711,2809",
- "endColumns": "106,101,108,85,104,116,80,80,90,92,95,93,94,92,94,96,90,90,83,103,108,98,105,109,106,162,97,81",
- "endOffsets": "207,309,418,504,609,726,807,888,979,1072,1168,1262,1357,1450,1545,1642,1733,1824,1908,2012,2121,2220,2326,2436,2543,2706,2804,2886"
+ "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
+ "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
+ "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-am\\values-am.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,3",
+ "startColumns": "4,4",
+ "startOffsets": "55,177",
+ "endColumns": "121,133",
+ "endOffsets": "172,306"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2817",
- "endColumns": "100",
- "endOffsets": "2913"
+ "startLines": "11,12",
+ "startColumns": "4,4",
+ "startOffsets": "752,874",
+ "endColumns": "121,133",
+ "endOffsets": "869,1003"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-am\\values-am.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738",
- "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78",
- "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812"
+ "startLines": "2,3,4,5,6,7,8,9,10",
+ "startColumns": "4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,185,256,326,396,464,532,636",
+ "endColumns": "58,70,70,69,69,67,67,103,115",
+ "endOffsets": "109,180,251,321,391,459,527,631,747"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rXC_values-en-rXC.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v24_values-v24.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v24\\values-v24.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "203",
- "endOffsets": "254"
+ "startLines": "2,3,4,5",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,121,182,248",
+ "endColumns": "65,60,65,66",
+ "endOffsets": "116,177,243,310"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "5682",
- "endColumns": "203",
- "endOffsets": "5881"
+ "startLines": "4,5,6,7",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "347,413,474,540",
+ "endColumns": "65,60,65,66",
+ "endOffsets": "408,469,535,602"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v24\\values-v24.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
- "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
- "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
+ "startLines": "2,3",
+ "startColumns": "4,4",
+ "startOffsets": "55,212",
+ "endColumns": "156,134",
+ "endOffsets": "207,342"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801",
+ "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81",
+ "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -895,44 +758,99 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2846",
+ "startOffsets": "2883",
"endColumns": "100",
- "endOffsets": "2942"
+ "endOffsets": "2979"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v21\\values-v21.xml",
"from": {
- "startLines": "2,5,8",
- "startColumns": "4,4,4",
- "startOffsets": "55,214,385",
- "endLines": "4,7,10",
- "endColumns": "12,12,12",
- "endOffsets": "209,380,553"
+ "startLines": "2,5,8,11",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,223,386,554",
+ "endLines": "4,7,10,13",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "218,381,549,716"
+ },
+ "to": {
+ "startLines": "265,268,272,276",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "19518,19686,19975,20271",
+ "endLines": "267,270,274,278",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "19681,19844,20138,20433"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
+ "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",
+ "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
+ },
+ "to": {
+ "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
+ "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",
+ "startOffsets": "368,459,562,665,770,877,986,1095,1204,1313,1422,1529,1632,1751,1906,2061,2166,2287,2388,2535,2676,2779,2898,3005,3108,3263,3434,3583,3748,3905,4056,4175,4547,4696,4845,4957,5104,5257,5404,5479,5568,5655,5756,5859,8927,9112,12192,12389,12588,12711,12834,12947,13130,13261,13462,13551,13662,13895,13996,14091,14214,14343,14460,14637,14736,14871,15014,15149,15268,15469,15588,15681,15792,15848,15955,16150,16261,16394,16489,16580,16671,16788,16927,16998,17081,17761,17818,17876,18570",
+ "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "454,557,660,765,872,981,1090,1199,1308,1417,1524,1627,1746,1901,2056,2161,2282,2383,2530,2671,2774,2893,3000,3103,3258,3429,3578,3743,3900,4051,4170,4542,4691,4840,4952,5099,5252,5399,5474,5563,5650,5751,5854,8922,9107,12187,12384,12583,12706,12829,12942,13125,13256,13457,13546,13657,13890,13991,14086,14209,14338,14455,14632,14731,14866,15009,15144,15263,15464,15583,15676,15787,15843,15950,16145,16256,16389,16484,16575,16666,16783,16922,16993,17076,17756,17813,17871,18565,19271"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,10,18,26",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,484,910,1333",
+ "endLines": "9,17,25,33",
+ "endColumns": "10,10,10,10",
+ "endOffsets": "479,905,1328,1763"
+ },
+ "to": {
+ "startLines": "279,287,295,303",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "20438,20867,21293,21716",
+ "endLines": "286,294,302,310",
+ "endColumns": "10,10,10,10",
+ "endOffsets": "20862,21288,21711,22146"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,13",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,173,237,304,368,484,610,736,864,1036",
+ "endLines": "2,3,4,5,6,7,8,9,12,17",
+ "endColumns": "117,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "168,232,299,363,479,605,731,859,1031,1383"
+ },
+ "to": {
+ "startLines": "2,3,4,5,263,264,271,275,311,314",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,173,237,304,19276,19392,19849,20143,22151,22323",
+ "endLines": "2,3,4,5,263,264,271,275,313,318",
+ "endColumns": "117,63,66,63,115,125,125,127,12,12",
+ "endOffsets": "168,232,299,363,19387,19513,19970,20266,22318,22670"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-te_values-te.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-am_values-am.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-te\\values-te.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,219,328,439,529,634,759,841,923,1014,1107,1203,1297,1398,1491,1586,1681,1772,1863,1947,2060,2168,2267,2378,2480,2597,2763,2864",
- "endColumns": "113,108,110,89,104,124,81,81,90,92,95,93,100,92,94,94,90,90,83,112,107,98,110,101,116,165,100,81",
- "endOffsets": "214,323,434,524,629,754,836,918,1009,1102,1198,1292,1393,1486,1581,1676,1767,1858,1942,2055,2163,2262,2373,2475,2592,2758,2859,2941"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-te\\values-te.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -943,43 +861,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2946",
+ "startOffsets": "2817",
"endColumns": "100",
- "endOffsets": "3042"
+ "endOffsets": "2913"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-port\\values-port.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-am\\values-am.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "55",
- "endOffsets": "106"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,207,306,412,498,601,714,792,870,961,1054,1147,1241,1342,1435,1530,1624,1715,1805,1884,1984,2084,2180,2283,2382,2489,2642,2738",
+ "endColumns": "101,98,105,85,102,112,77,77,90,92,92,93,100,92,94,93,90,89,78,99,99,95,102,98,106,152,95,78",
+ "endOffsets": "202,301,407,493,596,709,787,865,956,1049,1142,1236,1337,1430,1525,1619,1710,1800,1879,1979,2079,2175,2278,2377,2484,2637,2733,2812"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-my_values-my.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-my\\values-my.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
- "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
- "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-my\\values-my.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -990,69 +893,100 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2979",
+ "startOffsets": "2912",
"endColumns": "100",
- "endOffsets": "3075"
+ "endOffsets": "3008"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
+ "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
+ "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ar_values-ar.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v18\\values-v18.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ar\\values-ar.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "48",
- "endOffsets": "99"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,117,171,226,271,312,362,427,489,586,680,767,825,921,980",
+ "endColumns": "61,53,54,44,40,49,64,61,96,93,86,57,95,58,53",
+ "endOffsets": "112,166,221,266,307,357,422,484,581,675,762,820,916,975,1029"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2779,2841,2895,2950,2995,3036,3086,3151,3213,3310,3404,3491,3549,3645,3704",
+ "endColumns": "61,53,54,44,40,49,64,61,96,93,86,57,95,58,53",
+ "endOffsets": "2836,2890,2945,2990,3031,3081,3146,3208,3305,3399,3486,3544,3640,3699,3753"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ar\\values-ar.xml",
"from": {
- "startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,394,441,498,557,603,644,697,753,809,867,912,983,1081,1176,1248,1348,1420",
- "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24",
- "endColumns": "14,46,56,58,45,40,52,55,55,57,44,70,97,94,71,99,71,53",
- "endOffsets": "389,436,493,552,598,639,692,748,804,862,907,978,1076,1171,1243,1343,1415,1469"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "105,3171,3218,3275,3334,3380,3421,3474,3530,3586,3644,3689,3760,3858,3953,4025,4125,4197",
- "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51",
- "endColumns": "14,46,56,58,45,40,52,55,55,57,44,70,97,94,71,99,71,53",
- "endOffsets": "439,3213,3270,3329,3375,3416,3469,3525,3581,3639,3684,3755,3853,3948,4020,4120,4192,4246"
+ "startLines": "45",
+ "startColumns": "4",
+ "startOffsets": "3839",
+ "endColumns": "100",
+ "endOffsets": "3935"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
- "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
- "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
+ "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,2779",
+ "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
+ "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,2855"
},
"to": {
- "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,52",
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
"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",
- "startOffsets": "444,559,661,773,859,964,1084,1163,1241,1333,1427,1523,1616,1712,1806,1902,1997,2089,2181,2261,2367,2475,2573,2682,2788,2896,3071,4251",
- "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
- "endOffsets": "554,656,768,854,959,1079,1158,1236,1328,1422,1518,1611,1707,1801,1897,1992,2084,2176,2256,2362,2470,2568,2677,2783,2891,3066,3166,4327"
+ "startOffsets": "105,222,326,435,517,618,732,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1832,1911,2016,2117,2213,2321,2424,2527,2682,3758",
+ "endColumns": "116,103,108,81,100,113,78,78,90,92,95,93,100,92,94,93,90,93,78,104,100,95,107,102,102,154,96,80",
+ "endOffsets": "217,321,430,512,613,727,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1827,1906,2011,2112,2208,2316,2419,2522,2677,2774,3834"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v28_values-v28.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v28\\values-v28.xml",
+ "from": {
+ "startLines": "2,3,4,8",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,447",
+ "endLines": "2,3,7,11",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,442,684"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-or\\values-or.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1061,20 +995,56 @@
"endOffsets": "151"
},
"to": {
- "startLines": "53",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "4332",
+ "startOffsets": "2936",
"endColumns": "100",
- "endOffsets": "4428"
+ "endOffsets": "3032"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-or\\values-or.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847",
+ "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88",
+ "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v25\\values-v25.xml",
+ "from": {
+ "startLines": "2,3,4,6",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,126,209,308",
+ "endLines": "2,3,5,7",
+ "endColumns": "70,82,12,12",
+ "endOffsets": "121,204,303,414"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-si_values-si.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ko\\values-ko.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-si\\values-si.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
+ "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
+ "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-si\\values-si.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1083,54 +1053,75 @@
"endOffsets": "151"
},
"to": {
- "startLines": "45",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "3615",
+ "startOffsets": "2903",
"endColumns": "100",
- "endOffsets": "3711"
+ "endOffsets": "2999"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24",
+ "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",
+ "startOffsets": "6673,3691,3624,3550,3499,890,931,980,6213,6259,6618,6567,1269,3955,4024,3895,3828,3764,4698,4637,4573,4158,3062,1442,1496,4213,1849,6317,3439,3222,1961,2248,2499,2015,3001,2947,2895,2696,2647,2551,2600,2743,2791,2292,3379,2842,3266,2204,2451,2394,2338,3166,2159,3123,2066,2108,3319,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5080,5020,5223,6136,5539,5469,5604,5683,5868,5794,5156,5413,5281,5347,4970,5973,6057,6528,6419,6370,6465,1332,4102,4513,4813,4754,4881,4464,4418,4369,4317,1029,1096",
+ "endLines": "125,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6847,3758,3685,3618,3544,925,974,1023,6253,6311,6667,6612,1326,4018,4096,3949,3889,3822,4748,4692,4631,4207,3117,1490,1553,4292,1924,6362,3493,3260,2009,2286,2545,2060,3056,2995,2941,2737,2690,2594,2641,2785,2836,2332,3433,2889,3313,2242,2493,2445,2388,3216,2198,3160,2102,2153,3373,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5150,5074,5275,6205,5598,5533,5677,5788,5967,5862,5217,5463,5341,5407,5014,6051,6130,6561,6459,6413,6522,1384,4152,4567,4875,4807,4938,4507,4458,4412,4363,1090,1157"
+ },
+ "to": {
+ "startLines": "6,37,38,39,40,41,42,43,47,53,54,55,56,60,61,62,66,67,68,69,70,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,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
+ "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",
+ "startOffsets": "215,3000,3072,3138,3211,3261,3301,3349,3542,3823,3880,3934,3984,4213,4281,4358,4597,4663,4726,4781,4841,5019,5073,5133,5186,5248,5332,5412,5462,5521,5564,5617,5660,5711,5761,5821,5874,5925,5971,6019,6067,6113,6160,6210,6255,6314,6366,6418,6461,6508,6564,6619,6674,6718,6760,6801,6851,6910,6961,7004,7053,7102,7149,7196,7243,7288,7339,7443,7518,7577,7634,7708,7772,7841,7919,8029,8133,8206,8272,8327,8392,8457,8506,8589,8667,8705,8750,8876,8938,9096,9151,9210,9277,9335,9397,9445,9490,9538,9589,9655",
+ "endLines": "8,37,38,39,40,41,42,43,47,53,54,55,56,60,61,62,66,67,68,69,70,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,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,3067,3133,3206,3256,3296,3344,3392,3582,3875,3929,3979,4041,4276,4353,4412,4658,4721,4776,4836,4899,5068,5128,5181,5243,5327,5407,5457,5516,5559,5612,5655,5706,5756,5816,5869,5920,5966,6014,6062,6108,6155,6205,6250,6309,6361,6413,6456,6503,6559,6614,6669,6713,6755,6796,6846,6905,6956,6999,7048,7097,7144,7191,7238,7283,7334,7387,7513,7572,7629,7703,7767,7836,7914,8024,8128,8201,8267,8322,8387,8452,8501,8584,8662,8700,8745,8793,8933,8990,9146,9205,9272,9330,9392,9440,9485,9533,9584,9650,9716"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ko\\values-ko.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,103,153,205,248,289,337,390,452,533,598,667,727,802,863",
- "endColumns": "47,49,51,42,40,47,52,61,80,64,68,59,74,60,50",
- "endOffsets": "98,148,200,243,284,332,385,447,528,593,662,722,797,858,909"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,101,151,203,246,289,336,382,431,482,530,583,649,710,775,829,889,944",
+ "endColumns": "45,49,51,42,42,46,45,48,50,47,52,65,60,64,53,59,54,50",
+ "endOffsets": "96,146,198,241,284,331,377,426,477,525,578,644,705,770,824,884,939,990"
},
"to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2678,2726,2776,2828,2871,2912,2960,3013,3075,3156,3221,3290,3350,3425,3486",
- "endColumns": "47,49,51,42,40,47,52,61,80,64,68,59,74,60,50",
- "endOffsets": "2721,2771,2823,2866,2907,2955,3008,3070,3151,3216,3285,3345,3420,3481,3532"
+ "startLines": "36,44,45,46,48,49,50,51,52,57,58,59,63,64,65,71,72,119",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2954,3397,3447,3499,3587,3630,3677,3723,3772,4046,4094,4147,4417,4478,4543,4904,4964,7392",
+ "endColumns": "45,49,51,42,42,46,45,48,50,47,52,65,60,64,53,59,54,50",
+ "endOffsets": "2995,3442,3494,3537,3625,3672,3718,3767,3818,4089,4142,4208,4473,4538,4592,4959,5014,7438"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ko\\values-ko.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678",
- "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
- "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
},
"to": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
- "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",
- "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,3537",
- "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
- "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,3610"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1139,30 +1130,47 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "143",
"startColumns": "4",
- "startOffsets": "2978",
+ "startOffsets": "8995",
"endColumns": "100",
- "endOffsets": "3074"
+ "endOffsets": "9091"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895",
- "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82",
- "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973"
+ "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
+ },
+ "to": {
+ "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
+ "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",
+ "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8798",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8871"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uz\\values-uz.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-af\\values-af.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776",
+ "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79",
+ "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1173,28 +1181,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2889",
+ "startOffsets": "2856",
"endColumns": "100",
- "endOffsets": "2985"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uz\\values-uz.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805",
- "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83",
- "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884"
+ "endOffsets": "2952"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-th\\values-th.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hu\\values-hu.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878",
+ "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82",
+ "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hu\\values-hu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1205,44 +1213,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2845",
+ "startOffsets": "2961",
"endColumns": "100",
- "endOffsets": "2941"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-th\\values-th.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764",
- "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80",
- "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840"
+ "endOffsets": "3057"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lv\\values-lv.xml",
"from": {
- "startLines": "2,6,10",
- "startColumns": "4,4,4",
- "startOffsets": "55,271,499",
- "endLines": "5,9,13",
- "endColumns": "12,12,12",
- "endOffsets": "266,494,724"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994",
+ "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81",
+ "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hy\\values-hy.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lv\\values-lv.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1253,38 +1245,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2884",
+ "startOffsets": "3076",
"endColumns": "100",
- "endOffsets": "2980"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hy\\values-hy.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802",
- "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81",
- "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879"
+ "endOffsets": "3172"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nb\\values-nb.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
- "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
- "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
+ "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784",
+ "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80",
+ "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nb\\values-nb.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1295,62 +1277,86 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2826",
+ "startOffsets": "2865",
"endColumns": "100",
- "endOffsets": "2922"
+ "endOffsets": "2961"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-az\\values-az.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,10,11,12",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,115,185,256,328,386,444,553,617,680",
- "endLines": "2,3,4,5,6,7,9,10,11,15",
- "endColumns": "59,69,70,71,57,57,10,63,62,10",
- "endOffsets": "110,180,251,323,381,439,548,612,675,847"
- },
- "to": {
- "startLines": "10,11,12,13,14,15,16,18,19,20",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "611,671,741,812,884,942,1000,1109,1173,1236",
- "endLines": "10,11,12,13,14,15,17,18,19,23",
- "endColumns": "59,69,70,71,57,57,10,63,62,10",
- "endOffsets": "666,736,807,879,937,995,1104,1168,1231,1403"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820",
+ "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82",
+ "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-az\\values-az.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "55,124,193,263,337,413,472,543",
- "endColumns": "68,68,69,73,75,58,70,67",
- "endOffsets": "119,188,258,332,408,467,538,606"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2903",
+ "endColumns": "100",
+ "endOffsets": "2999"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hu_values-hu.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ru_values-ru.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hu\\values-hu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,318,433,517,629,759,835,911,1002,1095,1191,1285,1386,1479,1574,1669,1760,1851,1934,2044,2155,2255,2366,2474,2593,2775,2878",
- "endColumns": "107,104,114,83,111,129,75,75,90,92,95,93,100,92,94,94,90,90,82,109,110,99,110,107,118,181,102,82",
- "endOffsets": "208,313,428,512,624,754,830,906,997,1090,1186,1280,1381,1474,1569,1664,1755,1846,1929,2039,2150,2250,2361,2469,2588,2770,2873,2956"
+ "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
+ "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
+ "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
+ },
+ "to": {
+ "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,52",
+ "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",
+ "startOffsets": "444,559,661,773,859,964,1084,1163,1241,1333,1427,1523,1616,1712,1806,1902,1997,2089,2181,2261,2367,2475,2573,2682,2788,2896,3071,4251",
+ "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
+ "endOffsets": "554,656,768,854,959,1079,1158,1236,1328,1422,1518,1611,1707,1801,1897,1992,2084,2176,2256,2362,2470,2568,2677,2783,2891,3066,3166,4327"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ru\\values-ru.xml",
+ "from": {
+ "startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,394,441,498,557,603,644,697,753,809,867,912,983,1081,1176,1248,1348,1420",
+ "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24",
+ "endColumns": "14,46,56,58,45,40,52,55,55,57,44,70,97,94,71,99,71,53",
+ "endOffsets": "389,436,493,552,598,639,692,748,804,862,907,978,1076,1171,1243,1343,1415,1469"
+ },
+ "to": {
+ "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "105,3171,3218,3275,3334,3380,3421,3474,3530,3586,3644,3689,3760,3858,3953,4025,4125,4197",
+ "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51",
+ "endColumns": "14,46,56,58,45,40,52,55,55,57,44,70,97,94,71,99,71,53",
+ "endOffsets": "439,3213,3270,3329,3375,3416,3469,3525,3581,3639,3684,3755,3853,3948,4020,4120,4192,4246"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hu\\values-hu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1359,30 +1365,20 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "53",
"startColumns": "4",
- "startOffsets": "2961",
+ "startOffsets": "4332",
"endColumns": "100",
- "endOffsets": "3057"
+ "endOffsets": "4428"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lv_values-lv.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lv\\values-lv.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,333,442,528,632,754,836,918,1028,1136,1243,1352,1464,1567,1679,1786,1891,1991,2076,2185,2297,2396,2507,2616,2721,2895,2994",
- "endColumns": "119,107,108,85,103,121,81,81,109,107,106,108,111,102,111,106,104,99,84,108,111,98,110,108,104,173,98,81",
- "endOffsets": "220,328,437,523,627,749,831,913,1023,1131,1238,1347,1459,1562,1674,1781,1886,1986,2071,2180,2292,2391,2502,2611,2716,2890,2989,3071"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lv\\values-lv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gl\\values-gl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1393,18 +1389,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "3076",
+ "startOffsets": "2920",
"endColumns": "100",
- "endOffsets": "3172"
+ "endOffsets": "3016"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gl\\values-gl.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838",
+ "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
+ "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lt_values-lt.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-in\\values-in.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lt\\values-lt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1415,38 +1421,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2887",
+ "startOffsets": "2978",
"endColumns": "100",
- "endOffsets": "2983"
+ "endOffsets": "3074"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-in\\values-in.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lt\\values-lt.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803",
- "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83",
- "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882"
+ "startOffsets": "105,221,322,435,522,631,752,834,915,1009,1105,1203,1299,1403,1499,1597,1700,1794,1888,1973,2082,2191,2291,2401,2505,2618,2794,2895",
+ "endColumns": "115,100,112,86,108,120,81,80,93,95,97,95,103,95,97,102,93,93,84,108,108,99,109,103,112,175,100,82",
+ "endOffsets": "216,317,430,517,626,747,829,910,1004,1100,1198,1294,1398,1494,1592,1695,1789,1883,1968,2077,2186,2286,2396,2500,2613,2789,2890,2973"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mr\\values-mr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842",
- "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83",
- "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921"
+ "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807",
+ "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79",
+ "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mr\\values-mr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1457,131 +1463,86 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2926",
+ "startOffsets": "2887",
"endColumns": "100",
- "endOffsets": "3022"
+ "endOffsets": "2983"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
- "from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
- },
- "to": {
- "startLines": "143",
- "startColumns": "4",
- "startOffsets": "8918",
- "endColumns": "100",
- "endOffsets": "9014"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-uk\\values-uk.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,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7400,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7447,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,402,449,508,569,615,656,708,753,823,919,1011,1080,1174,1244",
+ "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
+ "endOffsets": "397,444,503,564,610,651,703,748,818,914,1006,1075,1169,1239,1293"
},
"to": {
- "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,2945,2992,3038,3111,3177,3250,3319,3369,3409,3457,3505,3550,3607,3661,3711,3753,3815,3883,3960,4019,4084,4147,4202,4262,4325,4379,4439,4492,4554,4639,4720,4770,4829,4875,4920,4969,5012,5064,5114,5164,5217,5260,5311,5361,5421,5474,5525,5571,5619,5667,5713,5760,5809,5859,5901,5946,6005,6057,6102,6154,6206,6252,6295,6342,6398,6453,6508,6552,6594,6635,6685,6735,6794,6840,6884,6935,6978,7027,7076,7123,7170,7217,7262,7313,7366,7441,7500,7557,7631,7695,7764,7842,7952,8056,8129,8195,8250,8315,8380,8429,8512,8590,8628,8673,8799,8861,9019,9074,9133,9200,9258,9320,9368,9413,9461,9512,9578",
- "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
- "endColumns": "14,46,45,72,65,72,68,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,45,44,48,42,51,49,49,52,42,50,49,59,52,50,45,47,47,45,46,48,49,41,44,58,51,44,51,51,45,42,46,55,54,54,43,41,40,49,49,58,45,43,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,2987,3033,3106,3172,3245,3314,3364,3404,3452,3500,3545,3602,3656,3706,3748,3810,3878,3955,4014,4079,4142,4197,4257,4320,4374,4434,4487,4549,4634,4715,4765,4824,4870,4915,4964,5007,5059,5109,5159,5212,5255,5306,5356,5416,5469,5520,5566,5614,5662,5708,5755,5804,5854,5896,5941,6000,6052,6097,6149,6201,6247,6290,6337,6393,6448,6503,6547,6589,6630,6680,6730,6789,6835,6879,6930,6973,7022,7071,7118,7165,7212,7257,7308,7361,7436,7495,7552,7626,7690,7759,7837,7947,8051,8124,8190,8245,8310,8375,8424,8507,8585,8623,8668,8716,8856,8913,9069,9128,9195,9253,9315,9363,9408,9456,9507,9573,9639"
+ "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "105,3166,3213,3272,3333,3379,3420,3472,3517,3587,3683,3775,3844,3938,4008",
+ "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
+ "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
+ "endOffsets": "447,3208,3267,3328,3374,3415,3467,3512,3582,3678,3770,3839,3933,4003,4057"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uk\\values-uk.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",
- "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",
- "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"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
+ "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
+ "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
},
"to": {
- "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
+ "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,49",
"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",
- "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8721",
- "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
- "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8794"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-night-v8_values-night-v8.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-night-v8\\values-night-v8.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8",
- "startColumns": "4,4,4,4,4,4,4",
- "startOffsets": "55,125,209,293,389,491,593",
- "endColumns": "69,83,83,95,101,101,93",
- "endOffsets": "120,204,288,384,486,588,682"
+ "startOffsets": "452,562,664,770,856,964,1082,1161,1241,1332,1425,1521,1615,1716,1809,1904,1999,2090,2181,2262,2368,2475,2573,2681,2787,2896,3066,4062",
+ "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
+ "endOffsets": "557,659,765,851,959,1077,1156,1236,1327,1420,1516,1610,1711,1804,1899,1994,2085,2176,2257,2363,2470,2568,2676,2782,2891,3061,3161,4138"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-night\\themes.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uk\\values-uk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
- "startOffsets": "19",
- "endLines": "5",
- "endColumns": "12",
- "endOffsets": "252"
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "9",
+ "startLines": "50",
"startColumns": "4",
- "startOffsets": "687",
- "endLines": "12",
- "endColumns": "12",
- "endOffsets": "917"
+ "startOffsets": "4143",
+ "endColumns": "100",
+ "endOffsets": "4239"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-is_values-is.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-is\\values-is.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,205,302,414,499,600,714,794,874,965,1058,1154,1248,1355,1448,1543,1638,1729,1823,1904,2014,2122,2220,2329,2428,2531,2686,2784",
- "endColumns": "99,96,111,84,100,113,79,79,90,92,95,93,106,92,94,94,90,93,80,109,107,97,108,98,102,154,97,80",
- "endOffsets": "200,297,409,494,595,709,789,869,960,1053,1149,1243,1350,1443,1538,1633,1724,1818,1899,2009,2117,2215,2324,2423,2526,2681,2779,2860"
+ "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817",
+ "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83",
+ "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-is\\values-is.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1592,28 +1553,50 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2865",
+ "startOffsets": "2901",
"endColumns": "100",
- "endOffsets": "2961"
+ "endOffsets": "2997"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-az_values-az.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-az\\values-az.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-km\\values-km.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,312,424,512,619,733,814,893,984,1077,1172,1271,1372,1465,1560,1655,1746,1838,1923,2030,2137,2237,2346,2450,2560,2718,2820",
- "endColumns": "107,98,111,87,106,113,80,78,90,92,94,98,100,92,94,94,90,91,84,106,106,99,108,103,109,157,101,82",
- "endOffsets": "208,307,419,507,614,728,809,888,979,1072,1167,1266,1367,1460,1555,1650,1741,1833,1918,2025,2132,2232,2341,2445,2555,2713,2815,2898"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2882",
+ "endColumns": "100",
+ "endOffsets": "2978"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-az\\values-az.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-km\\values-km.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799",
+ "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82",
+ "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-el\\values-el.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1624,28 +1607,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2903",
+ "startOffsets": "2964",
"endColumns": "100",
- "endOffsets": "2999"
+ "endOffsets": "3060"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-el\\values-el.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879",
+ "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84",
+ "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-iw\\values-iw.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693",
- "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77",
- "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766"
+ "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
+ "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
+ "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-iw\\values-iw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1656,69 +1649,67 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2771",
+ "startOffsets": "2832",
"endColumns": "100",
- "endOffsets": "2867"
+ "endOffsets": "2928"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values-v23\\values-v23.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endLines": "4",
- "endColumns": "12",
- "endOffsets": "200"
- },
- "to": {
- "startLines": "37",
- "startColumns": "4",
- "startOffsets": "2646",
- "endLines": "39",
- "endColumns": "12",
- "endOffsets": "2791"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v23\\values-v23.xml",
- "from": {
- "startLines": "2,3,4,5,6,19,32,33,34,35,36",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
- "endLines": "2,3,4,5,18,31,32,33,34,35,36",
- "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
- "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
+ "endColumns": "66",
+ "endOffsets": "117"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v25_values-v25.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-de_values-de.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v25\\values-v25.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-de\\values-de.xml",
"from": {
- "startLines": "2,3,4,6",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,126,209,308",
- "endLines": "2,3,5,7",
- "endColumns": "70,82,12,12",
- "endOffsets": "121,204,303,414"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,2843",
+ "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
+ "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,2920"
+ },
+ "to": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
+ "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",
+ "startOffsets": "105,210,308,420,506,611,726,803,879,971,1065,1162,1263,1371,1471,1575,1675,1773,1870,1952,2063,2166,2265,2376,2478,2585,2741,3845",
+ "endColumns": "104,97,111,85,104,114,76,75,91,93,96,100,107,99,103,99,97,96,81,110,102,98,110,101,106,155,101,81",
+ "endOffsets": "205,303,415,501,606,721,798,874,966,1060,1157,1258,1366,1466,1570,1670,1768,1865,1947,2058,2161,2260,2371,2473,2580,2736,2838,3922"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-de\\values-de.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,110,167,226,273,314,366,426,497,586,668,773,834,940,1003",
+ "endColumns": "54,56,58,46,40,51,59,70,88,81,104,60,105,62,53",
+ "endOffsets": "105,162,221,268,309,361,421,492,581,663,768,829,935,998,1052"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2843,2898,2955,3014,3061,3102,3154,3214,3285,3374,3456,3561,3622,3728,3791",
+ "endColumns": "54,56,58,46,40,51,59,70,88,81,104,60,105,62,53",
+ "endOffsets": "2893,2950,3009,3056,3097,3149,3209,3280,3369,3451,3556,3617,3723,3786,3840"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-de\\values-de.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1727,111 +1718,68 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "45",
"startColumns": "4",
- "startOffsets": "2965",
+ "startOffsets": "3927",
"endColumns": "100",
- "endOffsets": "3061"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
- "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
- "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
+ "endOffsets": "4023"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v21_values-v21.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bs_values-bs.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-v21\\values-v21.xml",
- "from": {
- "startLines": "2,10,18,26",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,484,910,1333",
- "endLines": "9,17,25,33",
- "endColumns": "10,10,10,10",
- "endOffsets": "479,905,1328,1763"
- },
- "to": {
- "startLines": "279,287,295,303",
- "startColumns": "4,4,4,4",
- "startOffsets": "20438,20867,21293,21716",
- "endLines": "286,294,302,310",
- "endColumns": "10,10,10,10",
- "endOffsets": "20862,21288,21711,22146"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v21\\values-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bs\\values-bs.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,13",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,173,237,304,368,484,610,736,864,1036",
- "endLines": "2,3,4,5,6,7,8,9,12,17",
- "endColumns": "117,63,66,63,115,125,125,127,12,12",
- "endOffsets": "168,232,299,363,479,605,731,859,1031,1383"
- },
- "to": {
- "startLines": "2,3,4,5,263,264,271,275,311,314",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,173,237,304,19276,19392,19849,20143,22151,22323",
- "endLines": "2,3,4,5,263,264,271,275,313,318",
- "endColumns": "117,63,66,63,115,125,125,127,12,12",
- "endOffsets": "168,232,299,363,19387,19513,19970,20266,22318,22670"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,333,440,526,630,752,834,915,1006,1099,1195,1289,1390,1483,1578,1677,1768,1859,1945,2048,2153,2251,2356,2469,2572,2745,2842",
+ "endColumns": "118,108,106,85,103,121,81,80,90,92,95,93,100,92,94,98,90,90,85,102,104,97,104,112,102,172,96,83",
+ "endOffsets": "219,328,435,521,625,747,829,910,1001,1094,1190,1284,1385,1478,1573,1672,1763,1854,1940,2043,2148,2246,2351,2464,2567,2740,2837,2921"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v21\\values-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bs\\values-bs.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
- "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",
- "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
- "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",
- "startOffsets": "368,459,562,665,770,877,986,1095,1204,1313,1422,1529,1632,1751,1906,2061,2166,2287,2388,2535,2676,2779,2898,3005,3108,3263,3434,3583,3748,3905,4056,4175,4547,4696,4845,4957,5104,5257,5404,5479,5568,5655,5756,5859,8927,9112,12192,12389,12588,12711,12834,12947,13130,13261,13462,13551,13662,13895,13996,14091,14214,14343,14460,14637,14736,14871,15014,15149,15268,15469,15588,15681,15792,15848,15955,16150,16261,16394,16489,16580,16671,16788,16927,16998,17081,17761,17818,17876,18570",
- "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "454,557,660,765,872,981,1090,1199,1308,1417,1524,1627,1746,1901,2056,2161,2282,2383,2530,2671,2774,2893,3000,3103,3258,3429,3578,3743,3900,4051,4170,4542,4691,4840,4952,5099,5252,5399,5474,5563,5650,5751,5854,8922,9107,12187,12384,12583,12706,12829,12942,13125,13256,13457,13546,13657,13890,13991,14086,14209,14338,14455,14632,14731,14866,15009,15144,15263,15464,15583,15676,15787,15843,15950,16145,16256,16389,16484,16575,16666,16783,16922,16993,17076,17756,17813,17871,18565,19271"
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2926",
+ "endColumns": "100",
+ "endOffsets": "3022"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v21\\values-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"from": {
- "startLines": "2,5,8,11",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,223,386,554",
- "endLines": "4,7,10,13",
- "endColumns": "12,12,12,12",
- "endOffsets": "218,381,549,716"
- },
- "to": {
- "startLines": "265,268,272,276",
- "startColumns": "4,4,4,4",
- "startOffsets": "19518,19686,19975,20271",
- "endLines": "267,270,274,278",
- "endColumns": "12,12,12,12",
- "endOffsets": "19681,19844,20138,20433"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "6",
+ "endColumns": "13",
+ "endOffsets": "327"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uk_values-uk.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1840,66 +1788,40 @@
"endOffsets": "151"
},
"to": {
- "startLines": "50",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "4143",
+ "startOffsets": "2921",
"endColumns": "100",
- "endOffsets": "4239"
+ "endOffsets": "3017"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,317,423,509,617,735,814,894,985,1078,1174,1268,1369,1462,1557,1652,1743,1834,1915,2021,2128,2226,2334,2440,2549,2719,2819",
- "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
- "endOffsets": "210,312,418,504,612,730,809,889,980,1073,1169,1263,1364,1457,1552,1647,1738,1829,1910,2016,2123,2221,2329,2435,2544,2714,2814,2895"
- },
- "to": {
- "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,49",
- "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",
- "startOffsets": "452,562,664,770,856,964,1082,1161,1241,1332,1425,1521,1615,1716,1809,1904,1999,2090,2181,2262,2368,2475,2573,2681,2787,2896,3066,4062",
- "endColumns": "109,101,105,85,107,117,78,79,90,92,95,93,100,92,94,94,90,90,80,105,106,97,107,105,108,169,99,80",
- "endOffsets": "557,659,765,851,959,1077,1156,1236,1327,1420,1516,1610,1711,1804,1899,1994,2085,2176,2257,2363,2470,2568,2676,2782,2891,3061,3161,4138"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-uk\\values-uk.xml",
- "from": {
- "startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,402,449,508,569,615,656,708,753,823,919,1011,1080,1174,1244",
- "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
- "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
- "endOffsets": "397,444,503,564,610,651,703,748,818,914,1006,1075,1169,1239,1293"
- },
- "to": {
- "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "105,3166,3213,3272,3333,3379,3420,3472,3517,3587,3683,3775,3844,3938,4008",
- "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
- "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
- "endOffsets": "447,3208,3267,3328,3374,3415,3467,3512,3582,3678,3770,3839,3933,4003,4057"
+ "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839",
+ "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81",
+ "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-vi_values-vi.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ja_values-ja.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-vi\\values-vi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,219,327,436,520,623,742,819,896,987,1080,1176,1270,1371,1464,1559,1657,1748,1839,1923,2027,2136,2237,2342,2456,2561,2718,2817",
- "endColumns": "113,107,108,83,102,118,76,76,90,92,95,93,100,92,94,97,90,90,83,103,108,100,104,113,104,156,98,83",
- "endOffsets": "214,322,431,515,618,737,814,891,982,1075,1171,1265,1366,1459,1554,1652,1743,1834,1918,2022,2131,2232,2337,2451,2556,2713,2812,2896"
+ "startOffsets": "105,202,295,400,482,580,688,765,841,932,1025,1121,1215,1316,1409,1504,1598,1689,1780,1858,1960,2059,2154,2257,2352,2448,2596,2693",
+ "endColumns": "96,92,104,81,97,107,76,75,90,92,95,93,100,92,94,93,90,90,77,101,98,94,102,94,95,147,96,77",
+ "endOffsets": "197,290,395,477,575,683,760,836,927,1020,1116,1210,1311,1404,1499,1593,1684,1775,1853,1955,2054,2149,2252,2347,2443,2591,2688,2766"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-vi\\values-vi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1910,18 +1832,33 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2901",
+ "startOffsets": "2771",
"endColumns": "100",
- "endOffsets": "2997"
+ "endOffsets": "2867"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr-rTR_values-tr-rTR.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-tr-rTR\\values-tr-rTR.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,108,162,218,263,307,360,415,485,595,683,774,835,931,992",
+ "endColumns": "52,53,55,44,43,52,54,69,109,87,90,60,95,60,53",
+ "endOffsets": "103,157,213,258,302,355,410,480,590,678,769,830,926,987,1041"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pl\\values-pl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1930,64 +1867,45 @@
"endOffsets": "151"
},
"to": {
- "startLines": "48",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "4063",
+ "startOffsets": "2903",
"endColumns": "100",
- "endOffsets": "4159"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pl\\values-pl.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,114,171,230,277,318,371,422,478,536,587,654,758,832,925,988,1091,1155",
- "endColumns": "58,56,58,46,40,52,50,55,57,50,66,103,73,92,62,102,63,53",
- "endOffsets": "109,166,225,272,313,366,417,473,531,582,649,753,827,920,983,1086,1150,1204"
- },
- "to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2827,2886,2943,3002,3049,3090,3143,3194,3250,3308,3359,3426,3530,3604,3697,3760,3863,3927",
- "endColumns": "58,56,58,46,40,52,50,55,57,50,66,103,73,92,62,102,63,53",
- "endOffsets": "2881,2938,2997,3044,3085,3138,3189,3245,3303,3354,3421,3525,3599,3692,3755,3858,3922,3976"
+ "endOffsets": "2999"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pl\\values-pl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827",
- "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81",
- "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904"
- },
- "to": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,47",
- "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",
- "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,3981",
- "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81",
- "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,4058"
+ "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822",
+ "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80",
+ "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-port_values-port.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-port\\values-port.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866",
- "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81",
- "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "55",
+ "endOffsets": "106"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-th_values-th.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-th\\values-th.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -1998,28 +1916,83 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2948",
+ "startOffsets": "2845",
"endColumns": "100",
- "endOffsets": "3044"
+ "endOffsets": "2941"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-th\\values-th.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,210,308,416,505,607,717,794,872,963,1056,1152,1246,1347,1440,1535,1629,1720,1811,1892,2000,2104,2202,2310,2415,2516,2669,2764",
+ "endColumns": "104,97,107,88,101,109,76,77,90,92,95,93,100,92,94,93,90,90,80,107,103,97,107,104,100,152,94,80",
+ "endOffsets": "205,303,411,500,602,712,789,867,958,1051,1147,1241,1342,1435,1530,1624,1715,1806,1887,1995,2099,2197,2305,2410,2511,2664,2759,2840"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-be_values-be.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-be\\values-be.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ },
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "142,133,134,72,71,70,132,69,20,21,22,113,114,121,120,123,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,135,136,130,64,138,137,126,39,45,50,40,60,59,58,54,53,51,52,55,128,56,139,46,67,57,140,65,131,125,44,49,48,47,63,43,62,41,42,127,66,141,124,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "7589,7161,7209,3610,3543,3469,7091,3418,890,931,980,6239,6285,6642,6591,6699,1269,3982,4051,3922,3856,3792,4726,4665,4601,4185,2981,1442,1496,4240,3684,6343,3358,7256,7303,6988,3141,7400,7349,6834,1880,2167,2418,1934,2920,2866,2814,2615,2566,2470,2519,2662,6936,2710,7453,2211,3298,2761,7496,3185,7038,6787,2123,2370,2313,2257,3085,2078,3042,1985,2027,6885,3238,7542,6742,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5108,5048,5251,6164,5567,5497,5632,5711,5896,5822,5184,5441,5309,5375,4998,6001,6085,6552,6443,6394,6489,1332,4129,4541,4841,4782,4909,4492,4446,4397,4345,1029,1096",
+ "endLines": "144,133,134,72,71,70,132,69,20,21,22,113,114,121,120,123,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,135,136,130,64,138,137,126,39,45,50,40,60,59,58,54,53,51,52,55,128,56,139,46,67,57,140,65,131,125,44,49,48,47,63,43,62,41,42,127,66,141,124,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24",
+ "endColumns": "14,46,45,72,65,72,68,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,45,44,48,42,51,49,49,52,42,50,49,59,52,50,45,47,47,45,46,48,49,41,44,58,51,44,51,51,45,42,46,55,54,54,43,41,40,49,49,58,45,43,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7763,7203,7250,3678,3604,3537,7155,3463,925,974,1023,6279,6337,6691,6636,6736,1326,4045,4123,3976,3916,3850,4776,4720,4659,4234,3036,1490,1553,4320,3760,6388,3412,7297,7343,7032,3179,7447,7394,6879,1928,2205,2464,1979,2975,2914,2860,2656,2609,2513,2560,2704,6980,2755,7490,2251,3352,2808,7536,3232,7085,6828,2161,2412,2364,2307,3135,2117,3079,2021,2072,6930,3292,7583,6781,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5178,5102,5303,6233,5626,5561,5705,5816,5995,5890,5245,5491,5369,5435,5042,6079,6158,6585,6483,6437,6546,1384,4179,4595,4903,4835,4966,4535,4486,4440,4391,1090,1157"
+ },
+ "to": {
+ "startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,2945,2992,3038,3111,3177,3250,3319,3369,3409,3457,3505,3550,3607,3661,3711,3753,3815,3883,3960,4019,4084,4147,4202,4262,4325,4379,4439,4492,4554,4639,4720,4770,4829,4875,4920,4969,5012,5064,5114,5164,5217,5260,5311,5361,5421,5474,5525,5571,5619,5667,5713,5760,5809,5859,5901,5946,6005,6057,6102,6154,6206,6252,6295,6342,6398,6453,6508,6552,6594,6635,6685,6735,6794,6840,6884,6935,6978,7027,7076,7123,7170,7217,7262,7313,7366,7441,7500,7557,7631,7695,7764,7842,7952,8056,8129,8195,8250,8315,8380,8429,8512,8590,8628,8673,8799,8861,9019,9074,9133,9200,9258,9320,9368,9413,9461,9512,9578",
+ "endLines": "8,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
+ "endColumns": "14,46,45,72,65,72,68,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,45,44,48,42,51,49,49,52,42,50,49,59,52,50,45,47,47,45,46,48,49,41,44,58,51,44,51,51,45,42,46,55,54,54,43,41,40,49,49,58,45,43,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,2987,3033,3106,3172,3245,3314,3364,3404,3452,3500,3545,3602,3656,3706,3748,3810,3878,3955,4014,4079,4142,4197,4257,4320,4374,4434,4487,4549,4634,4715,4765,4824,4870,4915,4964,5007,5059,5109,5159,5212,5255,5306,5356,5416,5469,5520,5566,5614,5662,5708,5755,5804,5854,5896,5941,6000,6052,6097,6149,6201,6247,6290,6337,6393,6448,6503,6547,6589,6630,6680,6730,6789,6835,6879,6930,6973,7022,7071,7118,7165,7212,7257,7308,7361,7436,7495,7552,7626,7690,7759,7837,7947,8051,8124,8190,8245,8310,8375,8424,8507,8585,8623,8668,8716,8856,8913,9069,9128,9195,9253,9315,9363,9408,9456,9507,9573,9639"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,328,444,530,638,756,835,913,1005,1099,1195,1289,1385,1479,1575,1670,1762,1854,1937,2043,2149,2247,2355,2460,2565,2734,2834",
- "endColumns": "119,102,115,85,107,117,78,77,91,93,95,93,95,93,95,94,91,91,82,105,105,97,107,104,104,168,99,80",
- "endOffsets": "220,323,439,525,633,751,830,908,1000,1094,1190,1284,1380,1474,1570,1665,1757,1849,1932,2038,2144,2242,2350,2455,2560,2729,2829,2910"
+ "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
+ "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+ "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
+ },
+ "to": {
+ "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
+ "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",
+ "startOffsets": "384,480,575,675,757,854,960,1036,1112,1203,1296,1394,1490,1585,1678,1773,1865,1956,2047,2125,2221,2317,2412,2509,2604,2702,2851,8721",
+ "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+ "endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8794"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-be\\values-be.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2028,20 +2001,30 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "143",
"startColumns": "4",
- "startOffsets": "2915",
+ "startOffsets": "8918",
"endColumns": "100",
- "endOffsets": "3011"
+ "endOffsets": "9014"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ms\\values-ms.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mn\\values-mn.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795",
+ "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80",
+ "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mn\\values-mn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2052,28 +2035,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2881",
+ "startOffsets": "2876",
"endColumns": "100",
- "endOffsets": "2977"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ms\\values-ms.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801",
- "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79",
- "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876"
+ "endOffsets": "2972"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nl_values-nl.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-nb_values-nb.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nl\\values-nl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nb\\values-nb.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2084,28 +2057,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2921",
+ "startOffsets": "2826",
"endColumns": "100",
- "endOffsets": "3017"
+ "endOffsets": "2922"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nl\\values-nl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nb\\values-nb.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,223,328,435,521,629,749,826,903,995,1089,1190,1284,1385,1479,1575,1670,1762,1854,1936,2047,2151,2250,2365,2478,2581,2736,2839",
- "endColumns": "117,104,106,85,107,119,76,76,91,93,100,93,100,93,95,94,91,91,81,110,103,98,114,112,102,154,102,81",
- "endOffsets": "218,323,430,516,624,744,821,898,990,1084,1185,1279,1380,1474,1570,1665,1757,1849,1931,2042,2146,2245,2360,2473,2576,2731,2834,2916"
+ "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
+ "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
+ "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-iw_values-iw.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rAU_values-en-rAU.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-iw\\values-iw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rAU\\values-en-rAU.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2116,28 +2089,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2832",
+ "startOffsets": "2846",
"endColumns": "100",
- "endOffsets": "2928"
+ "endOffsets": "2942"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-iw\\values-iw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
- "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
- "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fa_values-fa.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hy_values-hy.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fa\\values-fa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2148,38 +2121,62 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2903",
+ "startOffsets": "2884",
"endColumns": "100",
- "endOffsets": "2999"
+ "endOffsets": "2980"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fa\\values-fa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,318,429,513,616,731,810,888,981,1076,1172,1266,1369,1464,1561,1660,1753,1843,1924,2036,2139,2237,2347,2451,2560,2721,2822",
- "endColumns": "109,102,110,83,102,114,78,77,92,94,95,93,102,94,96,98,92,89,80,111,102,97,109,103,108,160,100,80",
- "endOffsets": "210,313,424,508,611,726,805,883,976,1071,1167,1261,1364,1459,1556,1655,1748,1838,1919,2031,2134,2232,2342,2446,2555,2716,2817,2898"
+ "startOffsets": "105,208,309,419,508,614,729,811,892,983,1076,1172,1266,1367,1460,1555,1649,1740,1831,1916,2023,2130,2229,2339,2446,2546,2703,2802",
+ "endColumns": "102,100,109,88,105,114,81,80,90,92,95,93,100,92,94,93,90,90,84,106,106,98,109,106,99,156,98,81",
+ "endOffsets": "203,304,414,503,609,724,806,887,978,1071,1167,1261,1362,1455,1550,1644,1735,1826,1911,2018,2125,2224,2334,2441,2541,2698,2797,2879"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mn_values-mn.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pl_values-pl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mn\\values-mn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pl\\values-pl.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,171,230,277,318,371,422,478,536,587,654,758,832,925,988,1091,1155",
+ "endColumns": "58,56,58,46,40,52,50,55,57,50,66,103,73,92,62,102,63,53",
+ "endOffsets": "109,166,225,272,313,366,417,473,531,582,649,753,827,920,983,1086,1150,1204"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2827,2886,2943,3002,3049,3090,3143,3194,3250,3308,3359,3426,3530,3604,3697,3760,3863,3927",
+ "endColumns": "58,56,58,46,40,52,50,55,57,50,66,103,73,92,62,102,63,53",
+ "endOffsets": "2881,2938,2997,3044,3085,3138,3189,3245,3303,3354,3421,3525,3599,3692,3755,3858,3922,3976"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pl\\values-pl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,218,318,431,518,624,736,818,900,991,1084,1180,1276,1374,1467,1562,1654,1745,1835,1917,2026,2130,2227,2335,2436,2539,2698,2795",
- "endColumns": "112,99,112,86,105,111,81,81,90,92,95,95,97,92,94,91,90,89,81,108,103,96,107,100,102,158,96,80",
- "endOffsets": "213,313,426,513,619,731,813,895,986,1079,1175,1271,1369,1462,1557,1649,1740,1830,1912,2021,2125,2222,2330,2431,2534,2693,2790,2871"
+ "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,2827",
+ "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81",
+ "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,2904"
+ },
+ "to": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,47",
+ "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",
+ "startOffsets": "105,221,323,431,517,626,745,823,900,991,1084,1180,1274,1376,1469,1564,1659,1750,1841,1923,2032,2141,2240,2349,2460,2568,2731,3981",
+ "endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81",
+ "endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,4058"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mn\\values-mn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pl\\values-pl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2188,20 +2185,20 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "48",
"startColumns": "4",
- "startOffsets": "2876",
+ "startOffsets": "4063",
"endColumns": "100",
- "endOffsets": "2972"
+ "endOffsets": "4159"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rHK_values-zh-rHK.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -2211,7 +2208,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2230,10 +2227,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kn_values-kn.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bg\\values-bg.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kn\\values-kn.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,223,335,448,536,643,770,847,924,1015,1108,1204,1298,1399,1492,1587,1681,1772,1863,1945,2061,2172,2271,2384,2488,2602,2766,2866",
+ "endColumns": "117,111,112,87,106,126,76,76,90,92,95,93,100,92,94,93,90,90,81,115,110,98,112,103,113,163,99,81",
+ "endOffsets": "218,330,443,531,638,765,842,919,1010,1103,1199,1293,1394,1487,1582,1676,1767,1858,1940,2056,2167,2266,2379,2483,2597,2761,2861,2943"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2244,44 +2251,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2930",
+ "startOffsets": "2948",
"endColumns": "100",
- "endOffsets": "3026"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bg\\values-bg.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847",
- "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82",
- "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925"
- }
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat",
- "map": [
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v26\\values-v26.xml",
- "from": {
- "startLines": "2,3,4,8,12,16",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "55,130,217,431,657,896",
- "endLines": "2,3,7,11,15,16",
- "endColumns": "74,86,12,12,12,92",
- "endOffsets": "125,212,426,652,891,984"
+ "endOffsets": "3044"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-el_values-el.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ms_values-ms.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-el\\values-el.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2292,28 +2273,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2964",
+ "startOffsets": "2881",
"endColumns": "100",
- "endOffsets": "3060"
+ "endOffsets": "2977"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-el\\values-el.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,223,334,451,536,641,767,855,941,1032,1125,1221,1315,1416,1509,1604,1701,1792,1883,1968,2079,2189,2291,2402,2511,2619,2779,2879",
- "endColumns": "117,110,116,84,104,125,87,85,90,92,95,93,100,92,94,96,90,90,84,110,109,101,110,108,107,159,99,84",
- "endOffsets": "218,329,446,531,636,762,850,936,1027,1120,1216,1310,1411,1504,1599,1696,1787,1878,1963,2074,2184,2286,2397,2506,2614,2774,2874,2959"
+ "startOffsets": "105,216,321,429,516,620,731,809,888,979,1072,1167,1261,1360,1453,1548,1642,1733,1824,1904,2016,2125,2222,2331,2434,2541,2700,2801",
+ "endColumns": "110,104,107,86,103,110,77,78,90,92,94,93,98,92,94,93,90,90,79,111,108,96,108,102,106,158,100,79",
+ "endOffsets": "211,316,424,511,615,726,804,883,974,1067,1162,1256,1355,1448,1543,1637,1728,1819,1899,2011,2120,2217,2326,2429,2536,2695,2796,2876"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pa\\values-pa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hi\\values-hi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2324,188 +2305,332 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2839",
+ "startOffsets": "2892",
"endColumns": "100",
- "endOffsets": "2935"
+ "endOffsets": "2988"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pa\\values-pa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hi\\values-hi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759",
- "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79",
- "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834"
+ "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
+ "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
+ "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-large-v4_values-large-v4.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\1bbf379c87dedbe80347cf20a1163be0\\transformed\\constraintlayout-1.1.3\\res\\values\\values.xml",
"from": {
- "startLines": "2,3",
+ "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",
+ "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",
+ "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"
+ },
+ "to": {
+ "startLines": "18,19,36,41,42,43,48,59,60,61,62,65,66,69,72,73,74,75,76,79,82,83,84,85,90,93,96,97,98,103,104,105,108,111,112,115,118,121,124,125,128,131,132,137,138,143,146,149,150,151,152,153,154,155,156,157,158",
+ "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",
+ "startOffsets": "867,928,1776,2032,2084,2145,2411,2941,3002,3062,3132,3265,3333,3462,3588,3650,3715,3783,3850,3973,4098,4165,4230,4295,4476,4597,4718,4784,4851,5061,5130,5196,5321,5447,5514,5640,5767,5892,6019,6084,6210,6333,6398,6606,6673,6853,6973,7093,7158,7220,7282,7344,7403,7463,7524,7585,7644",
+ "endLines": "18,26,36,41,42,43,51,59,60,61,64,65,68,71,72,73,74,75,78,81,82,83,84,89,92,95,96,97,102,103,104,107,110,111,114,117,120,123,124,127,130,131,136,137,142,145,148,149,150,151,152,153,154,155,156,157,166",
+ "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11",
+ "endOffsets": "923,1214,1819,2079,2140,2186,2533,2997,3057,3127,3260,3328,3457,3583,3645,3710,3778,3845,3968,4093,4160,4225,4290,4471,4592,4713,4779,4846,5056,5125,5191,5316,5442,5509,5635,5762,5887,6014,6079,6205,6328,6393,6601,6668,6848,6968,7088,7153,7215,7277,7339,7398,7458,7519,7580,7639,7981"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\5829027e9bc4104ac7715c543b8358de\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
+ },
+ "to": {
+ "startLines": "44,3332",
"startColumns": "4,4",
- "startOffsets": "55,177",
- "endColumns": "121,133",
- "endOffsets": "172,306"
+ "startOffsets": "2191,214423",
+ "endLines": "44,3334",
+ "endColumns": "60,12",
+ "endOffsets": "2247,214563"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "11,12",
+ "startLines": "295,560,561,562,563,2640,2642,2643,2648,2650",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "16267,33534,33587,33640,33693,170763,170939,171061,171323,171518",
+ "endColumns": "88,52,52,52,52,65,121,60,65,66",
+ "endOffsets": "16351,33582,33635,33688,33741,170824,171056,171117,171384,171580"
+ }
+ },
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\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",
+ "startColumns": "-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"
+ },
+ "to": {
+ "startLines": "883,889,890,894,2316,2320,2369,2373,2795,2799,2803,2807,2811,2815,2819,3335,3338",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55097,55336,55426,55576,146368,146576,150401,150608,179347,179530,179715,179900,180103,180309,180492,214568,214751",
+ "endLines": "888,889,893,894,2319,2323,2372,2375,2798,2802,2806,2810,2814,2818,2822,3337,3341",
+ "endColumns": "12,89,12,79,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "55331,55421,55571,55651,146571,146782,150603,150763,179525,179710,179895,180098,180304,180487,180688,214746,214983"
+ }
+ },
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\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": "752,874",
- "endColumns": "121,133",
- "endOffsets": "869,1003"
+ "startOffsets": "150,345",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "340,460"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10",
- "startColumns": "4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,114,185,256,326,396,464,532,636",
- "endColumns": "58,70,70,69,69,67,67,103,115",
- "endOffsets": "109,180,251,321,391,459,527,631,747"
+ "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,879,1155,1156,1157,1162,1163,1167,1173,1177,1178,1179,1180,1191,1192,1193,1197,1203,1207,1277,1278,1279,1309,1329,1375,1405,1425,1445,1491,1495,2235,2249,2290,2298,2493,2494,2495,2496,2651,2654,2655,2658,2661,2662,2665,2669,2674,2682,2690,2699,2707,2711,2719,2727,2735,2743,2751,2760,2769,2777,2786,2852,2854,2859,2861,2866,2870,2874,2875,2880,2881,2882,2883,2884,2885,2887,2888,2893,2894,2895,2896,2897,2898,2899,2901,2905,2909,2913,2931,2932,2933,2934,2935,2936,2937,2938,2939,2942,2946,2949,3059,3067,3074,3083,3087,3102,3110,3113,3122,3127,3138,3146,3149,3158,3165,3166,3185,3188,3194,3197,3206,3209,3212,3215,3218,3221,3225,3228,3237,3240,3248,3253,3261,3266,3270,3271,3282,3289,3293,3297,3298,3302,3310,3314,3319,3324",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "1219,1275,1335,1396,1824,1877,1935,1983,2538,2628,8045,8103,8163,8436,8482,8542,8595,8641,8691,8738,8796,8854,8913,8973,9035,9097,9159,9221,9283,9345,9406,9468,9530,9846,11919,11993,12056,12124,12205,12269,12335,12405,12475,12545,12615,15583,15646,15711,15777,15830,15906,15972,16059,25340,25394,25473,25551,25624,25689,25752,25818,25889,25960,26022,26091,26157,26224,26291,26347,26398,26451,26503,26557,26628,26691,26750,26812,26871,26944,27011,27071,27134,27209,27281,27352,27408,27479,27536,27593,27659,27723,27794,27851,27904,27967,28019,28077,29545,29611,29677,29758,29833,29889,29942,30003,30061,30111,30160,30209,30258,30320,30372,30417,30498,30552,30605,30659,30710,30759,30810,30871,30932,30994,31044,31085,31135,31183,31245,31296,31345,31414,31475,31531,31602,31667,31736,31787,31850,31920,31989,32059,32121,32191,32261,32336,37057,37115,37463,37508,38122,38169,38214,38598,38772,38838,39017,39080,39152,39209,39266,39326,39384,39454,43482,43632,44277,44381,46205,46362,47150,49719,50633,50711,51012,51178,51333,54820,72659,72752,72859,73202,73309,73538,73947,74179,74279,74384,74503,75101,75248,75367,75602,76017,76255,81470,81591,81724,83808,85304,88543,90623,92131,93655,96890,97114,142321,143125,144885,145335,159475,159548,159635,159720,171585,171780,171872,172045,172207,172302,172471,172714,173007,173416,173830,174262,174680,174921,175351,175786,176196,176618,177028,177457,177883,178299,178737,182849,182917,183261,183341,183697,183847,183991,184075,184440,184538,184646,184744,184854,184970,185096,185192,185569,185679,185803,185941,186051,186173,186301,186439,186601,186817,186973,188246,188330,188434,188528,188642,188754,188878,188974,189054,189243,189449,189642,197986,198418,198839,199264,199461,200409,200930,201053,201690,201911,202726,203195,203378,203974,204434,204539,205800,205950,206367,206532,207212,207371,207462,207546,207742,207909,208131,208291,208668,208827,209155,209372,209947,210297,210546,210643,211349,211787,212028,212217,212351,212542,213179,213429,213732,213947",
+ "endLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,882,1155,1156,1161,1162,1166,1172,1176,1177,1178,1179,1190,1191,1192,1196,1202,1206,1207,1277,1278,1308,1328,1374,1404,1424,1444,1490,1494,1498,2248,2289,2297,2307,2493,2494,2495,2496,2653,2654,2657,2660,2661,2664,2668,2673,2681,2689,2698,2706,2710,2718,2726,2734,2742,2750,2759,2768,2776,2785,2788,2853,2858,2860,2865,2869,2873,2874,2879,2880,2881,2882,2883,2884,2886,2887,2892,2893,2894,2895,2896,2897,2898,2900,2904,2908,2912,2916,2931,2932,2933,2934,2935,2936,2937,2938,2941,2945,2948,2952,3066,3073,3082,3086,3101,3109,3112,3121,3126,3137,3145,3148,3157,3164,3165,3184,3187,3193,3196,3205,3208,3211,3214,3217,3220,3224,3227,3236,3239,3247,3252,3260,3265,3269,3270,3281,3288,3292,3296,3297,3301,3309,3313,3318,3323,3331",
+ "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10",
+ "endOffsets": "1270,1330,1391,1446,1872,1930,1978,2027,2578,2676,8098,8158,8216,8477,8537,8590,8636,8686,8733,8791,8849,8908,8968,9030,9092,9154,9216,9278,9340,9401,9463,9525,9578,9903,11988,12051,12119,12200,12264,12330,12400,12470,12540,12610,12677,15641,15706,15772,15825,15901,15967,16054,16130,25389,25468,25546,25619,25684,25747,25813,25884,25955,26017,26086,26152,26219,26286,26342,26393,26446,26498,26552,26623,26686,26745,26807,26866,26939,27006,27066,27129,27204,27276,27347,27403,27474,27531,27588,27654,27718,27789,27846,27899,27962,28014,28072,28139,29606,29672,29753,29828,29884,29937,29998,30056,30106,30155,30204,30253,30315,30367,30412,30493,30547,30600,30654,30705,30754,30805,30866,30927,30989,31039,31080,31130,31178,31240,31291,31340,31409,31470,31526,31597,31662,31731,31782,31845,31915,31984,32054,32116,32186,32256,32331,32390,37110,37172,37503,37546,38164,38209,38260,38641,38833,38895,39075,39147,39204,39261,39321,39379,39449,39506,43627,43758,44376,44463,46357,46514,47298,49795,50706,51007,51173,51328,51430,55092,72747,72854,73197,73304,73533,73942,74174,74274,74379,74498,75096,75243,75362,75597,76012,76250,76362,81586,81719,83803,85299,88538,90618,92126,93650,96885,97109,97346,143120,144880,145330,146045,159543,159630,159715,159814,171775,171867,172040,172202,172297,172466,172709,173002,173411,173825,174257,174675,174916,175346,175781,176191,176613,177023,177452,177878,178294,178732,178914,182912,183256,183336,183692,183842,183986,184070,184435,184533,184641,184739,184849,184965,185091,185187,185564,185674,185798,185936,186046,186168,186296,186434,186596,186812,186968,187172,188325,188429,188523,188637,188749,188873,188969,189049,189238,189444,189637,189847,198413,198834,199259,199456,200404,200925,201048,201685,201906,202721,203190,203373,203969,204429,204534,205795,205945,206362,206527,207207,207366,207457,207541,207737,207904,208126,208286,208663,208822,209150,209367,209942,210292,210541,210638,211344,211782,212023,212212,212346,212537,213174,213424,213727,213942,214418"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sk\\values-sk.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\themes.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "-1,-1,-1",
+ "startColumns": "-1,-1,-1",
+ "startOffsets": "-1,-1,-1"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2918",
- "endColumns": "100",
- "endOffsets": "3014"
+ "startLines": "2917,2918,2953",
+ "startColumns": "4,4,4",
+ "startOffsets": "187177,187247,189852",
+ "endLines": "2917,2923,2956",
+ "endColumns": "69,12,12",
+ "endOffsets": "187242,187569,190082"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sk\\values-sk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\8847e733ac2464c2340f833a9a6b91dc\\transformed\\recyclerview-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
- "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
- "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
+ "startLines": "-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "479,480,481,489,490,491,619",
+ "startColumns": "4,4,4,4,4,4,4",
+ "startOffsets": "28452,28511,28559,29226,29301,29377,36921",
+ "endColumns": "58,47,55,74,75,71,65",
+ "endOffsets": "28506,28554,28610,29296,29372,29444,36982"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2846",
- "endColumns": "100",
- "endOffsets": "2942"
+ "startLines": "35,221,222,223,224,419,420,421,916,2308,2310,2313",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "1724,11526,11587,11649,11711,24630,24689,24746,57107,146050,146114,146240",
+ "endLines": "35,221,222,223,224,419,420,421,922,2309,2312,2315",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12",
+ "endOffsets": "1771,11582,11644,11706,11770,24684,24741,24795,57516,146109,146235,146363"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ "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",
+ "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",
+ "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"
+ },
+ "to": {
+ "startLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2324,2347,2518,2521,2957,2960",
+ "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",
+ "startOffsets": "465,536,607,671,725,795,1451,1525,1586,1662,2730,2807,2880,7986,8221,8273,8355,9624,12962,13032,13111,13181,13242,13299,13367,13445,13505,13577,13657,13707,13782,13853,13912,13962,14038,14124,14199,14249,16356,16412,17981,18047,18124,18192,18251,18306,18372,18448,18506,18576,18654,18702,18771,18844,18913,18970,19018,19092,19176,19249,19297,24581,29449,29496,42843,43763,43816,43871,43965,44006,44059,44110,44161,44709,44761,44827,45190,45278,45363,45470,45568,46046,46143,51435,146787,148650,161134,161304,190087,190183",
+ "endLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2346,2368,2520,2523,2959,2962",
+ "endColumns": "70,70,63,53,69,71,73,60,75,61,76,72,60,58,51,81,80,45,69,78,69,60,56,67,77,59,71,79,49,74,70,58,49,75,85,74,49,54,55,61,65,76,67,58,54,65,75,57,69,77,47,68,72,68,56,47,73,83,72,47,52,48,46,48,52,52,54,44,40,52,50,50,52,51,65,89,87,84,106,97,59,96,61,53,12,12,12,12,12,12",
+ "endOffsets": "531,602,666,720,790,862,1520,1581,1657,1719,2802,2875,2936,8040,8268,8350,8431,9665,13027,13106,13176,13237,13294,13362,13440,13500,13572,13652,13702,13777,13848,13907,13957,14033,14119,14194,14244,14299,16407,16469,18042,18119,18187,18246,18301,18367,18443,18501,18571,18649,18697,18766,18839,18908,18965,19013,19087,19171,19244,19292,19345,24625,29491,29540,42891,43811,43866,43911,44001,44054,44105,44156,44209,44756,44822,44912,45273,45358,45465,45563,45623,46138,46200,51484,148645,150396,161299,161471,190178,190272"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mr_values-mr.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mr\\values-mr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,322,429,519,620,735,812,890,981,1074,1168,1265,1366,1459,1554,1651,1742,1833,1913,2025,2127,2223,2332,2433,2545,2702,2807",
- "endColumns": "110,105,106,89,100,114,76,77,90,92,93,96,100,92,94,96,90,90,79,111,101,95,108,100,111,156,104,79",
- "endOffsets": "211,317,424,514,615,730,807,885,976,1069,1163,1260,1361,1454,1549,1646,1737,1828,1908,2020,2122,2218,2327,2428,2540,2697,2802,2882"
+ "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",
+ "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",
+ "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"
+ },
+ "to": {
+ "startLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2635,2636,2641,2644,2649,3057,3058",
+ "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",
+ "startOffsets": "10356,10428,16135,16204,24800,24870,24938,25010,25080,25141,25215,32503,32564,32625,32687,32751,32813,32874,32942,33042,33102,33168,33241,33310,33367,33419,34461,34533,34609,34674,34733,34792,34852,34912,34972,35032,35092,35152,35212,35272,35332,35392,35451,35511,35571,35631,35691,35751,35811,35871,35931,35991,36051,36110,36170,36230,36289,36348,36407,36466,36525,36987,37022,37597,37652,37715,37770,37828,37885,37935,37996,38053,38087,38265,39511,53474,170445,170562,170829,171122,171389,197847,197919",
+ "endLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2635,2639,2641,2647,2649,3057,3058",
+ "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
+ "endOffsets": "10423,10511,16199,16262,24865,24933,25005,25075,25136,25210,25283,32559,32620,32682,32746,32808,32869,32937,33037,33097,33163,33236,33305,33362,33414,33476,34528,34604,34669,34728,34787,34847,34907,34967,35027,35087,35147,35207,35267,35327,35387,35446,35506,35566,35626,35686,35746,35806,35866,35926,35986,36046,36105,36165,36225,36284,36343,36402,36461,36520,36579,37017,37052,37647,37710,37765,37823,37880,37930,37991,38048,38082,38117,38295,39576,53540,170557,170758,170934,171318,171513,197914,197981"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mr\\values-mr.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2887",
- "endColumns": "100",
- "endOffsets": "2983"
+ "startLines": "212,269,270,271,272,319",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "10835,14705,14756,14807,14859,17924",
+ "endColumns": "49,50,50,51,51,56",
+ "endOffsets": "10880,14751,14802,14854,14906,17976"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\30d1ee0d1e89d746174a8183792b431a\\transformed\\transition-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802",
- "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79",
- "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877"
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "616,624,627,628,629,647,648,649,650,651",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "36789,37177,37316,37363,37418,38300,38354,38406,38455,38516",
+ "endColumns": "39,42,46,54,44,53,51,48,60,49",
+ "endOffsets": "36824,37215,37358,37413,37458,38349,38401,38450,38511,38561"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "30",
+ "startLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,895,903,904,908,912,923,928,934,941,945,949,954,958,962,966,970,974,978,984,988,994,998,1004,1008,1013,1017,1020,1024,1030,1034,1040,1044,1050,1053,1057,1061,1065,1069,1073,1074,1075,1076,1079,1082,1085,1088,1092,1093,1094,1095,1096,1099,1101,1103,1105,1110,1111,1115,1121,1125,1126,1128,1139,1140,1144,1150,1154,1208,1209,1213,1240,1244,1245,1249,1499,1666,1692,1860,1886,1917,1925,1931,1945,1967,1972,1977,1987,1996,2005,2009,2016,2024,2031,2032,2041,2044,2047,2051,2055,2059,2062,2063,2067,2071,2081,2086,2093,2099,2100,2103,2107,2112,2114,2116,2119,2122,2124,2128,2131,2138,2141,2144,2148,2150,2154,2156,2158,2160,2164,2172,2180,2192,2198,2207,2210,2221,2224,2229,2230,2376,2434,2497,2498,2508,2517,2524,2526,2530,2533,2536,2539,2542,2545,2548,2551,2555,2558,2561,2564,2568,2571,2575,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2601,2603,2604,2605,2606,2607,2608,2609,2610,2612,2613,2615,2616,2618,2620,2621,2623,2624,2625,2626,2627,2628,2630,2631,2632,2633,2634,2789,2791,2793,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2837,2838,2839,2840,2841,2842,2844,2848,2924,2925,2926,2927,2928,2929,2930,2963,2965,2967,2969,2971,2973,2974,2975,2976,2978,2980,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2996,2997,2998,2999,3001,3003,3004,3006,3007,3009,3011,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3026,3027,3028,3029,3031,3032,3033,3034,3035,3037,3039,3041,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "2252,2583,2681,9583,9670,9725,9784,9908,9989,10050,10125,10201,10278,10516,10601,10683,10759,10885,10962,11040,11146,11252,11331,11411,11468,12682,12756,12831,12896,14304,14364,14425,14497,14570,14637,14911,14970,15029,15088,15147,15206,15260,15314,15367,15421,15475,15529,16474,16548,16627,16700,16774,16845,16917,16989,17062,17119,17177,17250,17324,17398,17473,17545,17618,17688,17803,17863,19350,19419,19488,19558,19632,19708,19772,19849,19925,20002,20067,20136,20213,20288,20357,20425,20502,20568,20629,20726,20791,20860,20959,21030,21089,21147,21204,21263,21327,21398,21470,21542,21614,21686,21753,21821,21889,21948,22011,22075,22165,22256,22316,22382,22449,22515,22585,22649,22702,22815,22873,22936,23001,23066,23141,23214,23286,23335,23396,23457,23518,23580,23644,23708,23772,23837,23900,23960,24021,24087,24146,24206,24268,24339,24399,28144,28230,28615,28705,28792,28880,28962,29045,29135,34008,34060,34118,34163,34229,34293,34350,34407,36584,36641,36689,36738,36887,37220,37267,37551,38566,38646,38710,38900,38960,39973,40047,40117,40195,40249,40319,40404,40452,40498,40569,40647,40725,40797,40871,40945,41019,41099,41172,41241,41313,41390,41451,41514,41580,41644,41715,41778,41843,41907,41968,42029,42081,42154,42228,42297,42372,42446,42520,42661,53282,54378,54456,54546,54634,54730,55656,56238,56327,56574,56855,57521,57806,58199,58676,58898,59120,59396,59623,59853,60083,60313,60543,60770,61189,61415,61840,62070,62498,62717,63000,63208,63339,63566,63992,64217,64644,64865,65290,65410,65686,65987,66311,66602,66916,67053,67184,67289,67531,67698,67902,68110,68381,68493,68605,68710,68827,69041,69187,69327,69413,69761,69849,70095,70513,70762,70844,70942,71534,71634,71886,72310,72565,76367,76456,76693,78717,78959,79061,79314,97351,107480,108996,119224,120752,122509,123135,123555,124616,125881,126137,126373,126920,127414,128019,128217,128797,129361,129736,129854,130392,130549,130745,131018,131274,131444,131585,131649,131931,132217,132893,133157,133495,133848,133942,134128,134434,134696,134821,134948,135187,135398,135517,135710,135887,136342,136523,136645,136904,137017,137204,137306,137413,137542,137817,138325,138821,139698,139992,140562,140711,141443,141615,141951,142043,150768,155050,159819,159881,160459,161043,161476,161589,161818,161978,162130,162301,162467,162636,162803,162966,163209,163379,163552,163723,163997,164196,164401,164731,164815,164911,165007,165105,165205,165307,165409,165511,165613,165715,165815,165911,166023,166152,166275,166406,166537,166635,166749,166843,166983,167117,167213,167325,167425,167541,167637,167749,167849,167989,168125,168289,168419,168577,168727,168868,169012,169147,169259,169409,169537,169665,169801,169933,170063,170193,170305,178919,179065,179209,180693,180759,180849,180925,181029,181119,181221,181329,181437,181537,181617,181709,181807,181917,181995,182101,182193,182297,182407,182529,182692,187574,187654,187754,187844,187954,188048,188154,190277,190377,190489,190603,190719,190835,190929,191043,191155,191257,191377,191499,191581,191685,191805,191931,192029,192123,192211,192323,192439,192561,192673,192848,192964,193050,193142,193254,193378,193445,193571,193639,193767,193911,194039,194108,194203,194318,194431,194530,194639,194750,194861,194962,195067,195167,195297,195388,195511,195605,195717,195803,195907,196003,196091,196209,196313,196417,196543,196631,196739,196839,196929,197039,197123,197225,197309,197363,197427,197533,197643,197727",
+ "endLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,902,903,907,911,915,927,933,940,944,948,953,957,961,965,969,973,977,983,987,993,997,1003,1007,1012,1016,1019,1023,1029,1033,1039,1043,1049,1052,1056,1060,1064,1068,1072,1073,1074,1075,1078,1081,1084,1087,1091,1092,1093,1094,1095,1098,1100,1102,1104,1109,1110,1114,1120,1124,1125,1127,1138,1139,1143,1149,1153,1154,1208,1212,1239,1243,1244,1248,1276,1665,1691,1859,1885,1916,1924,1930,1944,1966,1971,1976,1986,1995,2004,2008,2015,2023,2030,2031,2040,2043,2046,2050,2054,2058,2061,2062,2066,2070,2080,2085,2092,2098,2099,2102,2106,2111,2113,2115,2118,2121,2123,2127,2130,2137,2140,2143,2147,2149,2153,2155,2157,2159,2163,2171,2179,2191,2197,2206,2209,2220,2223,2228,2229,2234,2433,2492,2497,2507,2516,2517,2525,2529,2532,2535,2538,2541,2544,2547,2550,2554,2557,2560,2563,2567,2570,2574,2578,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2600,2602,2603,2604,2605,2606,2607,2608,2609,2611,2612,2614,2615,2617,2619,2620,2622,2623,2624,2625,2626,2627,2629,2630,2631,2632,2633,2634,2790,2792,2794,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2836,2837,2838,2839,2840,2841,2843,2847,2851,2924,2925,2926,2927,2928,2929,2930,2964,2966,2968,2970,2972,2973,2974,2975,2977,2979,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2995,2996,2997,2998,3000,3002,3003,3005,3006,3008,3010,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3025,3026,3027,3028,3030,3031,3032,3033,3034,3036,3038,3040,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
+ "endOffsets": "2302,2623,2725,9619,9720,9779,9841,9984,10045,10120,10196,10273,10351,10596,10678,10754,10830,10957,11035,11141,11247,11326,11406,11463,11521,12751,12826,12891,12957,14359,14420,14492,14565,14632,14700,14965,15024,15083,15142,15201,15255,15309,15362,15416,15470,15524,15578,16543,16622,16695,16769,16840,16912,16984,17057,17114,17172,17245,17319,17393,17468,17540,17613,17683,17754,17858,17919,19414,19483,19553,19627,19703,19767,19844,19920,19997,20062,20131,20208,20283,20352,20420,20497,20563,20624,20721,20786,20855,20954,21025,21084,21142,21199,21258,21322,21393,21465,21537,21609,21681,21748,21816,21884,21943,22006,22070,22160,22251,22311,22377,22444,22510,22580,22644,22697,22810,22868,22931,22996,23061,23136,23209,23281,23330,23391,23452,23513,23575,23639,23703,23767,23832,23895,23955,24016,24082,24141,24201,24263,24334,24394,24462,28225,28312,28700,28787,28875,28957,29040,29130,29221,34055,34113,34158,34224,34288,34345,34402,34456,36636,36684,36733,36784,36916,37262,37311,37592,38593,38705,38767,38955,39012,40042,40112,40190,40244,40314,40399,40447,40493,40564,40642,40720,40792,40866,40940,41014,41094,41167,41236,41308,41385,41446,41509,41575,41639,41710,41773,41838,41902,41963,42024,42076,42149,42223,42292,42367,42441,42515,42656,42726,53330,54451,54541,54629,54725,54815,56233,56322,56569,56850,57102,57801,58194,58671,58893,59115,59391,59618,59848,60078,60308,60538,60765,61184,61410,61835,62065,62493,62712,62995,63203,63334,63561,63987,64212,64639,64860,65285,65405,65681,65982,66306,66597,66911,67048,67179,67284,67526,67693,67897,68105,68376,68488,68600,68705,68822,69036,69182,69322,69408,69756,69844,70090,70508,70757,70839,70937,71529,71629,71881,72305,72560,72654,76451,76688,78712,78954,79056,79309,81465,107475,108991,119219,120747,122504,123130,123550,124611,125876,126132,126368,126915,127409,128014,128212,128792,129356,129731,129849,130387,130544,130740,131013,131269,131439,131580,131644,131926,132212,132888,133152,133490,133843,133937,134123,134429,134691,134816,134943,135182,135393,135512,135705,135882,136337,136518,136640,136899,137012,137199,137301,137408,137537,137812,138320,138816,139693,139987,140557,140706,141438,141610,141946,142038,142316,155045,159470,159876,160454,161038,161129,161584,161813,161973,162125,162296,162462,162631,162798,162961,163204,163374,163547,163718,163992,164191,164396,164726,164810,164906,165002,165100,165200,165302,165404,165506,165608,165710,165810,165906,166018,166147,166270,166401,166532,166630,166744,166838,166978,167112,167208,167320,167420,167536,167632,167744,167844,167984,168120,168284,168414,168572,168722,168863,169007,169142,169254,169404,169532,169660,169796,169928,170058,170188,170300,170440,179060,179204,179342,180754,180844,180920,181024,181114,181216,181324,181432,181532,181612,181704,181802,181912,181990,182096,182188,182292,182402,182524,182687,182844,187649,187749,187839,187949,188043,188149,188241,190372,190484,190598,190714,190830,190924,191038,191150,191252,191372,191494,191576,191680,191800,191926,192024,192118,192206,192318,192434,192556,192668,192843,192959,193045,193137,193249,193373,193440,193566,193634,193762,193906,194034,194103,194198,194313,194426,194525,194634,194745,194856,194957,195062,195162,195292,195383,195506,195600,195712,195798,195902,195998,196086,196204,196308,196412,196538,196626,196734,196834,196924,197034,197118,197220,197304,197358,197422,197528,197638,197722,197842"
+ }
+ },
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "18,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "841,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1317,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "1248,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1361,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "669,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "39581,42731,42787,42896,42992,43075,43171,43266,43335,43378,43430,43916,44214,44468,44526,44577,44625,44917,45011,45119,45628,45712,45795,45861,45944,46519,46580,46642,46693,46771,46824,46884,46989,47048,47303,47358,47429,47485,47535,47590,47639,47697,47753,47810,47868,47915,47974,48031,48102,48163,48220,48270,48322,48375,48425,48475,48530,48590,48635,48688,48754,48816,48867,48930,48991,49040,49087,49142,49230,49288,49350,49400,49445,49488,49548,49603,49670,49800,49862,49911,49987,50061,50111,50166,50213,50268,50321,50368,50421,50477,50525,50580,51489,51573,51640,51704,51800,51874,51955,52044,52207,52351,52430,52505,52587,52646,52726,52806,52861,52983,53086,53131,53172,53225,53335,53409,53545,53613,53699,53779,53848,53942,54001,54056,54118,54178,54288",
+ "endLines": "673,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
+ "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,48,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "39968,42782,42838,42987,43070,43166,43261,43330,43373,43425,43477,43960,44272,44521,44572,44620,44704,45006,45114,45185,45707,45790,45856,45939,46041,46575,46637,46688,46766,46819,46879,46984,47043,47145,47353,47424,47480,47530,47585,47634,47692,47748,47805,47863,47910,47969,48026,48097,48158,48215,48265,48317,48370,48420,48470,48525,48585,48630,48683,48749,48811,48862,48925,48986,49035,49082,49137,49225,49283,49345,49395,49440,49483,49543,49598,49665,49714,49857,49906,49982,50056,50106,50161,50208,50263,50316,50363,50416,50472,50520,50575,50628,51568,51635,51699,51795,51869,51950,52039,52202,52346,52425,52500,52582,52641,52721,52801,52856,52978,53081,53126,53167,53220,53277,53404,53469,53608,53694,53774,53843,53937,53996,54051,54113,54173,54283,54373"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\656f7c140db38b557c6f895c5997c1ff\\transformed\\drawerlayout-1.1.1\\res\\values\\values.xml",
+ "from": {
+ "startLines": "-1,-1,-1",
+ "startColumns": "-1,-1,-1",
+ "startOffsets": "-1,-1,-1"
+ },
+ "to": {
+ "startLines": "46,47,429",
+ "startColumns": "4,4,4",
+ "startOffsets": "2307,2363,25288",
+ "endColumns": "55,47,51",
+ "endOffsets": "2358,2406,25335"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7bd1a0e41b0fd55c93cf529ddb15a7aa\\transformed\\jetified-spiderman-1.0.2\\res\\values\\values.xml",
+ "from": {
+ "startLines": "-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "225,226,227,316,559",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "11775,11821,11868,17759,33481",
+ "endColumns": "45,46,50,43,52",
+ "endOffsets": "11816,11863,11914,17798,33529"
+ }
+ },
+ {
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+ },
+ "to": {
+ "startLines": "416,417,476,477,478,542,543,564,565,566,567,568",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "24467,24525,28317,28359,28405,32395,32445,33746,33798,33851,33904,33956",
+ "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
+ "endOffsets": "24520,24576,28354,28400,28447,32440,32498,33793,33846,33899,33951,34003"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\b1fe022d8b933bedca75571d129b522a\\transformed\\jetified-glide-4.8.0\\res\\values\\values.xml",
+ "from": {
+ "startLines": "-1",
+ "startColumns": "-1",
+ "startOffsets": "-1"
+ },
+ "to": {
+ "startLines": "617",
"startColumns": "4",
- "startOffsets": "2882",
- "endColumns": "100",
- "endOffsets": "2978"
+ "startOffsets": "36829",
+ "endColumns": "57",
+ "endOffsets": "36882"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tl_values-tl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -2515,7 +2640,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2534,10 +2659,26 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v17\\values-v17.xml",
+ "from": {
+ "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216",
+ "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ka_values-ka.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -2547,7 +2688,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2566,10 +2707,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-km_values-km.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rGB_values-en-rGB.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-km\\values-km.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rGB\\values-en-rGB.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2580,43 +2731,33 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2882",
+ "startOffsets": "2846",
"endColumns": "100",
- "endOffsets": "2978"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-km\\values-km.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,308,420,507,611,729,806,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1905,2009,2114,2214,2324,2431,2539,2701,2799",
- "endColumns": "102,99,111,86,103,117,76,76,90,92,95,93,100,92,94,93,90,90,82,103,104,99,109,106,107,161,97,82",
- "endOffsets": "203,303,415,502,606,724,801,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1900,2004,2109,2209,2319,2426,2534,2696,2794,2877"
+ "endOffsets": "2942"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-tr-rTR_values-tr-rTR.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh_values-zh.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-tr-rTR\\values-tr-rTR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh\\values-zh.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,108,162,218,263,307,360,415,485,595,683,774,835,931,992",
- "endColumns": "52,53,55,44,43,52,54,69,109,87,90,60,95,60,53",
- "endOffsets": "103,157,213,258,302,355,410,480,590,678,769,830,926,987,1041"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,101,151,203,246,289,336,382,431,482,530,583,647,708,773,863,943,997,1057,1112",
+ "endColumns": "45,49,51,42,42,46,45,48,50,47,52,63,60,64,89,79,53,59,54,50",
+ "endOffsets": "96,146,198,241,284,331,377,426,477,525,578,642,703,768,858,938,992,1052,1107,1158"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-in_values-in.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-in\\values-in.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2627,54 +2768,73 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2949",
+ "startOffsets": "2887",
"endColumns": "100",
- "endOffsets": "3045"
+ "endOffsets": "2983"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-in\\values-in.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
- "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
- "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
+ "startOffsets": "105,215,317,422,509,613,729,811,890,981,1074,1170,1264,1365,1458,1553,1647,1738,1829,1915,2018,2127,2228,2332,2440,2548,2704,2803",
+ "endColumns": "109,101,104,86,103,115,81,78,90,92,95,93,100,92,94,93,90,90,85,102,108,100,103,107,107,155,98,83",
+ "endOffsets": "210,312,417,504,608,724,806,885,976,1069,1165,1259,1360,1453,1548,1642,1733,1824,1910,2013,2122,2223,2327,2435,2543,2699,2798,2882"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v17_values-v17.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v23_values-v23.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v17\\values-v17.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v23\\values-v23.xml",
"from": {
- "startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,228,456,614,764,936,1161,1331,1559,1783,2025,2196,2370,2539,2812,3012,3216",
- "endLines": "4,8,11,14,17,21,24,28,32,36,39,42,45,49,52,56,60",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "223,451,609,759,931,1156,1326,1554,1778,2020,2191,2365,2534,2807,3007,3211,3540"
+ "startLines": "2,3,4,5,6,19,32,33,34,35,36",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
+ "endLines": "2,3,4,5,18,31,32,33,34,35,36",
+ "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
+ "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endLines": "4",
+ "endColumns": "12",
+ "endOffsets": "200"
+ },
+ "to": {
+ "startLines": "37",
+ "startColumns": "4",
+ "startOffsets": "2646",
+ "endLines": "39",
+ "endColumns": "12",
+ "endOffsets": "2791"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-af_values-af.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-af\\values-af.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-eu\\values-eu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,209,309,415,500,603,721,797,874,965,1058,1154,1248,1348,1441,1536,1635,1730,1824,1905,2012,2115,2212,2320,2422,2524,2678,2776",
- "endColumns": "103,99,105,84,102,117,75,76,90,92,95,93,99,92,94,98,94,93,80,106,102,96,107,101,101,153,97,79",
- "endOffsets": "204,304,410,495,598,716,792,869,960,1053,1149,1243,1343,1436,1531,1630,1725,1819,1900,2007,2110,2207,2315,2417,2519,2673,2771,2851"
+ "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
+ "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
+ "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-af\\values-af.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-eu\\values-eu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2685,52 +2845,50 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2856",
+ "startOffsets": "2938",
"endColumns": "100",
- "endOffsets": "2952"
+ "endOffsets": "3034"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-land_values-land.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-land\\values-land.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt\\values-pt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endLines": "5",
- "endColumns": "10",
- "endOffsets": "222"
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "5",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "264",
- "endLines": "8",
- "endColumns": "10",
- "endOffsets": "431"
+ "startOffsets": "2929",
+ "endColumns": "100",
+ "endOffsets": "3025"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-land\\values-land.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt\\values-pt.xml",
"from": {
- "startLines": "2,3,4",
- "startColumns": "4,4,4",
- "startOffsets": "55,125,196",
- "endColumns": "69,70,67",
- "endOffsets": "120,191,259"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
+ "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-eu_values-eu.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pa_values-pa.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pa\\values-pa.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2741,28 +2899,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2938",
+ "startOffsets": "2839",
"endColumns": "100",
- "endOffsets": "3034"
+ "endOffsets": "2935"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pa\\values-pa.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
- "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
- "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
+ "startOffsets": "105,208,305,410,496,596,709,786,862,953,1046,1142,1236,1337,1430,1525,1619,1710,1801,1880,1981,2085,2182,2291,2390,2500,2659,2759",
+ "endColumns": "102,96,104,85,99,112,76,75,90,92,95,93,100,92,94,93,90,90,78,100,103,96,108,98,109,158,99,79",
+ "endOffsets": "203,300,405,491,591,704,781,857,948,1041,1137,1231,1332,1425,1520,1614,1705,1796,1875,1976,2080,2177,2286,2385,2495,2654,2754,2834"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gl_values-gl.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rPT_values-pt-rPT.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gl\\values-gl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
+ "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
+ "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2773,77 +2941,98 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2920",
+ "startOffsets": "2949",
"endColumns": "100",
- "endOffsets": "3016"
+ "endOffsets": "3045"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sk_values-sk.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gl\\values-gl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sk\\values-sk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,217,329,437,522,624,750,834,915,1007,1101,1199,1293,1394,1488,1584,1679,1771,1863,1945,2052,2161,2260,2368,2472,2579,2738,2838",
- "endColumns": "111,111,107,84,101,125,83,80,91,93,97,93,100,93,95,94,91,91,81,106,108,98,107,103,106,158,99,81",
- "endOffsets": "212,324,432,517,619,745,829,910,1002,1096,1194,1288,1389,1483,1579,1674,1766,1858,1940,2047,2156,2255,2363,2467,2574,2733,2833,2915"
+ "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
+ "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
+ "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sk\\values-sk.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2918",
+ "endColumns": "100",
+ "endOffsets": "3014"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh_values-zh.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh\\values-zh.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v22\\values-v22.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,101,151,203,246,289,336,382,431,482,530,583,647,708,773,863,943,997,1057,1112",
- "endColumns": "45,49,51,42,42,46,45,48,50,47,52,63,60,64,89,79,53,59,54,50",
- "endOffsets": "96,146,198,241,284,331,377,426,477,525,578,642,703,768,858,938,992,1052,1107,1158"
+ "startLines": "2,3,4,9",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,130,217,553",
+ "endLines": "2,3,8,13",
+ "endColumns": "74,86,12,12",
+ "endOffsets": "125,212,548,896"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lo\\values-lo.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "65",
- "endOffsets": "116"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
+ "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
+ "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lo\\values-lo.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endLines": "5",
- "endColumns": "12",
- "endOffsets": "223"
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "3",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "121",
- "endLines": "6",
- "endColumns": "12",
- "endOffsets": "289"
+ "startOffsets": "2836",
+ "endColumns": "100",
+ "endOffsets": "2932"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-lo_values-lo.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-uz_values-uz.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lo\\values-lo.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2854,60 +3043,43 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2836",
+ "startOffsets": "2889",
"endColumns": "100",
- "endOffsets": "2932"
+ "endOffsets": "2985"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lo\\values-lo.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
- "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
- "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
+ "startOffsets": "105,210,314,428,514,614,730,810,889,980,1073,1169,1263,1358,1451,1546,1641,1732,1824,1908,2017,2124,2225,2333,2438,2545,2706,2805",
+ "endColumns": "104,103,113,85,99,115,79,78,90,92,95,93,94,92,94,94,90,91,83,108,106,100,107,104,106,160,98,83",
+ "endOffsets": "205,309,423,509,609,725,805,884,975,1068,1164,1258,1353,1446,1541,1636,1727,1819,1903,2012,2119,2220,2328,2433,2540,2701,2800,2884"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-or_values-or.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-or\\values-or.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847",
- "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88",
- "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-or\\values-or.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "30",
- "startColumns": "4",
- "startOffsets": "2936",
- "endColumns": "100",
- "endOffsets": "3032"
+ "startLines": "2,3,4,5,6,7",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,126,197,267,337,405",
+ "endColumns": "70,70,69,69,67,67",
+ "endOffsets": "121,192,262,332,400,468"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fi_values-fi.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2924,7 +3096,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -2936,20 +3108,20 @@
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr-rCA_values-fr-rCA.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861",
- "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88",
- "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945"
+ "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
+ "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
+ "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2960,28 +3132,44 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2950",
+ "startOffsets": "2965",
"endColumns": "100",
- "endOffsets": "3046"
+ "endOffsets": "3061"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v26_values-v26.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v26\\values-v26.xml",
+ "from": {
+ "startLines": "2,3,4,8,12,16",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "55,130,217,431,657,896",
+ "endLines": "2,3,7,11,15,16",
+ "endColumns": "74,86,12,12,12,92",
+ "endOffsets": "125,212,426,652,891,984"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mk\\values-mk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853",
- "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82",
- "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931"
+ "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
+ "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
+ "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mk\\values-mk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -2992,106 +3180,100 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2936",
+ "startOffsets": "2945",
"endColumns": "100",
- "endOffsets": "3032"
+ "endOffsets": "3041"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v16_values-v16.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr\\values-fr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v16\\values-v16.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
- "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
- "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "65",
+ "endOffsets": "116"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr\\values-fr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v16\\values-v16.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "endLines": "5",
+ "endColumns": "12",
+ "endOffsets": "223"
},
"to": {
- "startLines": "30",
+ "startLines": "3",
"startColumns": "4",
- "startOffsets": "2945",
- "endColumns": "100",
- "endOffsets": "3041"
+ "startOffsets": "121",
+ "endLines": "6",
+ "endColumns": "12",
+ "endOffsets": "289"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-gu_values-gu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gu\\values-gu.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,318,425,512,613,736,813,891,982,1075,1174,1268,1369,1462,1557,1654,1745,1836,1916,2022,2124,2221,2330,2429,2539,2699,2802",
+ "endColumns": "108,103,106,86,100,122,76,77,90,92,98,93,100,92,94,96,90,90,79,105,101,96,108,98,109,159,102,79",
+ "endOffsets": "209,313,420,507,608,731,808,886,977,1070,1169,1263,1364,1457,1552,1649,1740,1831,1911,2017,2119,2216,2325,2424,2534,2694,2797,2877"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gu\\values-gu.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
},
"to": {
- "startLines": "45",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "3996",
+ "startOffsets": "2882",
"endColumns": "100",
- "endOffsets": "4092"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
- "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
- "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
- },
- "to": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
- "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",
- "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,3911",
- "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
- "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,3991"
+ "endOffsets": "2978"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v20_values-watch-v20.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,114,169,226,273,314,374,438,512,614,710,817,883,1000,1068",
- "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
- "endOffsets": "109,164,221,268,309,369,433,507,609,705,812,878,995,1063,1117"
- },
- "to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2844,2903,2958,3015,3062,3103,3163,3227,3301,3403,3499,3606,3672,3789,3857",
- "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
- "endOffsets": "2898,2953,3010,3057,3098,3158,3222,3296,3398,3494,3601,3667,3784,3852,3906"
+ "startLines": "2,5,8",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,214,385",
+ "endLines": "4,7,10",
+ "endColumns": "12,12,12",
+ "endOffsets": "209,380,553"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-mk_values-mk.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mk\\values-mk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sq\\values-sq.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3102,44 +3284,62 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2945",
+ "startOffsets": "2907",
"endColumns": "100",
- "endOffsets": "3041"
+ "endOffsets": "3003"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mk\\values-mk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sq\\values-sq.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
- "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
- "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
+ "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826",
+ "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80",
+ "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hdpi-v4_values-hdpi-v4.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ko_values-ko.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ko\\values-ko.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endLines": "6",
- "endColumns": "13",
- "endOffsets": "327"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,103,153,205,248,289,337,390,452,533,598,667,727,802,863",
+ "endColumns": "47,49,51,42,40,47,52,61,80,64,68,59,74,60,50",
+ "endOffsets": "98,148,200,243,284,332,385,447,528,593,662,722,797,858,909"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2678,2726,2776,2828,2871,2912,2960,3013,3075,3156,3221,3290,3350,3425,3486",
+ "endColumns": "47,49,51,42,40,47,52,61,80,64,68,59,74,60,50",
+ "endOffsets": "2721,2771,2823,2866,2907,2955,3008,3070,3151,3216,3285,3345,3420,3481,3532"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt_values-pt.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt\\values-pt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ko\\values-ko.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,2678",
+ "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
+ "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,2751"
+ },
+ "to": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
+ "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",
+ "startOffsets": "105,200,294,396,478,576,682,761,837,928,1021,1113,1204,1305,1398,1493,1587,1678,1769,1849,1947,2042,2137,2237,2333,2432,2584,3537",
+ "endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
+ "endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,3610"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ko\\values-ko.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3148,30 +3348,20 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "45",
"startColumns": "4",
- "startOffsets": "2929",
+ "startOffsets": "3615",
"endColumns": "100",
- "endOffsets": "3025"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt\\values-pt.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
- "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
- "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
+ "endOffsets": "3711"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sq_values-sq.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3182,38 +3372,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2907",
+ "startOffsets": "2988",
"endColumns": "100",
- "endOffsets": "3003"
+ "endOffsets": "3084"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,219,319,431,518,628,751,832,911,1002,1095,1191,1285,1387,1480,1575,1672,1763,1856,1939,2045,2150,2248,2354,2457,2573,2727,2826",
- "endColumns": "113,99,111,86,109,122,80,78,90,92,95,93,101,92,94,96,90,92,82,105,104,97,105,102,115,153,98,80",
- "endOffsets": "214,314,426,513,623,746,827,906,997,1090,1186,1280,1382,1475,1570,1667,1758,1851,1934,2040,2145,2243,2349,2452,2568,2722,2821,2902"
+ "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902",
+ "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85",
+ "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sw_values-sw.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sl_values-sl.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sl\\values-sl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,208,306,414,504,609,726,808,891,982,1075,1169,1263,1364,1457,1552,1647,1738,1830,1912,2013,2122,2221,2328,2437,2542,2704,2801",
- "endColumns": "102,97,107,89,104,116,81,82,90,92,93,93,100,92,94,94,90,91,81,100,108,98,106,108,104,161,96,81",
- "endOffsets": "203,301,409,499,604,721,803,886,977,1070,1164,1258,1359,1452,1547,1642,1733,1825,1907,2008,2117,2216,2323,2432,2537,2699,2796,2878"
+ "startOffsets": "105,212,319,427,514,617,736,821,905,997,1091,1187,1281,1377,1471,1567,1667,1759,1851,1935,2043,2152,2252,2365,2472,2576,2756,2853",
+ "endColumns": "106,106,107,86,102,118,84,83,91,93,95,93,95,93,95,99,91,91,83,107,108,99,112,106,103,179,96,82",
+ "endOffsets": "207,314,422,509,612,731,816,900,992,1086,1182,1276,1372,1466,1562,1662,1754,1846,1930,2038,2147,2247,2360,2467,2571,2751,2848,2931"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sl\\values-sl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3224,401 +3414,75 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2883",
+ "startOffsets": "2936",
"endColumns": "100",
- "endOffsets": "2979"
+ "endOffsets": "3032"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-fr_values-fr.arsc.flat",
"map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "23,24,27,29,30,26,25,19,20,21,22,18",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "997,1056,1223,1268,1315,1172,1113,783,836,890,944,730",
- "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
- "endOffsets": "1050,1107,1260,1309,1357,1217,1166,830,884,938,991,777"
- },
- "to": {
- "startLines": "416,417,476,477,478,542,543,564,565,566,567,568",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "24612,24670,28462,28504,28550,32540,32590,33891,33943,33996,34049,34101",
- "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
- "endOffsets": "24665,24721,28499,28545,28592,32585,32643,33938,33991,34044,34096,34148"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\a3b53597472b39093af755f90fb87b98\\transformed\\jetified-glide-4.8.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr\\values-fr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "57",
- "endOffsets": "108"
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "617",
+ "startLines": "30",
"startColumns": "4",
- "startOffsets": "36974",
- "endColumns": "57",
- "endOffsets": "37027"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7bd1a0e41b0fd55c93cf529ddb15a7aa\\transformed\\jetified-spiderman-1.0.2\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "55,101,148,199,243",
- "endColumns": "45,46,50,43,52",
- "endOffsets": "96,143,194,238,291"
- },
- "to": {
- "startLines": "225,226,227,316,559",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "11920,11966,12013,17904,33626",
- "endColumns": "45,46,50,43,52",
- "endOffsets": "11961,12008,12059,17943,33674"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,83,84,88,89,90,91,98,141,173,210",
- "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",
- "startOffsets": "55,127,215,284,347,417,485,557,627,688,762,835,896,957,1019,1083,1145,1206,1274,1374,1434,1500,1573,1642,1699,1751,1813,1885,1961,2026,2085,2144,2204,2264,2324,2384,2444,2504,2564,2624,2684,2744,2803,2863,2923,2983,3043,3103,3163,3223,3283,3343,3403,3462,3522,3582,3641,3700,3759,3818,3877,3936,3971,4006,4061,4124,4179,4237,4294,4344,4405,4462,4496,4531,4566,4636,4707,4824,5025,5135,5336,5465,5537,5604,5902,8808,10873,12633",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,82,83,87,88,89,90,97,140,172,209,216",
- "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "122,210,279,342,412,480,552,622,683,757,830,891,952,1014,1078,1140,1201,1269,1369,1429,1495,1568,1637,1694,1746,1808,1880,1956,2021,2080,2139,2199,2259,2319,2379,2439,2499,2559,2619,2679,2739,2798,2858,2918,2978,3038,3098,3158,3218,3278,3338,3398,3457,3517,3577,3636,3695,3754,3813,3872,3931,3966,4001,4056,4119,4174,4232,4289,4339,4400,4457,4491,4526,4561,4631,4702,4819,5020,5130,5331,5460,5532,5599,5897,8803,10868,12628,13005"
- },
- "to": {
- "startLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2637,2638,2643,2646,2651,3059,3060,4128,4296,4339,4376,4413",
- "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",
- "startOffsets": "10501,10573,16280,16349,24945,25015,25083,25155,25225,25286,25360,32648,32709,32770,32832,32896,32958,33019,33087,33187,33247,33313,33386,33455,33512,33564,34606,34678,34754,34819,34878,34937,34997,35057,35117,35177,35237,35297,35357,35417,35477,35537,35596,35656,35716,35776,35836,35896,35956,36016,36076,36136,36196,36255,36315,36375,36434,36493,36552,36611,36670,37132,37167,37742,37797,37860,37915,37973,38030,38080,38141,38198,38232,38410,39656,53620,172458,172575,172842,173135,173402,199972,200044,261441,277301,280207,282668,284428",
- "endLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2637,2641,2643,2649,2651,3059,3060,4134,4338,4370,4412,4419",
- "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "10568,10656,16344,16407,25010,25078,25150,25220,25281,25355,25428,32704,32765,32827,32891,32953,33014,33082,33182,33242,33308,33381,33450,33507,33559,33621,34673,34749,34814,34873,34932,34992,35052,35112,35172,35232,35292,35352,35412,35472,35532,35591,35651,35711,35771,35831,35891,35951,36011,36071,36131,36191,36250,36310,36370,36429,36488,36547,36606,36665,36724,37162,37197,37792,37855,37910,37968,38025,38075,38136,38193,38227,38262,38440,39721,53686,172570,172771,172947,173331,173526,200039,200106,261734,280202,282267,284423,284800"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
- "from": {
- "startLines": "23,19,20,21,22,18",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "998,788,840,892,945,730",
- "endColumns": "49,50,50,51,51,56",
- "endOffsets": "1043,834,886,939,992,782"
- },
- "to": {
- "startLines": "212,269,270,271,272,319",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "10980,14850,14901,14952,15004,18069",
- "endColumns": "49,50,50,51,51,56",
- "endOffsets": "11025,14896,14947,14999,15051,18121"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "18,145,146,95,99,98,96,97,30,31,32,142,143,154,153,27,37,105,106,104,103,102,118,117,116,108,51,49,85,40,41,110,52,101,144,94,147,148,90,88,64,63,60,53,69,74,54,84,83,82,78,77,75,76,79,62,80,66,70,93,81,67,89,91,59,58,73,72,71,87,57,86,55,56,61,92,68,23,24,26,25,28,39,29,45,48,44,46,43,42,36,35,125,124,128,141,133,132,134,135,137,136,126,127,131,129,130,123,138,139,65,152,150,149,151,38,107,115,120,119,122,114,113,112,111,33,34",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "841,9360,9417,5440,5800,5703,5537,5633,1668,1712,1765,9190,9240,9863,9811,1520,2130,6260,6355,6188,6103,6019,7234,7150,7047,6533,2897,2813,4813,2337,2391,6614,2960,5916,9304,5368,9474,9531,5115,5001,3618,3561,3391,3020,3871,4177,3079,4741,4679,4621,4395,4342,4237,4291,4446,3505,4497,3723,3919,5301,4558,3769,5051,5171,3341,3293,4121,4032,3973,4938,3242,4892,3137,3181,3449,5233,3821,1254,1317,1443,1368,1569,2281,1620,2606,2759,2558,2662,2501,2452,2074,2020,7697,7629,7941,9093,8310,8228,8385,8475,8719,8639,7782,7858,8168,8006,8087,7573,8864,8987,3677,9769,9640,9582,9694,2215,6464,6960,7371,7301,7478,6900,6844,6781,6720,1818,1929",
- "endLines": "22,145,146,95,99,98,96,97,30,31,32,142,143,154,153,27,37,105,106,104,103,102,118,117,116,108,51,49,85,40,41,110,52,101,144,94,147,148,90,88,64,63,60,53,69,74,54,84,83,82,78,77,75,76,79,62,80,66,70,93,81,67,89,91,59,58,73,72,71,87,57,86,55,56,61,92,68,23,24,26,25,28,39,29,45,48,44,46,43,42,36,35,125,124,128,141,133,132,134,135,137,136,126,127,131,129,130,123,138,139,65,152,150,149,151,38,107,115,120,119,122,114,113,112,111,33,34",
- "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,49,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1248,9411,9468,5531,5878,5794,5627,5697,1706,1759,1812,9234,9298,9916,9857,1563,2209,6349,6458,6254,6182,6097,7295,7228,7144,6589,2954,2859,4886,2385,2446,6714,3014,6013,9354,5434,9525,9576,5165,5045,3671,3612,3443,3073,3913,4231,3131,4807,4735,4673,4440,4389,4285,4336,4491,3555,4552,3763,3967,5362,4615,3815,5109,5227,3385,3335,4171,4115,4026,4995,3287,4932,3175,3236,3499,5295,3865,1311,1362,1514,1437,1614,2331,1662,2656,2807,2600,2710,2552,2495,2124,2068,7776,7691,8000,9184,8379,8304,8469,8633,8858,8713,7852,7935,8222,8081,8162,7623,8981,9085,3717,9805,9688,9634,9763,2275,6527,7041,7446,7365,7567,6954,6894,6838,6775,1923,2014"
- },
- "to": {
- "startLines": "669,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "39726,42876,42932,43041,43137,43220,43316,43411,43480,43523,43575,44061,44359,44613,44671,44722,44770,45062,45156,45264,45773,45857,45940,46006,46089,46664,46725,46787,46838,46916,46969,47029,47134,47193,47448,47503,47574,47630,47680,47735,47784,47842,47898,47955,48013,48060,48119,48176,48247,48308,48365,48415,48467,48520,48570,48620,48675,48735,48780,48833,48899,48961,49012,49075,49136,49185,49232,49287,49375,49433,49495,49545,49590,49633,49693,49748,49815,49945,50007,50057,50133,50207,50257,50312,50359,50414,50467,50514,50567,50623,50671,50726,51635,51719,51786,51850,51946,52020,52101,52190,52353,52497,52576,52651,52733,52792,52872,52952,53007,53129,53232,53277,53318,53371,53481,53555,53691,53759,53845,53925,53994,54088,54147,54202,54264,54324,54434",
- "endLines": "673,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
- "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,49,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "40113,42927,42983,43132,43215,43311,43406,43475,43518,43570,43622,44105,44417,44666,44717,44765,44849,45151,45259,45330,45852,45935,46001,46084,46186,46720,46782,46833,46911,46964,47024,47129,47188,47290,47498,47569,47625,47675,47730,47779,47837,47893,47950,48008,48055,48114,48171,48242,48303,48360,48410,48462,48515,48565,48615,48670,48730,48775,48828,48894,48956,49007,49070,49131,49180,49227,49282,49370,49428,49490,49540,49585,49628,49688,49743,49810,49859,50002,50052,50128,50202,50252,50307,50354,50409,50462,50509,50562,50618,50666,50721,50774,51714,51781,51845,51941,52015,52096,52185,52348,52492,52571,52646,52728,52787,52867,52947,53002,53124,53227,53272,53313,53366,53423,53550,53615,53754,53840,53920,53989,54083,54142,54197,54259,54319,54429,54519"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
- },
- "to": {
- "startLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,895,903,904,908,912,923,928,934,941,945,949,954,958,962,966,970,974,978,984,988,994,998,1004,1008,1013,1017,1020,1024,1030,1034,1040,1044,1050,1053,1057,1061,1065,1069,1073,1074,1075,1076,1079,1082,1085,1088,1092,1093,1094,1095,1096,1099,1101,1103,1105,1110,1111,1115,1121,1125,1126,1128,1139,1140,1144,1150,1154,1208,1209,1213,1240,1244,1245,1249,1499,1667,1693,1862,1888,1919,1927,1933,1947,1969,1974,1979,1989,1998,2007,2011,2018,2026,2033,2034,2043,2046,2049,2053,2057,2061,2064,2065,2069,2073,2083,2088,2095,2101,2102,2105,2109,2114,2116,2118,2121,2124,2126,2130,2133,2140,2143,2146,2150,2152,2156,2158,2160,2162,2166,2174,2182,2194,2200,2209,2212,2223,2226,2231,2232,2378,2436,2499,2500,2510,2519,2526,2528,2532,2535,2538,2541,2544,2547,2550,2553,2557,2560,2563,2566,2570,2573,2577,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2601,2603,2605,2606,2607,2608,2609,2610,2611,2612,2614,2615,2617,2618,2620,2622,2623,2625,2626,2627,2628,2629,2630,2632,2633,2634,2635,2636,2791,2793,2795,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2839,2840,2841,2842,2843,2844,2846,2850,2926,2927,2928,2929,2930,2931,2932,2965,2967,2969,2971,2973,2975,2976,2977,2978,2980,2982,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2995,2998,2999,3000,3001,3003,3005,3006,3008,3009,3011,3013,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3028,3029,3030,3031,3033,3034,3035,3036,3037,3039,3041,3043,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3345,3428,3431,3434,3437,3451,3462,3472,3499,3506,3538,3568,3595,3604,3641,4042,4135,4264,4421,4457,4463,4477,4500,4641,4662,4668,4672,4708,4747,4759,4786,4791,4881,4916,4981,5000,5026",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "2364,2695,2793,9728,9815,9870,9929,10053,10134,10195,10270,10346,10423,10661,10746,10828,10904,11030,11107,11185,11291,11397,11476,11556,11613,12827,12901,12976,13041,14449,14509,14570,14642,14715,14782,15056,15115,15174,15233,15292,15351,15405,15459,15512,15566,15620,15674,16619,16693,16772,16845,16919,16990,17062,17134,17207,17264,17322,17395,17469,17543,17618,17690,17763,17833,17948,18008,19495,19564,19633,19703,19777,19853,19917,19994,20070,20147,20212,20281,20358,20433,20502,20570,20647,20713,20774,20871,20936,21005,21104,21175,21234,21292,21349,21408,21472,21543,21615,21687,21759,21831,21898,21966,22034,22093,22156,22220,22310,22401,22461,22527,22594,22660,22730,22794,22847,22960,23018,23081,23146,23211,23286,23359,23431,23480,23541,23602,23663,23725,23789,23853,23917,23982,24045,24105,24166,24232,24291,24351,24413,24484,24544,28289,28375,28760,28850,28937,29025,29107,29190,29280,34153,34205,34263,34308,34374,34438,34495,34552,36729,36786,36834,36883,37032,37365,37412,37696,38711,38791,38855,39045,39105,40118,40192,40262,40340,40394,40464,40549,40597,40643,40714,40792,40870,40942,41016,41090,41164,41244,41317,41386,41458,41535,41596,41659,41725,41789,41860,41923,41988,42052,42113,42174,42226,42299,42373,42442,42517,42591,42665,42806,53428,54524,54602,54692,54780,54876,55837,56419,56508,56755,57036,57702,57987,58380,58857,59079,59301,59577,59804,60034,60264,60494,60724,60951,61370,61596,62021,62251,62679,62898,63181,63389,63520,63747,64173,64398,64825,65046,65471,65591,65867,66168,66492,66783,67097,67234,67365,67470,67712,67879,68083,68291,68562,68674,68786,68891,69008,69222,69368,69508,69594,69942,70030,70276,70694,70943,71025,71123,71740,71840,72092,72516,72771,76598,76687,76924,78976,79218,79320,79573,97974,108695,110211,121031,122559,124316,124942,125362,126423,127688,127944,128180,128727,129221,129826,130024,130604,131168,131543,131661,132199,132356,132552,132825,133081,133251,133392,133456,133738,134024,134700,134964,135302,135655,135749,135935,136241,136503,136628,136755,136994,137205,137324,137517,137694,138149,138330,138452,138711,138824,139011,139113,139220,139349,139624,140132,140628,141505,141799,142369,142518,143250,143422,143758,143850,152575,156919,161750,161812,162442,163056,163489,163602,163831,163991,164143,164314,164480,164649,164816,164979,165222,165392,165565,165736,166010,166209,166414,166744,166828,166924,167020,167118,167218,167320,167422,167524,167626,167728,167828,167924,168036,168165,168288,168419,168550,168648,168762,168856,168996,169130,169226,169338,169438,169554,169650,169762,169862,170002,170138,170302,170432,170590,170740,170881,171025,171160,171272,171422,171550,171678,171814,171946,172076,172206,172318,181044,181190,181334,182818,182884,182974,183050,183154,183244,183346,183454,183562,183662,183742,183834,183932,184042,184120,184226,184318,184422,184532,184654,184817,189699,189779,189879,189969,190079,190173,190279,192402,192502,192614,192728,192844,192960,193054,193168,193280,193382,193502,193624,193706,193810,193930,194056,194154,194248,194336,194448,194564,194686,194798,194973,195089,195175,195267,195379,195503,195570,195696,195764,195892,196036,196164,196233,196328,196443,196556,196655,196764,196875,196986,197087,197192,197292,197422,197513,197636,197730,197842,197928,198032,198128,198216,198334,198438,198542,198668,198756,198864,198964,199054,199164,199248,199350,199434,199488,199552,199658,199768,199852,217360,222504,222622,222737,222869,223584,224276,224793,226440,226825,228473,230072,231605,231993,234300,255252,261739,275053,284913,286926,287188,289518,290348,297130,298831,299125,299348,301417,303802,304450,306083,306353,312133,314782,318591,319806,321215",
- "endLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,902,903,907,911,915,927,933,940,944,948,953,957,961,965,969,973,977,983,987,993,997,1003,1007,1012,1016,1019,1023,1029,1033,1039,1043,1049,1052,1056,1060,1064,1068,1072,1073,1074,1075,1078,1081,1084,1087,1091,1092,1093,1094,1095,1098,1100,1102,1104,1109,1110,1114,1120,1124,1125,1127,1138,1139,1143,1149,1153,1154,1208,1212,1239,1243,1244,1248,1276,1666,1692,1861,1887,1918,1926,1932,1946,1968,1973,1978,1988,1997,2006,2010,2017,2025,2032,2033,2042,2045,2048,2052,2056,2060,2063,2064,2068,2072,2082,2087,2094,2100,2101,2104,2108,2113,2115,2117,2120,2123,2125,2129,2132,2139,2142,2145,2149,2151,2155,2157,2159,2161,2165,2173,2181,2193,2199,2208,2211,2222,2225,2230,2231,2236,2435,2494,2499,2509,2518,2519,2527,2531,2534,2537,2540,2543,2546,2549,2552,2556,2559,2562,2565,2569,2572,2576,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2602,2604,2605,2606,2607,2608,2609,2610,2611,2613,2614,2616,2617,2619,2621,2622,2624,2625,2626,2627,2628,2629,2631,2632,2633,2634,2635,2636,2792,2794,2796,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2838,2839,2840,2841,2842,2843,2845,2849,2853,2926,2927,2928,2929,2930,2931,2932,2966,2968,2970,2972,2974,2975,2976,2977,2979,2981,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2997,2998,2999,3000,3002,3004,3005,3007,3008,3010,3012,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3027,3028,3029,3030,3032,3033,3034,3035,3036,3038,3040,3042,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3427,3430,3433,3436,3450,3461,3471,3498,3505,3516,3567,3594,3603,3640,4021,4046,4160,4281,4456,4462,4468,4499,4640,4660,4667,4671,4677,4744,4758,4785,4790,4856,4895,4980,4999,5025,5034",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "2414,2735,2837,9764,9865,9924,9986,10129,10190,10265,10341,10418,10496,10741,10823,10899,10975,11102,11180,11286,11392,11471,11551,11608,11666,12896,12971,13036,13102,14504,14565,14637,14710,14777,14845,15110,15169,15228,15287,15346,15400,15454,15507,15561,15615,15669,15723,16688,16767,16840,16914,16985,17057,17129,17202,17259,17317,17390,17464,17538,17613,17685,17758,17828,17899,18003,18064,19559,19628,19698,19772,19848,19912,19989,20065,20142,20207,20276,20353,20428,20497,20565,20642,20708,20769,20866,20931,21000,21099,21170,21229,21287,21344,21403,21467,21538,21610,21682,21754,21826,21893,21961,22029,22088,22151,22215,22305,22396,22456,22522,22589,22655,22725,22789,22842,22955,23013,23076,23141,23206,23281,23354,23426,23475,23536,23597,23658,23720,23784,23848,23912,23977,24040,24100,24161,24227,24286,24346,24408,24479,24539,24607,28370,28457,28845,28932,29020,29102,29185,29275,29366,34200,34258,34303,34369,34433,34490,34547,34601,36781,36829,36878,36929,37061,37407,37456,37737,38738,38850,38912,39100,39157,40187,40257,40335,40389,40459,40544,40592,40638,40709,40787,40865,40937,41011,41085,41159,41239,41312,41381,41453,41530,41591,41654,41720,41784,41855,41918,41983,42047,42108,42169,42221,42294,42368,42437,42512,42586,42660,42801,42871,53476,54597,54687,54775,54871,54961,56414,56503,56750,57031,57283,57982,58375,58852,59074,59296,59572,59799,60029,60259,60489,60719,60946,61365,61591,62016,62246,62674,62893,63176,63384,63515,63742,64168,64393,64820,65041,65466,65586,65862,66163,66487,66778,67092,67229,67360,67465,67707,67874,68078,68286,68557,68669,68781,68886,69003,69217,69363,69503,69589,69937,70025,70271,70689,70938,71020,71118,71735,71835,72087,72511,72766,72860,76682,76919,78971,79213,79315,79568,81752,108690,110206,121026,122554,124311,124937,125357,126418,127683,127939,128175,128722,129216,129821,130019,130599,131163,131538,131656,132194,132351,132547,132820,133076,133246,133387,133451,133733,134019,134695,134959,135297,135650,135744,135930,136236,136498,136623,136750,136989,137200,137319,137512,137689,138144,138325,138447,138706,138819,139006,139108,139215,139344,139619,140127,140623,141500,141794,142364,142513,143245,143417,143753,143845,144123,156914,161401,161807,162437,163051,163142,163597,163826,163986,164138,164309,164475,164644,164811,164974,165217,165387,165560,165731,166005,166204,166409,166739,166823,166919,167015,167113,167213,167315,167417,167519,167621,167723,167823,167919,168031,168160,168283,168414,168545,168643,168757,168851,168991,169125,169221,169333,169433,169549,169645,169757,169857,169997,170133,170297,170427,170585,170735,170876,171020,171155,171267,171417,171545,171673,171809,171941,172071,172201,172313,172453,181185,181329,181467,182879,182969,183045,183149,183239,183341,183449,183557,183657,183737,183829,183927,184037,184115,184221,184313,184417,184527,184649,184812,184969,189774,189874,189964,190074,190168,190274,190366,192497,192609,192723,192839,192955,193049,193163,193275,193377,193497,193619,193701,193805,193925,194051,194149,194243,194331,194443,194559,194681,194793,194968,195084,195170,195262,195374,195498,195565,195691,195759,195887,196031,196159,196228,196323,196438,196551,196650,196759,196870,196981,197082,197187,197287,197417,197508,197631,197725,197837,197923,198027,198123,198211,198329,198433,198537,198663,198751,198859,198959,199049,199159,199243,199345,199429,199483,199547,199653,199763,199847,199967,222499,222617,222732,222864,223579,224271,224788,226435,226820,227417,230067,231600,231988,234295,253813,255507,263126,276081,286921,287183,287539,290343,297125,298259,299120,299343,299670,303462,304445,306078,306348,310199,312729,318586,319801,321210,321684"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\656f7c140db38b557c6f895c5997c1ff\\transformed\\drawerlayout-1.1.1\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,111,159,211",
- "endLines": "2,3,4,8",
- "endColumns": "55,47,51,24",
- "endOffsets": "106,154,206,426"
- },
- "to": {
- "startLines": "46,47,429,4282",
- "startColumns": "4,4,4,4",
- "startOffsets": "2419,2475,25433,276086",
- "endLines": "46,47,429,4285",
- "endColumns": "55,47,51,24",
- "endOffsets": "2470,2518,25480,276301"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\8847e733ac2464c2340f833a9a6b91dc\\transformed\\recyclerview-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "30,31,32,33,34,35,36,2",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "1535,1594,1642,1698,1773,1849,1921,55",
- "endLines": "30,31,32,33,34,35,36,29",
- "endColumns": "58,47,55,74,75,71,65,24",
- "endOffsets": "1589,1637,1693,1768,1844,1916,1982,1530"
- },
- "to": {
- "startLines": "479,480,481,489,490,491,619,4678",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "28597,28656,28704,29371,29446,29522,37066,299675",
- "endLines": "479,480,481,489,490,491,619,4705",
- "endColumns": "58,47,55,74,75,71,65,24",
- "endOffsets": "28651,28699,28755,29441,29517,29589,37127,301150"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,109,131,134,137,140",
- "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",
- "startOffsets": "55,126,197,261,315,385,457,531,592,668,730,807,880,941,1000,1052,1134,1215,1261,1331,1410,1480,1541,1598,1666,1744,1804,1876,1956,2006,2081,2152,2211,2261,2337,2423,2498,2548,2603,2659,2721,2787,2864,2932,2991,3046,3112,3188,3246,3316,3394,3442,3511,3584,3653,3710,3758,3832,3916,3989,4037,4090,4139,4186,4235,4288,4341,4396,4441,4482,4535,4586,4637,4690,4742,4808,4898,4986,5071,5178,5276,5336,5433,5495,5549,7412,9163,9333,9505,9601",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,108,130,133,136,139,142",
- "endColumns": "70,70,63,53,69,71,73,60,75,61,76,72,60,58,51,81,80,45,69,78,69,60,56,67,77,59,71,79,49,74,70,58,49,75,85,74,49,54,55,61,65,76,67,58,54,65,75,57,69,77,47,68,72,68,56,47,73,83,72,47,52,48,46,48,52,52,54,44,40,52,50,50,52,51,65,89,87,84,106,97,59,96,61,53,12,12,12,12,12,12",
- "endOffsets": "121,192,256,310,380,452,526,587,663,725,802,875,936,995,1047,1129,1210,1256,1326,1405,1475,1536,1593,1661,1739,1799,1871,1951,2001,2076,2147,2206,2256,2332,2418,2493,2543,2598,2654,2716,2782,2859,2927,2986,3041,3107,3183,3241,3311,3389,3437,3506,3579,3648,3705,3753,3827,3911,3984,4032,4085,4134,4181,4230,4283,4336,4391,4436,4477,4530,4581,4632,4685,4737,4803,4893,4981,5066,5173,5271,5331,5428,5490,5544,7407,9158,9328,9500,9596,9690"
- },
- "to": {
- "startLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2326,2349,2520,2523,2959,2962",
- "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",
- "startOffsets": "577,648,719,783,837,907,1563,1637,1698,1774,2842,2919,2992,8131,8366,8418,8500,9769,13107,13177,13256,13326,13387,13444,13512,13590,13650,13722,13802,13852,13927,13998,14057,14107,14183,14269,14344,14394,16501,16557,18126,18192,18269,18337,18396,18451,18517,18593,18651,18721,18799,18847,18916,18989,19058,19115,19163,19237,19321,19394,19442,24726,29594,29641,42988,43908,43961,44016,44110,44151,44204,44255,44306,44854,44906,44972,45335,45423,45508,45615,45713,46191,46288,51581,148594,150457,163147,163317,192212,192308",
- "endLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2348,2370,2522,2525,2961,2964",
- "endColumns": "70,70,63,53,69,71,73,60,75,61,76,72,60,58,51,81,80,45,69,78,69,60,56,67,77,59,71,79,49,74,70,58,49,75,85,74,49,54,55,61,65,76,67,58,54,65,75,57,69,77,47,68,72,68,56,47,73,83,72,47,52,48,46,48,52,52,54,44,40,52,50,50,52,51,65,89,87,84,106,97,59,96,61,53,12,12,12,12,12,12",
- "endOffsets": "643,714,778,832,902,974,1632,1693,1769,1831,2914,2987,3048,8185,8413,8495,8576,9810,13172,13251,13321,13382,13439,13507,13585,13645,13717,13797,13847,13922,13993,14052,14102,14178,14264,14339,14389,14444,16552,16614,18187,18264,18332,18391,18446,18512,18588,18646,18716,18794,18842,18911,18984,19053,19110,19158,19232,19316,19389,19437,19490,24770,29636,29685,43036,43956,44011,44056,44146,44199,44250,44301,44354,44901,44967,45057,45418,45503,45610,45708,45768,46283,46345,51630,150452,152203,163312,163484,192303,192397"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\5829027e9bc4104ac7715c543b8358de\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,102,3,13",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,5935,116,724",
- "endLines": "2,104,12,101",
- "endColumns": "60,12,24,24",
- "endOffsets": "111,6075,719,5930"
- },
- "to": {
- "startLines": "44,3335,4164,4174",
- "startColumns": "4,4,4,4",
- "startOffsets": "2303,216795,269103,269711",
- "endLines": "44,3337,4173,4262",
- "endColumns": "60,12,24,24",
- "endOffsets": "2359,216935,269706,274917"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\30d1ee0d1e89d746174a8183792b431a\\transformed\\transition-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,95,138,185,240,285,339,391,440,501",
- "endColumns": "39,42,46,54,44,53,51,48,60,49",
- "endOffsets": "90,133,180,235,280,334,386,435,496,546"
- },
- "to": {
- "startLines": "616,624,627,628,629,647,648,649,650,651",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "36934,37322,37461,37508,37563,38445,38499,38551,38600,38661",
- "endColumns": "39,42,46,54,44,53,51,48,60,49",
- "endOffsets": "36969,37360,37503,37558,37603,38494,38546,38595,38656,38706"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "81,93,88,95,54,59,68,64,24,29,34,39,44,19,49,73,77",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "3359,3797,3641,3891,2120,2334,2716,2551,921,1110,1301,1492,1701,732,1913,2930,3118",
- "endLines": "86,93,91,95,57,62,71,66,27,32,37,42,47,22,52,75,80",
- "endColumns": "12,90,12,80,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "3633,3883,3789,3967,2326,2543,2922,2708,1102,1293,1484,1693,1905,913,2112,3110,3353"
- },
- "to": {
- "startLines": "883,889,890,894,2318,2322,2371,2375,2797,2801,2805,2809,2813,2817,2821,3338,3341",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55243,55517,55607,55757,148175,148383,152208,152415,181472,181655,181840,182025,182228,182434,182617,216940,217123",
- "endLines": "888,889,893,894,2321,2325,2374,2377,2800,2804,2808,2812,2816,2820,2824,3340,3344",
- "endColumns": "12,89,12,79,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "55512,55602,55752,55832,148378,148589,152410,152570,181650,181835,182020,182223,182429,182612,182813,217118,217355"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,345,346,347,352,353,357,363,367,368,369,370,381,382,383,387,393,397,398,399,400,430,450,496,526,546,566,612,616,620,634,675,683,693,694,695,696,697,700,701,704,707,708,711,715,720,728,736,745,753,757,765,773,781,789,797,806,815,823,832,835,837,842,844,849,853,857,858,863,864,865,866,867,868,870,871,876,877,878,879,880,881,882,884,888,892,896,900,901,902,903,904,905,906,907,908,911,915,918,922,930,937,946,950,965,973,976,985,990,1001,1009,1012,1021,1028,1029,1048,1051,1057,1060,1069,1072,1075,1078,1081,1084,1088,1091,1100,1103,1111,1116,1124,1129,1133,1134,1145,1152,1156,1160,1161,1165,1173,1177,1182,1187,55,56,57,76,82,92,96,97,98,141,149,150,158,159,160,161,167,168,169,170,171,172,173,174,175,198,217",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "100,156,216,277,332,385,443,491,540,585,638,696,756,814,860,920,973,1019,1069,1116,1174,1232,1291,1351,1413,1475,1537,1599,1661,1723,1784,1846,1908,1961,2023,2097,2160,2228,2309,2373,2439,2509,2579,2649,2719,2786,2849,2914,2980,3033,3109,3175,3262,18372,18426,18505,18583,18656,18721,18784,18850,18921,18992,19054,19123,19189,19256,19323,19379,19430,19483,19535,19589,19660,19723,19782,19844,19903,19976,20043,20103,20166,20241,20313,20384,20440,20511,20568,20625,20691,20755,20826,20883,20936,20999,21051,21109,21176,21242,21308,21389,21464,21520,21573,21634,21692,21742,21791,21840,21889,21951,22003,22048,22129,22183,22236,22290,22341,22390,22441,22502,22563,22625,22675,22716,22766,22814,22876,22927,22976,23045,23106,23162,23233,23298,23367,23418,23481,23551,23620,23690,23752,23822,23892,23967,24026,24084,24146,24191,24234,24281,24326,24377,24425,24491,24553,24616,24688,24745,24802,24862,24920,24990,25047,25197,25328,25432,25519,25676,25833,25986,26067,26145,26446,26612,26767,26869,27146,27239,27346,27689,27796,28025,28434,28666,28766,28871,28990,29613,29760,29879,30114,30529,30767,30879,31000,31133,33276,34792,38088,40227,41755,43299,46591,46837,47096,47900,49660,50110,50825,50898,50985,51070,51169,51364,51456,51629,51791,51886,52055,52298,52591,53000,53414,53874,54292,54533,54963,55398,55808,56230,56640,57097,57551,57967,58433,58615,58683,59027,59107,59463,59613,59757,59841,60206,60304,60412,60510,60620,60736,60862,60958,61335,61445,61569,61707,61817,61939,62067,62205,62367,62583,62739,62943,63027,63131,63225,63339,63451,63575,63671,63751,63940,64146,64339,64549,64981,65402,65827,66024,66972,67493,67616,68253,68474,69289,69758,69941,70537,70997,71102,72363,72513,72930,73095,73775,73934,74096,74251,74447,74614,74836,74996,75373,75532,75860,76077,76652,77002,77251,77348,78054,78492,78733,78922,79056,79247,79884,80134,80437,80652,3338,3636,3892,4389,4823,5480,5823,7362,7710,9607,9929,10060,10766,10903,11055,11257,11962,12082,13231,13798,13927,14060,14220,14395,14537,16324,18162",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,344,345,346,351,352,356,362,366,367,368,369,380,381,382,386,392,396,397,398,399,429,449,495,525,545,565,611,615,619,633,674,682,692,693,694,695,696,699,700,703,706,707,710,714,719,727,735,744,752,756,764,772,780,788,796,805,814,822,831,834,836,841,843,848,852,856,857,862,863,864,865,866,867,869,870,875,876,877,878,879,880,881,883,887,891,895,899,900,901,902,903,904,905,906,907,910,914,917,921,929,936,945,949,964,972,975,984,989,1000,1008,1011,1020,1027,1028,1047,1050,1056,1059,1068,1071,1074,1077,1080,1083,1087,1090,1099,1102,1110,1115,1123,1128,1132,1133,1144,1151,1155,1159,1160,1164,1172,1176,1181,1186,1195,55,56,75,81,91,95,96,97,140,148,149,157,158,159,160,166,167,168,169,170,171,172,173,174,197,216,217",
- "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10,297,255,90,243,367,188,1538,347,95,94,130,412,136,151,201,220,119,1148,566,128,132,159,174,141,125,457,209",
- "endOffsets": "151,211,272,327,380,438,486,535,580,633,691,751,809,855,915,968,1014,1064,1111,1169,1227,1286,1346,1408,1470,1532,1594,1656,1718,1779,1841,1903,1956,2018,2092,2155,2223,2304,2368,2434,2504,2574,2644,2714,2781,2844,2909,2975,3028,3104,3170,3257,3333,18421,18500,18578,18651,18716,18779,18845,18916,18987,19049,19118,19184,19251,19318,19374,19425,19478,19530,19584,19655,19718,19777,19839,19898,19971,20038,20098,20161,20236,20308,20379,20435,20506,20563,20620,20686,20750,20821,20878,20931,20994,21046,21104,21171,21237,21303,21384,21459,21515,21568,21629,21687,21737,21786,21835,21884,21946,21998,22043,22124,22178,22231,22285,22336,22385,22436,22497,22558,22620,22670,22711,22761,22809,22871,22922,22971,23040,23101,23157,23228,23293,23362,23413,23476,23546,23615,23685,23747,23817,23887,23962,24021,24079,24141,24186,24229,24276,24321,24372,24420,24486,24548,24611,24683,24740,24797,24857,24915,24985,25042,25192,25323,25427,25514,25671,25828,25981,26062,26140,26441,26607,26762,26864,27141,27234,27341,27684,27791,28020,28429,28661,28761,28866,28985,29608,29755,29874,30109,30524,30762,30874,30995,31128,33271,34787,38083,40222,41750,43294,46586,46832,47091,47895,49655,50105,50820,50893,50980,51065,51164,51359,51451,51624,51786,51881,52050,52293,52586,52995,53409,53869,54287,54528,54958,55393,55803,56225,56635,57092,57546,57962,58428,58610,58678,59022,59102,59458,59608,59752,59836,60201,60299,60407,60505,60615,60731,60857,60953,61330,61440,61564,61702,61812,61934,62062,62200,62362,62578,62734,62938,63022,63126,63220,63334,63446,63570,63666,63746,63935,64141,64334,64544,64976,65397,65822,66019,66967,67488,67611,68248,68469,69284,69753,69936,70532,70992,71097,72358,72508,72925,73090,73770,73929,74091,74246,74442,74609,74831,74991,75368,75527,75855,76072,76647,76997,77246,77343,78049,78487,78728,78917,79051,79242,79879,80129,80432,80647,81228,3631,3887,4384,4818,5475,5818,7357,7705,9602,9924,10055,10761,10898,11050,11252,11957,12077,13226,13793,13922,14055,14215,14390,14532,16319,18157,18367"
- },
- "to": {
- "startLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,879,1155,1156,1157,1162,1163,1167,1173,1177,1178,1179,1180,1191,1192,1193,1197,1203,1207,1277,1278,1279,1309,1329,1375,1405,1425,1445,1491,1495,2237,2251,2292,2300,2495,2496,2497,2498,2653,2656,2657,2660,2663,2664,2667,2671,2676,2684,2692,2701,2709,2713,2721,2729,2737,2745,2753,2762,2771,2779,2788,2854,2856,2861,2863,2868,2872,2876,2877,2882,2883,2884,2885,2886,2887,2889,2890,2895,2896,2897,2898,2899,2900,2901,2903,2907,2911,2915,2933,2934,2935,2936,2937,2938,2939,2940,2941,2944,2948,2951,3061,3069,3076,3085,3089,3104,3112,3115,3124,3129,3140,3148,3151,3160,3167,3168,3187,3190,3196,3199,3208,3211,3214,3217,3220,3223,3227,3230,3239,3242,3250,3255,3263,3268,3272,3273,3284,3291,3295,3299,3300,3304,3312,3316,3321,3326,3517,3518,3519,4022,4028,4038,4075,4076,4077,4120,4263,4286,4294,4295,4371,4469,4475,4476,4661,4706,4707,4745,4746,4857,4858,4896,4915",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "1331,1387,1447,1508,1936,1989,2047,2095,2650,2740,8190,8248,8308,8581,8627,8687,8740,8786,8836,8883,8941,8999,9058,9118,9180,9242,9304,9366,9428,9490,9551,9613,9675,9991,12064,12138,12201,12269,12350,12414,12480,12550,12620,12690,12760,15728,15791,15856,15922,15975,16051,16117,16204,25485,25539,25618,25696,25769,25834,25897,25963,26034,26105,26167,26236,26302,26369,26436,26492,26543,26596,26648,26702,26773,26836,26895,26957,27016,27089,27156,27216,27279,27354,27426,27497,27553,27624,27681,27738,27804,27868,27939,27996,28049,28112,28164,28222,29690,29756,29822,29903,29978,30034,30087,30148,30206,30256,30305,30354,30403,30465,30517,30562,30643,30697,30750,30804,30855,30904,30955,31016,31077,31139,31189,31230,31280,31328,31390,31441,31490,31559,31620,31676,31747,31812,31881,31932,31995,32065,32134,32204,32266,32336,32406,32481,37202,37260,37608,37653,38267,38314,38359,38743,38917,38983,39162,39225,39297,39354,39411,39471,39529,39599,43627,43777,44422,44526,46350,46507,47295,49864,50779,50857,51158,51324,51479,54966,72865,72958,73065,73408,73515,73744,74153,74385,74485,74590,74709,75332,75479,75598,75833,76248,76486,81757,81878,82011,84154,85670,88966,91105,92633,94177,97469,97715,144128,144932,146692,147142,161406,161479,161566,161651,173598,173793,173885,174058,174220,174315,174484,174727,175020,175429,175843,176303,176721,176962,177392,177827,178237,178659,179069,179526,179980,180396,180862,184974,185042,185386,185466,185822,185972,186116,186200,186565,186663,186771,186869,186979,187095,187221,187317,187694,187804,187928,188066,188176,188298,188426,188564,188726,188942,189098,190371,190455,190559,190653,190767,190879,191003,191099,191179,191368,191574,191767,200111,200543,200964,201389,201586,202534,203055,203178,203815,204036,204851,205320,205503,206099,206559,206664,207925,208075,208492,208657,209337,209496,209658,209813,210009,210176,210398,210558,210935,211094,211422,211639,212214,212564,212813,212910,213616,214054,214295,214484,214618,214809,215446,215696,215999,216214,227422,227720,227976,253818,254252,254909,257335,258874,259222,261119,274922,276306,277012,277149,282272,287544,288249,288369,298264,301155,301284,303467,303627,310204,310346,312734,314572",
- "endLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,882,1155,1156,1161,1162,1166,1172,1176,1177,1178,1179,1190,1191,1192,1196,1202,1206,1207,1277,1278,1308,1328,1374,1404,1424,1444,1490,1494,1498,2250,2291,2299,2309,2495,2496,2497,2498,2655,2656,2659,2662,2663,2666,2670,2675,2683,2691,2700,2708,2712,2720,2728,2736,2744,2752,2761,2770,2778,2787,2790,2855,2860,2862,2867,2871,2875,2876,2881,2882,2883,2884,2885,2886,2888,2889,2894,2895,2896,2897,2898,2899,2900,2902,2906,2910,2914,2918,2933,2934,2935,2936,2937,2938,2939,2940,2943,2947,2950,2954,3068,3075,3084,3088,3103,3111,3114,3123,3128,3139,3147,3150,3159,3166,3167,3186,3189,3195,3198,3207,3210,3213,3216,3219,3222,3226,3229,3238,3241,3249,3254,3262,3267,3271,3272,3283,3290,3294,3298,3299,3303,3311,3315,3320,3325,3334,3517,3518,3537,4027,4037,4041,4075,4076,4119,4127,4263,4293,4294,4295,4371,4474,4475,4476,4661,4706,4707,4745,4746,4857,4880,4914,4915",
- "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10,297,255,90,243,367,188,1538,347,95,94,130,412,136,151,201,220,119,1148,566,128,132,159,174,141,125,457,209",
- "endOffsets": "1382,1442,1503,1558,1984,2042,2090,2139,2690,2788,8243,8303,8361,8622,8682,8735,8781,8831,8878,8936,8994,9053,9113,9175,9237,9299,9361,9423,9485,9546,9608,9670,9723,10048,12133,12196,12264,12345,12409,12475,12545,12615,12685,12755,12822,15786,15851,15917,15970,16046,16112,16199,16275,25534,25613,25691,25764,25829,25892,25958,26029,26100,26162,26231,26297,26364,26431,26487,26538,26591,26643,26697,26768,26831,26890,26952,27011,27084,27151,27211,27274,27349,27421,27492,27548,27619,27676,27733,27799,27863,27934,27991,28044,28107,28159,28217,28284,29751,29817,29898,29973,30029,30082,30143,30201,30251,30300,30349,30398,30460,30512,30557,30638,30692,30745,30799,30850,30899,30950,31011,31072,31134,31184,31225,31275,31323,31385,31436,31485,31554,31615,31671,31742,31807,31876,31927,31990,32060,32129,32199,32261,32331,32401,32476,32535,37255,37317,37648,37691,38309,38354,38405,38786,38978,39040,39220,39292,39349,39406,39466,39524,39594,39651,43772,43903,44521,44608,46502,46659,47443,49940,50852,51153,51319,51474,51576,55238,72953,73060,73403,73510,73739,74148,74380,74480,74585,74704,75327,75474,75593,75828,76243,76481,76593,81873,82006,84149,85665,88961,91100,92628,94172,97464,97710,97969,144927,146687,147137,147852,161474,161561,161646,161745,173788,173880,174053,174215,174310,174479,174722,175015,175424,175838,176298,176716,176957,177387,177822,178232,178654,179064,179521,179975,180391,180857,181039,185037,185381,185461,185817,185967,186111,186195,186560,186658,186766,186864,186974,187090,187216,187312,187689,187799,187923,188061,188171,188293,188421,188559,188721,188937,189093,189297,190450,190554,190648,190762,190874,190998,191094,191174,191363,191569,191762,191972,200538,200959,201384,201581,202529,203050,203173,203810,204031,204846,205315,205498,206094,206554,206659,207920,208070,208487,208652,209332,209491,209653,209808,210004,210171,210393,210553,210930,211089,211417,211634,212209,212559,212808,212905,213611,214049,214290,214479,214613,214804,215441,215691,215994,216209,216790,227715,227971,228468,254247,254904,255247,258869,259217,261114,261436,275048,277007,277144,277296,282469,288244,288364,289513,298826,301279,301412,303622,303797,310341,312128,314567,314777"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\1bbf379c87dedbe80347cf20a1163be0\\transformed\\constraintlayout-1.1.3\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,11,12,13,14,15,19,20,21,22,25,26,29,32,33,34,35,36,39,42,43,44,45,50,53,56,57,58,63,64,65,68,71,72,75,78,81,84,85,88,91,92,97,98,103,106,109,110,111,112,113,114,115,116,117,118,127,128,129,130",
- "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",
- "startOffsets": "55,116,407,455,507,568,614,741,802,862,932,1065,1133,1262,1388,1450,1515,1583,1650,1773,1898,1965,2030,2095,2276,2397,2518,2584,2651,2861,2930,2996,3121,3247,3314,3440,3567,3692,3819,3884,4010,4133,4198,4406,4473,4653,4773,4893,4958,5020,5082,5144,5203,5263,5324,5385,5444,5819,8395,8527,11791",
- "endLines": "2,10,11,12,13,14,18,19,20,21,24,25,28,31,32,33,34,35,38,41,42,43,44,49,52,55,56,57,62,63,64,67,70,71,74,77,80,83,84,87,90,91,96,97,102,105,108,109,110,111,112,113,114,115,116,117,126,127,128,129,130",
- "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11,2575,131,3263,107",
- "endOffsets": "111,402,450,502,563,609,736,797,857,927,1060,1128,1257,1383,1445,1510,1578,1645,1768,1893,1960,2025,2090,2271,2392,2513,2579,2646,2856,2925,2991,3116,3242,3309,3435,3562,3687,3814,3879,4005,4128,4193,4401,4468,4648,4768,4888,4953,5015,5077,5139,5198,5258,5319,5380,5439,5814,8390,8522,11786,11894"
- },
- "to": {
- "startLines": "18,19,36,41,42,43,48,59,60,61,62,65,66,69,72,73,74,75,76,79,82,83,84,85,90,93,96,97,98,103,104,105,108,111,112,115,118,121,124,125,128,131,132,137,138,143,146,149,150,151,152,153,154,155,156,157,158,4161,4162,4163,4420",
- "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",
- "startOffsets": "979,1040,1888,2144,2196,2257,2523,3053,3114,3174,3244,3377,3445,3574,3700,3762,3827,3895,3962,4085,4210,4277,4342,4407,4588,4709,4830,4896,4963,5173,5242,5308,5433,5559,5626,5752,5879,6004,6131,6196,6322,6445,6510,6718,6785,6965,7085,7205,7270,7332,7394,7456,7515,7575,7636,7697,7756,263131,265707,265839,284805",
- "endLines": "18,26,36,41,42,43,51,59,60,61,64,65,68,71,72,73,74,75,78,81,82,83,84,89,92,95,96,97,102,103,104,107,110,111,114,117,120,123,124,127,130,131,136,137,142,145,148,149,150,151,152,153,154,155,156,157,166,4161,4162,4163,4420",
- "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11,2575,131,3263,107",
- "endOffsets": "1035,1326,1931,2191,2252,2298,2645,3109,3169,3239,3372,3440,3569,3695,3757,3822,3890,3957,4080,4205,4272,4337,4402,4583,4704,4825,4891,4958,5168,5237,5303,5428,5554,5621,5747,5874,5999,6126,6191,6317,6440,6505,6713,6780,6960,7080,7200,7265,7327,7389,7451,7510,7570,7631,7692,7751,8126,265702,265834,269098,284908"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
- "from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
- },
- "to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "150,457",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "452,572"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,3,4,5,6,35,36,37,38,45,47,50,7",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,107,168,230,292,2179,2238,2295,2349,2763,2827,2953,356",
- "endLines": "2,3,4,5,6,35,36,37,44,46,49,52,34",
- "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
- "endOffsets": "102,163,225,287,351,2233,2290,2344,2758,2822,2948,3076,2174"
- },
- "to": {
- "startLines": "35,221,222,223,224,419,420,421,916,2310,2312,2315,4047",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "1836,11671,11732,11794,11856,24775,24834,24891,57288,147857,147921,148047,255512",
- "endLines": "35,221,222,223,224,419,420,421,922,2311,2314,2317,4074",
- "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
- "endOffsets": "1883,11727,11789,11851,11915,24829,24886,24940,57697,147916,148042,148170,257330"
+ "startOffsets": "2945",
+ "endColumns": "100",
+ "endOffsets": "3041"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\themes.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr\\values-fr.xml",
"from": {
- "startLines": "2,4,11",
- "startColumns": "4,4,4",
- "startOffsets": "19,93,428",
- "endLines": "2,9,14",
- "endColumns": "70,12,12",
- "endOffsets": "85,420,661"
- },
- "to": {
- "startLines": "2919,2920,2955",
- "startColumns": "4,4,4",
- "startOffsets": "189302,189372,191977",
- "endLines": "2919,2925,2958",
- "endColumns": "69,12,12",
- "endOffsets": "189367,189694,192207"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
+ "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
+ "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v18_values-v18.arsc.flat",
+ "map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\attrs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v18\\values-v18.xml",
"from": {
- "startLines": "1",
- "startColumns": "4",
- "startOffsets": "17",
- "endLines": "4",
- "endColumns": "24",
- "endOffsets": "211"
- },
- "to": {
- "startLines": "4372",
+ "startLines": "2",
"startColumns": "4",
- "startOffsets": "282474",
- "endLines": "4375",
- "endColumns": "24",
- "endOffsets": "282663"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,5,6,7,8,10,11,12,13,14",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,288,341,394,447,560,626,748,809,875",
- "endColumns": "88,52,52,52,52,65,121,60,65,66",
- "endOffsets": "139,336,389,442,495,621,743,804,870,937"
- },
- "to": {
- "startLines": "295,560,561,562,563,2642,2644,2645,2650,2652",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "16412,33679,33732,33785,33838,172776,172952,173074,173336,173531",
- "endColumns": "88,52,52,52,52,65,121,60,65,66",
- "endOffsets": "16496,33727,33780,33833,33886,172837,173069,173130,173397,173593"
+ "startOffsets": "55",
+ "endColumns": "48",
+ "endOffsets": "99"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hi_values-hi.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hi\\values-hi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ro\\values-ro.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
- "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
- "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
+ "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870",
+ "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82",
+ "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hi\\values-hi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ro\\values-ro.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3629,18 +3493,18 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2892",
+ "startOffsets": "2953",
"endColumns": "100",
- "endOffsets": "2988"
+ "endOffsets": "3049"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rIN_values-en-rIN.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rIN\\values-en-rIN.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3651,59 +3515,86 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2926",
+ "startOffsets": "2846",
"endColumns": "100",
- "endOffsets": "3022"
+ "endOffsets": "2942"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837",
- "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88",
- "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921"
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-v22_values-v22.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-sv_values-sv.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v22\\values-v22.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sv\\values-sv.xml",
"from": {
- "startLines": "2,3,4,9",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,130,217,553",
- "endLines": "2,3,8,13",
- "endColumns": "74,86,12,12",
- "endOffsets": "125,212,548,896"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
+ "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
+ "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sv\\values-sv.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2863",
+ "endColumns": "100",
+ "endOffsets": "2959"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ldltr-v21_values-ldltr-v21.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-watch-v21_values-watch-v21.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "112",
- "endOffsets": "163"
+ "startLines": "2,6,10",
+ "startColumns": "4,4,4",
+ "startOffsets": "55,271,499",
+ "endLines": "5,9,13",
+ "endColumns": "12,12,12",
+ "endOffsets": "266,494,724"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kk\\values-kk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ur\\values-ur.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824",
+ "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79",
+ "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ur\\values-ur.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3714,28 +3605,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2893",
+ "startOffsets": "2904",
"endColumns": "100",
- "endOffsets": "2989"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kk\\values-kk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
- "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
- "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
+ "endOffsets": "3000"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ne_values-ne.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ne\\values-ne.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-et\\values-et.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860",
+ "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81",
+ "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-et\\values-et.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3746,38 +3637,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2988",
+ "startOffsets": "2942",
"endColumns": "100",
- "endOffsets": "3084"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ne\\values-ne.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,210,314,422,513,620,747,841,931,1022,1115,1211,1305,1406,1499,1594,1688,1779,1870,1958,2068,2184,2287,2402,2504,2619,2790,2902",
- "endColumns": "104,103,107,90,106,126,93,89,90,92,95,93,100,92,94,93,90,90,87,109,115,102,114,101,114,170,111,85",
- "endOffsets": "205,309,417,508,615,742,836,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1953,2063,2179,2282,2397,2499,2614,2785,2897,2983"
+ "endOffsets": "3038"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-b+sr+Latn_values-b+sr+Latn.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
- "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
- "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
+ "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874",
+ "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79",
+ "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3788,28 +3669,52 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2912",
+ "startOffsets": "2954",
"endColumns": "100",
- "endOffsets": "3008"
+ "endOffsets": "3050"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-pt-rBR_values-pt-rBR.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zu\\values-zu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,169,226,273,314,374,438,512,614,710,817,883,1000,1068",
+ "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
+ "endOffsets": "109,164,221,268,309,369,433,507,609,705,812,878,995,1063,1117"
+ },
+ "to": {
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2844,2903,2958,3015,3062,3103,3163,3227,3301,3403,3499,3606,3672,3789,3857",
+ "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
+ "endOffsets": "2898,2953,3010,3057,3098,3158,3222,3296,3398,3494,3601,3667,3784,3852,3906"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817",
- "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80",
- "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893"
+ "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,2844",
+ "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,2924"
+ },
+ "to": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,44",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,746,829,909,1000,1093,1189,1283,1384,1477,1572,1667,1758,1849,1936,2043,2155,2257,2365,2472,2582,2744,3911",
+ "endColumns": "119,105,106,88,100,117,82,79,90,92,95,93,100,92,94,94,90,90,86,106,111,101,107,106,109,161,99,84",
+ "endOffsets": "220,326,433,522,623,741,824,904,995,1088,1184,1278,1379,1472,1567,1662,1753,1844,1931,2038,2150,2252,2360,2467,2577,2739,2839,3991"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zu\\values-zu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3818,45 +3723,52 @@
"endOffsets": "151"
},
"to": {
- "startLines": "30",
+ "startLines": "45",
"startColumns": "4",
- "startOffsets": "2898",
+ "startOffsets": "3996",
"endColumns": "100",
- "endOffsets": "2994"
+ "endOffsets": "4092"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-h720dp-v13_values-h720dp-v13.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-hr_values-hr.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
- "endColumns": "66",
- "endOffsets": "117"
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2926",
+ "endColumns": "100",
+ "endOffsets": "3022"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ro_values-ro.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,226,330,443,531,643,764,849,930,1021,1114,1210,1304,1404,1497,1592,1687,1778,1870,1953,2065,2178,2278,2392,2497,2603,2767,2870",
- "endColumns": "120,103,112,87,111,120,84,80,90,92,95,93,99,92,94,94,90,91,82,111,112,99,113,104,105,163,102,82",
- "endOffsets": "221,325,438,526,638,759,844,925,1016,1109,1205,1299,1399,1492,1587,1682,1773,1865,1948,2060,2173,2273,2387,2492,2598,2762,2865,2948"
+ "startOffsets": "105,210,307,417,503,607,726,810,893,984,1077,1173,1267,1368,1461,1556,1655,1746,1837,1923,2027,2140,2246,2351,2464,2571,2740,2837",
+ "endColumns": "104,96,109,85,103,118,83,82,90,92,95,93,100,92,94,98,90,90,85,103,112,105,104,112,106,168,96,88",
+ "endOffsets": "205,302,412,498,602,721,805,888,979,1072,1168,1262,1363,1456,1551,1650,1741,1832,1918,2022,2135,2241,2346,2459,2566,2735,2832,2921"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-bg_values-bg.arsc.flat",
+ "map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bg\\values-bg.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3867,43 +3779,38 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2953",
+ "startOffsets": "2930",
"endColumns": "100",
- "endOffsets": "3049"
+ "endOffsets": "3026"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-xlarge-v4_values-xlarge-v4.arsc.flat",
- "map": [
+ },
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bg\\values-bg.xml",
"from": {
- "startLines": "2,3,4,5,6,7",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "55,126,197,267,337,405",
- "endColumns": "70,70,69,69,67,67",
- "endOffsets": "121,192,262,332,400,468"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,220,327,432,518,623,744,823,901,992,1085,1181,1275,1376,1469,1564,1672,1763,1854,1937,2051,2160,2260,2374,2480,2588,2748,2847",
+ "endColumns": "114,106,104,85,104,120,78,77,90,92,95,93,100,92,94,107,90,90,82,113,108,99,113,105,107,159,98,82",
+ "endOffsets": "215,322,427,513,618,739,818,896,987,1080,1176,1270,1371,1464,1559,1667,1758,1849,1932,2046,2155,2255,2369,2475,2583,2743,2842,2925"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ur_values-ur.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-as_values-as.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ur\\values-ur.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,215,321,430,516,620,740,816,892,984,1078,1174,1268,1370,1464,1560,1654,1746,1838,1923,2031,2140,2242,2353,2453,2561,2726,2824",
- "endColumns": "109,105,108,85,103,119,75,75,91,93,95,93,101,93,95,93,91,91,84,107,108,101,110,99,107,164,97,79",
- "endOffsets": "210,316,425,511,615,735,811,887,979,1073,1169,1263,1365,1459,1555,1649,1741,1833,1918,2026,2135,2237,2348,2448,2556,2721,2819,2899"
+ "startOffsets": "105,213,312,419,515,617,736,816,896,987,1080,1173,1268,1368,1461,1558,1652,1743,1834,1923,2025,2140,2243,2352,2471,2591,2758,2861",
+ "endColumns": "107,98,106,95,101,118,79,79,90,92,92,94,99,92,96,93,90,90,88,101,114,102,108,118,119,166,102,88",
+ "endOffsets": "208,307,414,510,612,731,811,891,982,1075,1168,1263,1363,1456,1553,1647,1738,1829,1918,2020,2135,2238,2347,2466,2586,2753,2856,2945"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ur\\values-ur.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3914,28 +3821,28 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2904",
+ "startOffsets": "2950",
"endColumns": "100",
- "endOffsets": "3000"
+ "endOffsets": "3046"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-et_values-et.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-kk_values-kk.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-et\\values-et.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,222,329,440,526,628,745,825,903,995,1089,1194,1296,1406,1500,1601,1695,1787,1880,1963,2074,2179,2278,2388,2489,2592,2758,2860",
- "endColumns": "116,106,110,85,101,116,79,77,91,93,104,101,109,93,100,93,91,92,82,110,104,98,109,100,102,165,101,81",
- "endOffsets": "217,324,435,521,623,740,820,898,990,1084,1189,1291,1401,1495,1596,1690,1782,1875,1958,2069,2174,2273,2383,2484,2587,2753,2855,2937"
+ "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
+ "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
+ "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-et\\values-et.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3946,28 +3853,60 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2942",
+ "startOffsets": "2893",
"endColumns": "100",
- "endOffsets": "3038"
+ "endOffsets": "2989"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-en-rCA_values-en-rCA.arsc.flat",
+ "map": [
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "30",
+ "startColumns": "4",
+ "startOffsets": "2846",
+ "endColumns": "100",
+ "endOffsets": "2942"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-ta_values-ta.arsc.flat",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zu_values-zu.arsc.flat",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
- "startOffsets": "105,219,317,432,521,628,754,832,909,1009,1114,1210,1305,1412,1514,1618,1713,1815,1913,1995,2097,2201,2298,2408,2510,2617,2774,2874",
- "endColumns": "113,97,114,88,106,125,77,76,99,104,95,94,106,101,103,94,101,97,81,101,103,96,109,101,106,156,99,79",
- "endOffsets": "214,312,427,516,623,749,827,904,1004,1109,1205,1300,1407,1509,1613,1708,1810,1908,1990,2092,2196,2293,2403,2505,2612,2769,2869,2949"
+ "startOffsets": "105,213,320,434,522,625,752,832,912,1003,1096,1190,1284,1385,1478,1573,1667,1758,1851,1937,2041,2147,2245,2352,2458,2564,2721,2817",
+ "endColumns": "107,106,113,87,102,126,79,79,90,92,93,93,100,92,94,93,90,92,85,103,105,97,106,105,105,156,95,80",
+ "endOffsets": "208,315,429,517,620,747,827,907,998,1091,1185,1279,1380,1473,1568,1662,1753,1846,1932,2036,2142,2240,2347,2453,2559,2716,2812,2893"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -3978,9 +3917,9 @@
"to": {
"startLines": "30",
"startColumns": "4",
- "startOffsets": "2954",
+ "startOffsets": "2898",
"endColumns": "100",
- "endOffsets": "3050"
+ "endOffsets": "2994"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
index 1eaf20d8..faff2306 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-af\\values-af.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-af\\values-af.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-af\\values-af.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-af\\values-af.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
index e5e2def5..29049d26 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-am\\values-am.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-am\\values-am.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-am\\values-am.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-am\\values-am.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
index 3530f574..2670202b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
@@ -1,27 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ar\\values-ar.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ar\\values-ar.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "45",
- "startColumns": "4",
- "startOffsets": "3839",
- "endColumns": "100",
- "endOffsets": "3935"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ar\\values-ar.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -38,7 +21,24 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ar\\values-ar.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ar\\values-ar.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "45",
+ "startColumns": "4",
+ "startOffsets": "3839",
+ "endColumns": "100",
+ "endOffsets": "3935"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ar\\values-ar.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
index f7416876..f63f82bc 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-as\\values-as.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-as\\values-as.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-as\\values-as.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
index b674ae4f..b4fad357 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-az\\values-az.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-az\\values-az.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-az\\values-az.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-az\\values-az.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-az\\values-az.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
index 5fc52d3a..43884859 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
- "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
- "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "3008"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,318,424,510,614,732,814,895,986,1079,1175,1269,1370,1463,1558,1663,1754,1845,1933,2039,2147,2248,2353,2461,2562,2731,2828",
+ "endColumns": "108,103,105,85,103,117,81,80,90,92,95,93,100,92,94,104,90,90,87,105,107,100,104,107,100,168,96,83",
+ "endOffsets": "209,313,419,505,609,727,809,890,981,1074,1170,1264,1365,1458,1553,1658,1749,1840,1928,2034,2142,2243,2348,2456,2557,2726,2823,2907"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
index fb41bd28..1ec982da 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-be\\values-be.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-be\\values-be.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-be\\values-be.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-be\\values-be.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
index 967dfcbf..ca3f97e6 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bg\\values-bg.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bg\\values-bg.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bg\\values-bg.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bg\\values-bg.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bg\\values-bg.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
index c67dee9c..02bdbade 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bn\\values-bn.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bn\\values-bn.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bn\\values-bn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bn\\values-bn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
index 7f58d74f..e3ba3176 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-bs\\values-bs.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-bs\\values-bs.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bs\\values-bs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-bs\\values-bs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
index 1211c218..a8155c18 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ca\\values-ca.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -38,7 +38,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ca\\values-ca.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ca\\values-ca.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
index a2170f6b..aeb338b9 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-cs\\values-cs.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-cs\\values-cs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-cs\\values-cs.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
index 6bcc4250..2ec7cedd 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-da\\values-da.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-da\\values-da.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-da\\values-da.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-da\\values-da.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-da\\values-da.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
index 4f9e5b8f..d1d0f0fe 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-de\\values-de.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-de\\values-de.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -21,24 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-de\\values-de.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "45",
- "startColumns": "4",
- "startOffsets": "3927",
- "endColumns": "100",
- "endOffsets": "4023"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-de\\values-de.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-de\\values-de.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -53,6 +36,23 @@
"endColumns": "54,56,58,46,40,51,59,70,88,81,104,60,105,62,53",
"endOffsets": "2893,2950,3009,3056,3097,3149,3209,3280,3369,3451,3556,3617,3723,3786,3840"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-de\\values-de.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "45",
+ "startColumns": "4",
+ "startOffsets": "3927",
+ "endColumns": "100",
+ "endOffsets": "4023"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
index dc86b882..0ff2c27c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-el\\values-el.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-el\\values-el.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-el\\values-el.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-el\\values-el.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-el\\values-el.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
index fdb004d7..310afe0c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rAU\\values-en-rAU.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rAU\\values-en-rAU.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rAU\\values-en-rAU.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
index 3e9f2907..45b80707 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rCA\\values-en-rCA.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rCA\\values-en-rCA.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "2942"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rCA\\values-en-rCA.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
index 49009ba5..2c46713c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rGB\\values-en-rGB.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rGB\\values-en-rGB.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2942"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rGB\\values-en-rGB.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
index c0c4a0e5..11bc29e1 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rIN\\values-en-rIN.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
- "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
- "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rIN\\values-en-rIN.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "2942"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rIN\\values-en-rIN.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,309,417,501,601,716,793,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1890,1993,2097,2196,2301,2404,2508,2664,2764",
+ "endColumns": "103,99,107,83,99,114,76,75,90,92,95,93,100,92,94,93,90,90,81,102,103,98,104,102,103,155,99,81",
+ "endOffsets": "204,304,412,496,596,711,788,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1885,1988,2092,2191,2296,2399,2503,2659,2759,2841"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
index 6cddf4ff..860cdb65 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-en-rXC\\values-en-rXC.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
+ "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
+ "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-en-rXC\\values-en-rXC.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "203",
"endOffsets": "5881"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-en-rXC\\values-en-rXC.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,310,510,719,904,1106,1321,1494,1671,1862,2055,2253,2449,2652,2847,3044,3239,3432,3623,3807,4011,4216,4417,4624,4826,5031,5303,5503",
- "endColumns": "204,199,208,184,201,214,172,176,190,192,197,195,202,194,196,194,192,190,183,203,204,200,206,201,204,271,199,178",
- "endOffsets": "305,505,714,899,1101,1316,1489,1666,1857,2050,2248,2444,2647,2842,3039,3234,3427,3618,3802,4006,4211,4412,4619,4821,5026,5298,5498,5677"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
index aba66693..78f7869a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es-rUS\\values-es-rUS.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
- "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
- "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es-rUS\\values-es-rUS.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "3016"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es-rUS\\values-es-rUS.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,334,442,527,628,751,836,918,1009,1102,1198,1292,1392,1485,1584,1680,1771,1862,1944,2056,2156,2257,2365,2472,2579,2738,2838",
+ "endColumns": "119,108,107,84,100,122,84,81,90,92,95,93,99,92,98,95,90,90,81,111,99,100,107,106,106,158,99,81",
+ "endOffsets": "220,329,437,522,623,746,831,913,1004,1097,1193,1287,1387,1480,1579,1675,1766,1857,1939,2051,2151,2252,2360,2467,2574,2733,2833,2915"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
index 0ed217be..809b5ba8 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-es\\values-es.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -38,7 +38,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-es\\values-es.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-es\\values-es.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
index b8e60c68..4de20d44 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-et\\values-et.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-et\\values-et.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-et\\values-et.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-et\\values-et.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-et\\values-et.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
index 7b06ffac..df2d16be 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-eu\\values-eu.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-eu\\values-eu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-eu\\values-eu.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
+ "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
+ "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-eu\\values-eu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "3034"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-eu\\values-eu.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,214,312,422,508,614,738,825,909,1001,1095,1192,1286,1388,1482,1578,1675,1767,1860,1942,2051,2161,2260,2369,2475,2586,2757,2856",
- "endColumns": "108,97,109,85,105,123,86,83,91,93,96,93,101,93,95,96,91,92,81,108,109,98,108,105,110,170,98,81",
- "endOffsets": "209,307,417,503,609,733,820,904,996,1090,1187,1281,1383,1477,1573,1670,1762,1855,1937,2046,2156,2255,2364,2470,2581,2752,2851,2933"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
index 29b1d26d..c898a766 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fa\\values-fa.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fa\\values-fa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fa\\values-fa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fa\\values-fa.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
index d9c85147..7e801dc0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fi\\values-fi.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fi\\values-fi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fi\\values-fi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
index 62a394c1..4a4625ea 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr-rCA\\values-fr-rCA.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
+ "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
+ "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "3061"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,331,442,529,645,775,858,938,1029,1122,1221,1316,1417,1510,1603,1698,1789,1880,1976,2086,2198,2301,2412,2519,2621,2780,2879",
- "endColumns": "110,114,110,86,115,129,82,79,90,92,98,94,100,92,92,94,90,90,95,109,111,102,110,106,101,158,98,85",
- "endOffsets": "211,326,437,524,640,770,853,933,1024,1117,1216,1311,1412,1505,1598,1693,1784,1875,1971,2081,2193,2296,2407,2514,2616,2775,2874,2960"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
index effc6a62..4c626a76 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-fr\\values-fr.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr\\values-fr.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
- "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
- "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr\\values-fr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-fr\\values-fr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "3041"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-fr\\values-fr.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,216,331,442,524,630,760,843,923,1014,1107,1206,1301,1402,1495,1588,1683,1774,1865,1951,2061,2173,2276,2387,2494,2601,2760,2859",
+ "endColumns": "110,114,110,81,105,129,82,79,90,92,98,94,100,92,92,94,90,90,85,109,111,102,110,106,106,158,98,85",
+ "endOffsets": "211,326,437,519,625,755,838,918,1009,1102,1201,1296,1397,1490,1583,1678,1769,1860,1946,2056,2168,2271,2382,2489,2596,2755,2854,2940"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
index 2bf21705..eca72b3f 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gl\\values-gl.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gl\\values-gl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gl\\values-gl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gl\\values-gl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gl\\values-gl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
index fcdcba88..6a8aa90a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-gu\\values-gu.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-gu\\values-gu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gu\\values-gu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-gu\\values-gu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
index 83af05a9..bf13f69e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
index 37d52bb0..b7a040b0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
index e1fe254c..ebcd514e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hi\\values-hi.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hi\\values-hi.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
- "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
- "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hi\\values-hi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hi\\values-hi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "2988"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hi\\values-hi.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,211,308,418,504,606,728,805,883,974,1067,1163,1257,1358,1451,1546,1640,1731,1822,1912,2021,2124,2226,2336,2437,2549,2711,2812",
+ "endColumns": "105,96,109,85,101,121,76,77,90,92,95,93,100,92,94,93,90,90,89,108,102,101,109,100,111,161,100,79",
+ "endOffsets": "206,303,413,499,601,723,800,878,969,1062,1158,1252,1353,1446,1541,1635,1726,1817,1907,2016,2119,2221,2331,2432,2544,2706,2807,2887"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
index 2b8e8a93..941c78ac 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hr\\values-hr.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hr\\values-hr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hr\\values-hr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
index a69a6e94..7480659c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hu\\values-hu.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hu\\values-hu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hu\\values-hu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hu\\values-hu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hu\\values-hu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
index 6401616d..2a7f4192 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-hy\\values-hy.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hy\\values-hy.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hy\\values-hy.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-hy\\values-hy.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
index 2db5b4b5..5beafcde 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-in\\values-in.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-in\\values-in.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-in\\values-in.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-in\\values-in.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-in\\values-in.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
index d90f6b88..588a4fed 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-is\\values-is.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-is\\values-is.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-is\\values-is.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-is\\values-is.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
index 698af323..fc8dddd4 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-it\\values-it.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -38,7 +38,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-it\\values-it.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-it\\values-it.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
index d6f7db0c..2e1b47aa 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-iw\\values-iw.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-iw\\values-iw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-iw\\values-iw.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
+ "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
+ "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-iw\\values-iw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2928"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-iw\\values-iw.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,209,308,416,500,600,714,792,870,961,1055,1151,1245,1346,1439,1534,1631,1722,1814,1895,1997,2101,2199,2302,2403,2503,2655,2751",
- "endColumns": "103,98,107,83,99,113,77,77,90,93,95,93,100,92,94,96,90,91,80,101,103,97,102,100,99,151,95,80",
- "endOffsets": "204,303,411,495,595,709,787,865,956,1050,1146,1240,1341,1434,1529,1626,1717,1809,1890,1992,2096,2194,2297,2398,2498,2650,2746,2827"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
index a5d82385..85f5cc7a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ja\\values-ja.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ja\\values-ja.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ja\\values-ja.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
index 67923262..43c1d13d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ka\\values-ka.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ka\\values-ka.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ka\\values-ka.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
index 4b03c90d..08ce1a27 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kk\\values-kk.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kk\\values-kk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kk\\values-kk.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
+ "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
+ "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kk\\values-kk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2989"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kk\\values-kk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,217,320,430,515,621,740,821,901,992,1085,1181,1275,1376,1469,1564,1661,1752,1844,1925,2028,2133,2231,2338,2447,2547,2713,2812",
- "endColumns": "111,102,109,84,105,118,80,79,90,92,95,93,100,92,94,96,90,91,80,102,104,97,106,108,99,165,98,80",
- "endOffsets": "212,315,425,510,616,735,816,896,987,1080,1176,1270,1371,1464,1559,1656,1747,1839,1920,2023,2128,2226,2333,2442,2542,2708,2807,2888"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
index 51701282..afaaf64c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-km\\values-km.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-km\\values-km.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-km\\values-km.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-km\\values-km.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-km\\values-km.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
index bfac4151..33dff668 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-kn\\values-kn.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kn\\values-kn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-kn\\values-kn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
index 556023e3..b7f29994 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
@@ -1,27 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ko\\values-ko.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ko\\values-ko.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "45",
- "startColumns": "4",
- "startOffsets": "3615",
- "endColumns": "100",
- "endOffsets": "3711"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ko\\values-ko.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ko\\values-ko.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -38,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ko\\values-ko.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ko\\values-ko.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -53,6 +36,23 @@
"endColumns": "94,93,101,81,97,105,78,75,90,92,91,90,100,92,94,93,90,90,79,97,94,94,99,95,98,151,93,77",
"endOffsets": "195,289,391,473,571,677,756,832,923,1016,1108,1199,1300,1393,1488,1582,1673,1764,1844,1942,2037,2132,2232,2328,2427,2579,2673,3610"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ko\\values-ko.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "45",
+ "startColumns": "4",
+ "startOffsets": "3615",
+ "endColumns": "100",
+ "endOffsets": "3711"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
index 6be1f166..9d363d98 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ky\\values-ky.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ky\\values-ky.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ky\\values-ky.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ky\\values-ky.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
index 2c8c315d..e29ef90b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-land\\values-land.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-land\\values-land.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-land\\values-land.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-land\\values-land.xml",
"from": {
"startLines": "2,3,4",
"startColumns": "4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
index 18e6cc2c..09c6d6c3 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-large-v4\\values-large-v4.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
"from": {
"startLines": "2,3",
"startColumns": "4,4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-large-v4\\values-large-v4.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10",
"startColumns": "4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
index 785ebadc..60ad881a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
index c51745a1..acb3d6b6 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lo\\values-lo.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lo\\values-lo.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lo\\values-lo.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
+ "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
+ "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lo\\values-lo.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2932"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lo\\values-lo.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,208,305,412,497,602,714,791,869,960,1053,1149,1243,1344,1437,1532,1626,1717,1808,1888,1995,2092,2190,2295,2398,2502,2659,2755",
- "endColumns": "102,96,106,84,104,111,76,77,90,92,95,93,100,92,94,93,90,90,79,106,96,97,104,102,103,156,95,80",
- "endOffsets": "203,300,407,492,597,709,786,864,955,1048,1144,1238,1339,1432,1527,1621,1712,1803,1883,1990,2087,2185,2290,2393,2497,2654,2750,2831"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
index 2626c623..5734b396 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lt\\values-lt.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lt\\values-lt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lt\\values-lt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lt\\values-lt.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
index f180241c..37cdce1b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-lv\\values-lv.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lv\\values-lv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-lv\\values-lv.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lv\\values-lv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-lv\\values-lv.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
index ee20541a..c251a6f7 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mk\\values-mk.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mk\\values-mk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mk\\values-mk.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
+ "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
+ "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mk\\values-mk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "3041"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mk\\values-mk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,317,425,511,616,735,818,900,997,1096,1193,1293,1400,1499,1600,1696,1793,1884,1971,2077,2184,2285,2392,2503,2607,2763,2861",
- "endColumns": "107,103,107,85,104,118,82,81,96,98,96,99,106,98,100,95,96,90,86,105,106,100,106,110,103,155,97,83",
- "endOffsets": "208,312,420,506,611,730,813,895,992,1091,1188,1288,1395,1494,1595,1691,1788,1879,1966,2072,2179,2280,2387,2498,2602,2758,2856,2940"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
index 6d621f1f..9eb06dc0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ml\\values-ml.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ml\\values-ml.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ml\\values-ml.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ml\\values-ml.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ml\\values-ml.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
index bec466ee..3ef810ed 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mn\\values-mn.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mn\\values-mn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mn\\values-mn.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mn\\values-mn.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mn\\values-mn.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
index d8561dca..e2a048ef 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-mr\\values-mr.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mr\\values-mr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-mr\\values-mr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mr\\values-mr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-mr\\values-mr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
index a0d23496..15ce4511 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ms\\values-ms.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ms\\values-ms.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ms\\values-ms.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ms\\values-ms.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
index 39073d0f..aac872f0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-my\\values-my.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-my\\values-my.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
- "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
- "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-my\\values-my.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-my\\values-my.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "3075"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-my\\values-my.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,214,319,436,529,641,769,847,926,1017,1110,1206,1300,1401,1494,1589,1683,1774,1865,1951,2074,2186,2288,2414,2525,2635,2795,2895",
+ "endColumns": "108,104,116,92,111,127,77,78,90,92,95,93,100,92,94,93,90,90,85,122,111,101,125,110,109,159,99,83",
+ "endOffsets": "209,314,431,524,636,764,842,921,1012,1105,1201,1295,1396,1489,1584,1678,1769,1860,1946,2069,2181,2283,2409,2520,2630,2790,2890,2974"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
index 16793824..1e6ad4fa 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nb\\values-nb.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nb\\values-nb.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
- "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
- "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nb\\values-nb.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nb\\values-nb.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "2922"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nb\\values-nb.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,213,308,422,508,608,721,797,873,964,1057,1153,1247,1348,1441,1536,1634,1725,1816,1896,1999,2098,2194,2298,2396,2497,2650,2747",
+ "endColumns": "107,94,113,85,99,112,75,75,90,92,95,93,100,92,94,97,90,90,79,102,98,95,103,97,100,152,96,78",
+ "endOffsets": "208,303,417,503,603,716,792,868,959,1052,1148,1242,1343,1436,1531,1629,1720,1811,1891,1994,2093,2189,2293,2391,2492,2645,2742,2821"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
index 24e4b910..ce9b7f5d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ne\\values-ne.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ne\\values-ne.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ne\\values-ne.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ne\\values-ne.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
index df8b1505..a808e052 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-night-v8\\values-night-v8.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-night-v8\\values-night-v8.xml",
"from": {
"startLines": "2,3,4,5,6,7,8",
"startColumns": "4,4,4,4,4,4,4",
@@ -14,7 +14,7 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-night\\themes.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-night\\themes.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
index bbe02fef..facac083 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-nl\\values-nl.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nl\\values-nl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nl\\values-nl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-nl\\values-nl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
index 7cc34b8c..26d9a888 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-or\\values-or.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-or\\values-or.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847",
- "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88",
- "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-or\\values-or.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-or\\values-or.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -29,6 +19,16 @@
"endColumns": "100",
"endOffsets": "3032"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-or\\values-or.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,224,334,441,527,631,751,828,905,996,1089,1186,1281,1382,1475,1570,1666,1757,1847,1929,2039,2144,2250,2361,2464,2582,2745,2847",
+ "endColumns": "118,109,106,85,103,119,76,76,90,92,96,94,100,92,94,95,90,89,81,109,104,105,110,102,117,162,101,88",
+ "endOffsets": "219,329,436,522,626,746,823,900,991,1084,1181,1276,1377,1470,1565,1661,1752,1842,1924,2034,2139,2245,2356,2459,2577,2740,2842,2931"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
index d69f2f75..e39f6ca3 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pa\\values-pa.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pa\\values-pa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pa\\values-pa.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pa\\values-pa.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pa\\values-pa.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
index 079c941e..ac118356 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
@@ -1,27 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pl\\values-pl.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pl\\values-pl.xml",
- "from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
- },
- "to": {
- "startLines": "48",
- "startColumns": "4",
- "startOffsets": "4063",
- "endColumns": "100",
- "endOffsets": "4159"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pl\\values-pl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pl\\values-pl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -38,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pl\\values-pl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pl\\values-pl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -53,6 +36,23 @@
"endColumns": "115,101,107,85,108,118,77,76,90,92,95,93,101,92,94,94,90,90,81,108,108,98,108,110,107,162,95,81",
"endOffsets": "216,318,426,512,621,740,818,895,986,1079,1175,1269,1371,1464,1559,1654,1745,1836,1918,2027,2136,2235,2344,2455,2563,2726,2822,4058"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pl\\values-pl.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "48",
+ "startColumns": "4",
+ "startOffsets": "4063",
+ "endColumns": "100",
+ "endOffsets": "4159"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
index 5356b050..e3592397 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-port\\values-port.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-port\\values-port.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-port\\values-port.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
index f257f6f5..9134f4d1 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
@@ -1,27 +1,27 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rBR\\values-pt-rBR.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,114,169,226,273,314,374,438,512,614,710,817,883,1000,1068",
+ "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
+ "endOffsets": "109,164,221,268,309,369,433,507,609,705,812,878,995,1063,1117"
},
"to": {
- "startLines": "45",
- "startColumns": "4",
- "startOffsets": "3996",
- "endColumns": "100",
- "endOffsets": "4092"
+ "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2844,2903,2958,3015,3062,3103,3163,3227,3301,3403,3499,3606,3672,3789,3857",
+ "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
+ "endOffsets": "2898,2953,3010,3057,3098,3158,3222,3296,3398,3494,3601,3667,3784,3852,3906"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -38,20 +38,20 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-pt-rBR\\values-pt-rBR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rBR\\values-pt-rBR.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,114,169,226,273,314,374,438,512,614,710,817,883,1000,1068",
- "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
- "endOffsets": "109,164,221,268,309,369,433,507,609,705,812,878,995,1063,1117"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "29,30,31,32,33,34,35,36,37,38,39,40,41,42,43",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2844,2903,2958,3015,3062,3103,3163,3227,3301,3403,3499,3606,3672,3789,3857",
- "endColumns": "58,54,56,46,40,59,63,73,101,95,106,65,116,67,53",
- "endOffsets": "2898,2953,3010,3057,3098,3158,3222,3296,3398,3494,3601,3667,3784,3852,3906"
+ "startLines": "45",
+ "startColumns": "4",
+ "startOffsets": "3996",
+ "endColumns": "100",
+ "endOffsets": "4092"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
index 25a3af94..a05874f2 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt-rPT\\values-pt-rPT.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
+ "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
+ "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "3045"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt-rPT\\values-pt-rPT.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,225,331,438,527,628,752,836,917,1009,1103,1201,1295,1395,1489,1585,1680,1772,1864,1951,2058,2170,2272,2380,2487,2594,2765,2864",
- "endColumns": "119,105,106,88,100,123,83,80,91,93,97,93,99,93,95,94,91,91,86,106,111,101,107,106,106,170,98,84",
- "endOffsets": "220,326,433,522,623,747,831,912,1004,1098,1196,1290,1390,1484,1580,1675,1767,1859,1946,2053,2165,2267,2375,2482,2589,2760,2859,2944"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
index 0013a1ec..4c49a4e6 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-pt\\values-pt.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt\\values-pt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-pt\\values-pt.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt\\values-pt.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-pt\\values-pt.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
index 8ed16bc0..7ff0c835 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ro\\values-ro.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ro\\values-ro.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ro\\values-ro.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ro\\values-ro.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
index c7423175..f16d5f70 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
@@ -1,10 +1,27 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ru\\values-ru.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ru\\values-ru.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
+ "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
+ "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
+ },
+ "to": {
+ "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,52",
+ "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",
+ "startOffsets": "444,559,661,773,859,964,1084,1163,1241,1333,1427,1523,1616,1712,1806,1902,1997,2089,2181,2261,2367,2475,2573,2682,2788,2896,3071,4251",
+ "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
+ "endOffsets": "554,656,768,854,959,1079,1158,1236,1328,1422,1518,1611,1707,1801,1897,1992,2084,2176,2256,2362,2470,2568,2677,2783,2891,3066,3166,4327"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -23,24 +40,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ru\\values-ru.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,220,322,434,520,625,745,824,902,994,1088,1184,1277,1373,1467,1563,1658,1750,1842,1922,2028,2136,2234,2343,2449,2557,2732,2832",
- "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
- "endOffsets": "215,317,429,515,620,740,819,897,989,1083,1179,1272,1368,1462,1558,1653,1745,1837,1917,2023,2131,2229,2338,2444,2552,2727,2827,2908"
- },
- "to": {
- "startLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,52",
- "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",
- "startOffsets": "444,559,661,773,859,964,1084,1163,1241,1333,1427,1523,1616,1712,1806,1902,1997,2089,2181,2261,2367,2475,2573,2682,2788,2896,3071,4251",
- "endColumns": "114,101,111,85,104,119,78,77,91,93,95,92,95,93,95,94,91,91,79,105,107,97,108,105,107,174,99,80",
- "endOffsets": "554,656,768,854,959,1079,1158,1236,1328,1422,1518,1611,1707,1801,1897,1992,2084,2176,2256,2362,2470,2568,2677,2783,2891,3066,3166,4327"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ru\\values-ru.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ru\\values-ru.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
index db0b92ea..a1264cb2 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-si\\values-si.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-si\\values-si.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-si\\values-si.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
+ "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
+ "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-si\\values-si.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2999"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-si\\values-si.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,215,322,429,517,622,738,827,914,1005,1098,1193,1287,1388,1481,1576,1670,1761,1852,1936,2045,2150,2248,2358,2457,2563,2722,2821",
- "endColumns": "109,106,106,87,104,115,88,86,90,92,94,93,100,92,94,93,90,90,83,108,104,97,109,98,105,158,98,81",
- "endOffsets": "210,317,424,512,617,733,822,909,1000,1093,1188,1282,1383,1476,1571,1665,1756,1847,1931,2040,2145,2243,2353,2452,2558,2717,2816,2898"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
index 87737fcb..818ebb3c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sk\\values-sk.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sk\\values-sk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sk\\values-sk.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
+ "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
+ "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sk\\values-sk.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "3014"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sk\\values-sk.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,212,312,423,509,617,735,816,897,988,1081,1180,1274,1375,1468,1563,1661,1752,1843,1927,2032,2141,2240,2346,2457,2566,2732,2830",
- "endColumns": "106,99,110,85,107,117,80,80,90,92,98,93,100,92,94,97,90,90,83,104,108,98,105,110,108,165,97,87",
- "endOffsets": "207,307,418,504,612,730,811,892,983,1076,1175,1269,1370,1463,1558,1656,1747,1838,1922,2027,2136,2235,2341,2452,2561,2727,2825,2913"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
index b65a0e74..d0416e57 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sl\\values-sl.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sl\\values-sl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sl\\values-sl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sl\\values-sl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
index 3e5dc5c0..c136ecd5 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sq\\values-sq.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sq\\values-sq.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sq\\values-sq.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sq\\values-sq.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
index 15c81c08..d6875ffd 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sr\\values-sr.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sr\\values-sr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sr\\values-sr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
index 49bda060..f58654b7 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sv\\values-sv.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sv\\values-sv.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sv\\values-sv.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
+ "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
+ "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sv\\values-sv.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -19,16 +29,6 @@
"endColumns": "100",
"endOffsets": "2959"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sv\\values-sv.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,211,314,425,510,612,725,801,877,970,1065,1161,1255,1358,1453,1550,1648,1744,1837,1917,2023,2123,2219,2324,2426,2528,2682,2784",
- "endColumns": "105,102,110,84,101,112,75,75,92,94,95,93,102,94,96,97,95,92,79,105,99,95,104,101,101,153,101,78",
- "endOffsets": "206,309,420,505,607,720,796,872,965,1060,1156,1250,1353,1448,1545,1643,1739,1832,1912,2018,2118,2214,2319,2421,2523,2677,2779,2858"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
index 01bf5589..ee78c1f7 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw\\values-sw.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sw\\values-sw.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-sw\\values-sw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
index 8ac2282f..0bb56691 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json
@@ -1,10 +1,20 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-sw600dp-v13\\values-sw600dp-v13.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9",
+ "startColumns": "4,4,4,4,4,4,4,4",
+ "startOffsets": "55,124,193,263,337,413,472,543",
+ "endColumns": "68,68,69,73,75,58,70,67",
+ "endOffsets": "119,188,258,332,408,467,538,606"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,10,11,12",
"startColumns": "4,4,4,4,4,4,4,4,4,4",
@@ -21,16 +31,6 @@
"endColumns": "59,69,70,71,57,57,10,63,62,10",
"endOffsets": "666,736,807,879,937,995,1104,1168,1231,1403"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "55,124,193,263,337,413,472,543",
- "endColumns": "68,68,69,73,75,58,70,67",
- "endOffsets": "119,188,258,332,408,467,538,606"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
index d16f2ee7..d71bd736 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ta\\values-ta.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ta\\values-ta.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ta\\values-ta.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
index 9dc5ac85..061a63ba 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-te\\values-te.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-te\\values-te.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-te\\values-te.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-te\\values-te.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
index 9c69372f..30c29cbb 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-th\\values-th.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-th\\values-th.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-th\\values-th.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-th\\values-th.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-th\\values-th.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
index 013c41b8..95d94df9 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tl\\values-tl.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tl\\values-tl.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tl\\values-tl.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json
index 8397143f..26b6a7f5 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr-rTR.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr-rTR\\values-tr-rTR.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr-rTR\\values-tr-rTR.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-tr-rTR\\values-tr-rTR.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-tr-rTR\\values-tr-rTR.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
index af35549d..e493dd56 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-tr\\values-tr.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tr\\values-tr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-tr\\values-tr.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tr\\values-tr.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-tr\\values-tr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
index cfcb5396..d5d8dfd7 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
@@ -1,27 +1,29 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uk\\values-uk.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-uk\\values-uk.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "100",
- "endOffsets": "151"
+ "startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,402,449,508,569,615,656,708,753,823,919,1011,1080,1174,1244",
+ "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
+ "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
+ "endOffsets": "397,444,503,564,610,651,703,748,818,914,1006,1075,1169,1239,1293"
},
"to": {
- "startLines": "50",
- "startColumns": "4",
- "startOffsets": "4143",
- "endColumns": "100",
- "endOffsets": "4239"
+ "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "105,3166,3213,3272,3333,3379,3420,3472,3517,3587,3683,3775,3844,3938,4008",
+ "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
+ "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
+ "endOffsets": "447,3208,3267,3328,3374,3415,3467,3512,3582,3678,3770,3839,3933,4003,4057"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uk\\values-uk.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -38,22 +40,20 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-uk\\values-uk.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uk\\values-uk.xml",
"from": {
- "startLines": "2,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,402,449,508,569,615,656,708,753,823,919,1011,1080,1174,1244",
- "endLines": "7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
- "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
- "endOffsets": "397,444,503,564,610,651,703,748,818,914,1006,1075,1169,1239,1293"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
},
"to": {
- "startLines": "2,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "105,3166,3213,3272,3333,3379,3420,3472,3517,3587,3683,3775,3844,3938,4008",
- "endLines": "7,35,36,37,38,39,40,41,42,43,44,45,46,47,48",
- "endColumns": "14,46,58,60,45,40,51,44,69,95,91,68,93,69,53",
- "endOffsets": "447,3208,3267,3328,3374,3415,3467,3512,3582,3678,3770,3839,3933,4003,4057"
+ "startLines": "50",
+ "startColumns": "4",
+ "startOffsets": "4143",
+ "endColumns": "100",
+ "endOffsets": "4239"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
index 606507de..cf4ebc94 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-ur\\values-ur.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ur\\values-ur.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-ur\\values-ur.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ur\\values-ur.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-ur\\values-ur.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
index db69ed0d..10dd1fda 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-uz\\values-uz.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uz\\values-uz.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,7 +21,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uz\\values-uz.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-uz\\values-uz.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
index 94385845..ad6009da 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v16\\values-v16.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v16\\values-v16.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v16\\values-v16.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v16\\values-v16.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
index 91ab46e1..8357aecc 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v17\\values-v17.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v17\\values-v17.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v17\\values-v17.xml",
"from": {
"startLines": "2,5,9,12,15,18,22,25,29,33,37,40,43,46,50,53,57",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
index caed4071..56ad4fe1 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v18\\values-v18.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v18\\values-v18.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v18\\values-v18.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
index 80de6390..48623c92 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
@@ -1,10 +1,48 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v21\\values-v21.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-v21\\values-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,5,8,11",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "55,223,386,554",
+ "endLines": "4,7,10,13",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "218,381,549,716"
+ },
+ "to": {
+ "startLines": "265,268,272,276",
+ "startColumns": "4,4,4,4",
+ "startOffsets": "19518,19686,19975,20271",
+ "endLines": "267,270,274,278",
+ "endColumns": "12,12,12,12",
+ "endOffsets": "19681,19844,20138,20433"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v21\\values-v21.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
+ "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",
+ "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
+ "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
+ },
+ "to": {
+ "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
+ "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",
+ "startOffsets": "368,459,562,665,770,877,986,1095,1204,1313,1422,1529,1632,1751,1906,2061,2166,2287,2388,2535,2676,2779,2898,3005,3108,3263,3434,3583,3748,3905,4056,4175,4547,4696,4845,4957,5104,5257,5404,5479,5568,5655,5756,5859,8927,9112,12192,12389,12588,12711,12834,12947,13130,13261,13462,13551,13662,13895,13996,14091,14214,14343,14460,14637,14736,14871,15014,15149,15268,15469,15588,15681,15792,15848,15955,16150,16261,16394,16489,16580,16671,16788,16927,16998,17081,17761,17818,17876,18570",
+ "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
+ "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
+ "endOffsets": "454,557,660,765,872,981,1090,1199,1308,1417,1524,1627,1746,1901,2056,2161,2282,2383,2530,2671,2774,2893,3000,3103,3258,3429,3578,3743,3900,4051,4170,4542,4691,4840,4952,5099,5252,5399,5474,5563,5650,5751,5854,8922,9107,12187,12384,12583,12706,12829,12942,13125,13256,13457,13546,13657,13890,13991,14086,14209,14338,14455,14632,14731,14866,15009,15144,15263,15464,15583,15676,15787,15843,15950,16145,16256,16389,16484,16575,16666,16783,16922,16993,17076,17756,17813,17871,18565,19271"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values-v21\\values-v21.xml",
"from": {
"startLines": "2,10,18,26",
"startColumns": "4,4,4,4",
@@ -23,7 +61,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v21\\values-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-v21\\values-v21.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,13",
"startColumns": "4,4,4,4,4,4,4,4,4,4",
@@ -40,44 +78,6 @@
"endColumns": "117,63,66,63,115,125,125,127,12,12",
"endOffsets": "168,232,299,363,19387,19513,19970,20266,22318,22670"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v21\\values-v21.xml",
- "from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,19,20,21,22,24,26,27,28,29,30,32,34,36,38,40,42,43,48,50,52,53,54,56,58,59,60,61,62,63,107,110,154,157,160,162,164,166,169,171,174,175,176,179,180,181,182,183,184,187,188,190,192,194,196,200,202,203,204,205,207,211,213,215,216,217,218,219,221,222,223,233,234,235,247",
- "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",
- "startOffsets": "55,146,249,352,457,564,673,782,891,1000,1109,1216,1319,1438,1593,1748,1853,1974,2075,2222,2363,2466,2585,2692,2795,2950,3121,3270,3435,3592,3743,3862,4234,4383,4532,4644,4791,4944,5091,5166,5255,5342,5443,5546,8614,8799,11879,12076,12275,12398,12521,12634,12817,12948,13149,13238,13349,13582,13683,13778,13901,14030,14147,14324,14423,14558,14701,14836,14955,15156,15275,15368,15479,15535,15642,15837,15948,16081,16176,16267,16358,16475,16614,16685,16768,17448,17505,17563,18257",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,16,18,19,20,21,23,25,26,27,28,29,31,33,35,37,39,41,42,47,49,51,52,53,55,57,58,59,60,61,62,106,109,153,156,159,161,163,165,168,170,173,174,175,178,179,180,181,182,183,186,187,189,191,193,195,199,201,202,203,204,206,210,212,214,215,216,217,218,220,221,222,232,233,234,246,258",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "141,244,347,452,559,668,777,886,995,1104,1211,1314,1433,1588,1743,1848,1969,2070,2217,2358,2461,2580,2687,2790,2945,3116,3265,3430,3587,3738,3857,4229,4378,4527,4639,4786,4939,5086,5161,5250,5337,5438,5541,8609,8794,11874,12071,12270,12393,12516,12629,12812,12943,13144,13233,13344,13577,13678,13773,13896,14025,14142,14319,14418,14553,14696,14831,14950,15151,15270,15363,15474,15530,15637,15832,15943,16076,16171,16262,16353,16470,16609,16680,16763,17443,17500,17558,18252,18958"
- },
- "to": {
- "startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,21,23,24,25,26,28,30,31,32,33,34,36,38,40,42,44,46,47,52,54,56,57,58,60,62,63,64,65,66,67,111,114,158,161,164,166,168,170,173,175,178,179,180,183,184,185,186,187,188,191,192,194,196,198,200,204,206,207,208,209,211,215,217,219,220,221,222,223,225,226,227,237,238,239,251",
- "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",
- "startOffsets": "368,459,562,665,770,877,986,1095,1204,1313,1422,1529,1632,1751,1906,2061,2166,2287,2388,2535,2676,2779,2898,3005,3108,3263,3434,3583,3748,3905,4056,4175,4547,4696,4845,4957,5104,5257,5404,5479,5568,5655,5756,5859,8927,9112,12192,12389,12588,12711,12834,12947,13130,13261,13462,13551,13662,13895,13996,14091,14214,14343,14460,14637,14736,14871,15014,15149,15268,15469,15588,15681,15792,15848,15955,16150,16261,16394,16489,16580,16671,16788,16927,16998,17081,17761,17818,17876,18570",
- "endLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,27,29,30,31,32,33,35,37,39,41,43,45,46,51,53,55,56,57,59,61,62,63,64,65,66,110,113,157,160,163,165,167,169,172,174,177,178,179,182,183,184,185,186,187,190,191,193,195,197,199,203,205,206,207,208,210,214,216,218,219,220,221,222,224,225,226,236,237,238,250,262",
- "endColumns": "90,102,102,104,106,108,108,108,108,108,106,102,118,12,12,104,120,100,12,12,102,118,106,102,12,12,12,12,12,12,118,12,12,12,111,146,12,12,74,88,86,100,102,12,12,12,12,12,12,12,12,12,12,12,88,110,12,100,94,122,128,116,12,98,12,12,12,12,12,12,92,110,55,12,12,12,12,94,90,90,116,12,70,82,12,56,57,12,12",
- "endOffsets": "454,557,660,765,872,981,1090,1199,1308,1417,1524,1627,1746,1901,2056,2161,2282,2383,2530,2671,2774,2893,3000,3103,3258,3429,3578,3743,3900,4051,4170,4542,4691,4840,4952,5099,5252,5399,5474,5563,5650,5751,5854,8922,9107,12187,12384,12583,12706,12829,12942,13125,13256,13457,13546,13657,13890,13991,14086,14209,14338,14455,14632,14731,14866,15009,15144,15263,15464,15583,15676,15787,15843,15950,16145,16256,16389,16484,16575,16666,16783,16922,16993,17076,17756,17813,17871,18565,19271"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v21\\values-v21.xml",
- "from": {
- "startLines": "2,5,8,11",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,223,386,554",
- "endLines": "4,7,10,13",
- "endColumns": "12,12,12,12",
- "endOffsets": "218,381,549,716"
- },
- "to": {
- "startLines": "265,268,272,276",
- "startColumns": "4,4,4,4",
- "startOffsets": "19518,19686,19975,20271",
- "endLines": "267,270,274,278",
- "endColumns": "12,12,12,12",
- "endOffsets": "19681,19844,20138,20433"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
index 3c21d806..8874c521 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v22\\values-v22.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v22\\values-v22.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v22\\values-v22.xml",
"from": {
"startLines": "2,3,4,9",
"startColumns": "4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
index 1ae81ca5..fe5fe08a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json
@@ -1,10 +1,21 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v23\\values-v23.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values-v23\\values-v23.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v23\\values-v23.xml",
+ "from": {
+ "startLines": "2,3,4,5,6,19,32,33,34,35,36",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
+ "endLines": "2,3,4,5,18,31,32,33,34,35,36",
+ "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
+ "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
+ }
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values-v23\\values-v23.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -21,17 +32,6 @@
"endColumns": "12",
"endOffsets": "2791"
}
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v23\\values-v23.xml",
- "from": {
- "startLines": "2,3,4,5,6,19,32,33,34,35,36",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,190,325,400,487,1277,2079,2206,2311,2426,2533",
- "endLines": "2,3,4,5,18,31,32,33,34,35,36",
- "endColumns": "134,134,74,86,12,12,126,104,114,106,112",
- "endOffsets": "185,320,395,482,1272,2074,2201,2306,2421,2528,2641"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
index a0399dcb..0ff10ceb 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json
@@ -1,20 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v24\\values-v24.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v24\\values-v24.xml",
- "from": {
- "startLines": "2,3",
- "startColumns": "4,4",
- "startOffsets": "55,212",
- "endColumns": "156,134",
- "endOffsets": "207,342"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v24\\values-v24.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values-v24\\values-v24.xml",
"from": {
"startLines": "2,3,4,5",
"startColumns": "4,4,4,4",
@@ -29,6 +19,16 @@
"endColumns": "65,60,65,66",
"endOffsets": "408,469,535,602"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v24\\values-v24.xml",
+ "from": {
+ "startLines": "2,3",
+ "startColumns": "4,4",
+ "startOffsets": "55,212",
+ "endColumns": "156,134",
+ "endOffsets": "207,342"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
index 41e33867..d3898423 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v25\\values-v25.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v25\\values-v25.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v25\\values-v25.xml",
"from": {
"startLines": "2,3,4,6",
"startColumns": "4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
index b1d7ae13..8bd5bcd1 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v26\\values-v26.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v26\\values-v26.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v26\\values-v26.xml",
"from": {
"startLines": "2,3,4,8,12,16",
"startColumns": "4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
index f4aef74b..006fd7be 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-v28\\values-v28.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v28\\values-v28.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-v28\\values-v28.xml",
"from": {
"startLines": "2,3,4,8",
"startColumns": "4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
index 605958fc..614e22ae 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-vi\\values-vi.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-vi\\values-vi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-vi\\values-vi.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-vi\\values-vi.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
index d6a314e8..55d9b0ba 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v20\\values-watch-v20.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v20\\values-watch-v20.xml",
"from": {
"startLines": "2,5,8",
"startColumns": "4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
index 7f55eb5b..6d423110 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-watch-v21\\values-watch-v21.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-watch-v21\\values-watch-v21.xml",
"from": {
"startLines": "2,6,10",
"startColumns": "4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
index 0763017d..cbd8429c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-xlarge-v4\\values-xlarge-v4.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-xlarge-v4\\values-xlarge-v4.xml",
"from": {
"startLines": "2,3,4,5,6,7",
"startColumns": "4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index ca02fd04..467a943a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -1,29 +1,17 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
- },
- "to": {
- "startLines": "143",
+ "startLines": "18",
"startColumns": "4",
- "startOffsets": "8918",
- "endColumns": "100",
- "endOffsets": "9014"
- }
- },
- {
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "-1",
- "startColumns": "-1",
- "startOffsets": "-1"
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
},
"to": {
"startLines": "2",
@@ -35,13 +23,14 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.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,138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,7400,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
- "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,7447,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "142,133,134,72,71,70,132,69,20,21,22,113,114,121,120,123,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,135,136,130,64,138,137,126,39,45,50,40,60,59,58,54,53,51,52,55,128,56,139,46,67,57,140,65,131,125,44,49,48,47,63,43,62,41,42,127,66,141,124,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "7589,7161,7209,3610,3543,3469,7091,3418,890,931,980,6239,6285,6642,6591,6699,1269,3982,4051,3922,3856,3792,4726,4665,4601,4185,2981,1442,1496,4240,3684,6343,3358,7256,7303,6988,3141,7400,7349,6834,1880,2167,2418,1934,2920,2866,2814,2615,2566,2470,2519,2662,6936,2710,7453,2211,3298,2761,7496,3185,7038,6787,2123,2370,2313,2257,3085,2078,3042,1985,2027,6885,3238,7542,6742,1390,846,1701,1799,1653,1751,1605,1559,1217,1163,5108,5048,5251,6164,5567,5497,5632,5711,5896,5822,5184,5441,5309,5375,4998,6001,6085,6552,6443,6394,6489,1332,4129,4541,4841,4782,4909,4492,4446,4397,4345,1029,1096",
+ "endLines": "144,133,134,72,71,70,132,69,20,21,22,113,114,121,120,123,27,78,79,77,76,75,91,90,89,81,61,30,31,82,73,115,68,135,136,130,64,138,137,126,39,45,50,40,60,59,58,54,53,51,52,55,128,56,139,46,67,57,140,65,131,125,44,49,48,47,63,43,62,41,42,127,66,141,124,29,19,35,37,34,36,33,32,26,25,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,28,80,88,93,92,94,87,86,85,84,23,24",
+ "endColumns": "14,46,45,72,65,72,68,49,39,47,47,44,56,53,49,41,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,45,44,48,42,51,49,49,52,42,50,49,59,52,50,45,47,47,45,46,48,49,41,44,58,51,44,51,51,45,42,46,55,54,54,43,41,40,49,49,58,45,43,50,42,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "7763,7203,7250,3678,3604,3537,7155,3463,925,974,1023,6279,6337,6691,6636,6736,1326,4045,4123,3976,3916,3850,4776,4720,4659,4234,3036,1490,1553,4320,3760,6388,3412,7297,7343,7032,3179,7447,7394,6879,1928,2205,2464,1979,2975,2914,2860,2656,2609,2513,2560,2704,6980,2755,7490,2251,3352,2808,7536,3232,7085,6828,2161,2412,2364,2307,3135,2117,3079,2021,2072,6930,3292,7583,6781,1436,884,1745,1843,1695,1793,1647,1599,1263,1211,5178,5102,5303,6233,5626,5561,5705,5816,5995,5890,5245,5491,5369,5435,5042,6079,6158,6585,6483,6437,6546,1384,4179,4595,4903,4835,4966,4535,4486,4440,4391,1090,1157"
},
"to": {
"startLines": "6,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,141,142,144,145,146,147,148,149,150,151,152,153,154",
@@ -53,11 +42,13 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.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",
- "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",
- "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"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,201,296,396,478,575,681,757,833,924,1017,1115,1211,1306,1399,1494,1586,1677,1768,1846,1942,2038,2133,2230,2325,2423,2572,2666",
+ "endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
+ "endOffsets": "196,291,391,473,570,676,752,828,919,1012,1110,1206,1301,1394,1489,1581,1672,1763,1841,1937,2033,2128,2225,2320,2418,2567,2661,2739"
},
"to": {
"startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
@@ -66,6 +57,23 @@
"endColumns": "95,94,99,81,96,105,75,75,90,92,97,95,94,92,94,91,90,90,77,95,95,94,96,94,97,148,93,77",
"endOffsets": "475,570,670,752,849,955,1031,1107,1198,1291,1389,1485,1580,1673,1768,1860,1951,2042,2120,2216,2312,2407,2504,2599,2697,2846,2940,8794"
}
+ },
+ {
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rCN\\values-zh-rCN.xml",
+ "from": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "55",
+ "endColumns": "100",
+ "endOffsets": "151"
+ },
+ "to": {
+ "startLines": "143",
+ "startColumns": "4",
+ "startOffsets": "8918",
+ "endColumns": "100",
+ "endOffsets": "9014"
+ }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
index 80fecc3e..7b4fed2a 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rHK\\values-zh-rHK.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rHK\\values-zh-rHK.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 9d347b2b..0ac1b8f1 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "123,73,72,71,70,20,21,22,113,114,122,121,27,77,78,76,75,74,90,89,88,80,62,30,31,81,38,115,69,65,40,46,51,41,61,60,59,55,54,52,53,56,57,47,68,58,66,45,50,49,48,64,44,63,42,43,67,29,19,35,37,34,36,33,32,26,25,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,28,79,87,92,91,93,86,85,84,83,23,24",
"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",
@@ -23,7 +23,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,24 +40,26 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
- "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",
- "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
},
"to": {
- "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
- "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",
- "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8798",
- "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
- "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8871"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
"startLines": "2",
"startColumns": "4",
@@ -74,22 +76,20 @@
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zh-rTW\\values-zh-rTW.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
+ "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
+ "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",
+ "startOffsets": "105,200,293,393,475,572,680,756,832,924,1018,1116,1212,1308,1402,1498,1590,1682,1774,1852,1948,2044,2139,2236,2331,2431,2581,2675",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "195,288,388,470,567,675,751,827,919,1013,1111,1207,1303,1397,1493,1585,1677,1769,1847,1943,2039,2134,2231,2326,2426,2576,2670,2748"
},
"to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
+ "startLines": "9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,140",
+ "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",
+ "startOffsets": "384,479,572,672,754,851,959,1035,1111,1203,1297,1395,1491,1587,1681,1777,1869,1961,2053,2131,2227,2323,2418,2515,2610,2710,2860,8798",
+ "endColumns": "94,92,99,81,96,107,75,75,91,93,97,95,95,93,95,91,91,91,77,95,95,94,96,94,99,149,93,77",
+ "endOffsets": "474,567,667,749,846,954,1030,1106,1198,1292,1390,1486,1582,1676,1772,1864,1956,2048,2126,2222,2318,2413,2510,2605,2705,2855,2949,8871"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json
index 0218a544..af9ce94e 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh\\values-zh.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh\\values-zh.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh\\values-zh.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values-zh\\values-zh.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
index 887ee06e..3f0bfdd0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zu\\values-zu.xml",
"map": [
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zu\\values-zu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29",
"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",
@@ -14,7 +14,7 @@
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zu\\values-zu.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values-zu\\values-zu.xml",
"from": {
"startLines": "2",
"startColumns": "4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index f45e3f5c..2b3ce540 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -1,374 +1,305 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
+ "outputFile": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\1bbf379c87dedbe80347cf20a1163be0\\transformed\\constraintlayout-1.1.3\\res\\values\\values.xml",
"from": {
- "startLines": "23,24,27,29,30,26,25,19,20,21,22,18",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "997,1056,1223,1268,1315,1172,1113,783,836,890,944,730",
- "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
- "endOffsets": "1050,1107,1260,1309,1357,1217,1166,830,884,938,991,777"
+ "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",
+ "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",
+ "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"
},
"to": {
- "startLines": "416,417,476,477,478,542,543,564,565,566,567,568",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "24612,24670,28462,28504,28550,32540,32590,33891,33943,33996,34049,34101",
- "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
- "endOffsets": "24665,24721,28499,28545,28592,32585,32643,33938,33991,34044,34096,34148"
+ "startLines": "18,19,36,41,42,43,48,59,60,61,62,65,66,69,72,73,74,75,76,79,82,83,84,85,90,93,96,97,98,103,104,105,108,111,112,115,118,121,124,125,128,131,132,137,138,143,146,149,150,151,152,153,154,155,156,157,158",
+ "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",
+ "startOffsets": "867,928,1776,2032,2084,2145,2411,2941,3002,3062,3132,3265,3333,3462,3588,3650,3715,3783,3850,3973,4098,4165,4230,4295,4476,4597,4718,4784,4851,5061,5130,5196,5321,5447,5514,5640,5767,5892,6019,6084,6210,6333,6398,6606,6673,6853,6973,7093,7158,7220,7282,7344,7403,7463,7524,7585,7644",
+ "endLines": "18,26,36,41,42,43,51,59,60,61,64,65,68,71,72,73,74,75,78,81,82,83,84,89,92,95,96,97,102,103,104,107,110,111,114,117,120,123,124,127,130,131,136,137,142,145,148,149,150,151,152,153,154,155,156,157,166",
+ "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11",
+ "endOffsets": "923,1214,1819,2079,2140,2186,2533,2997,3057,3127,3260,3328,3457,3583,3645,3710,3778,3845,3968,4093,4160,4225,4290,4471,4592,4713,4779,4846,5056,5125,5191,5316,5442,5509,5635,5762,5887,6014,6079,6205,6328,6393,6601,6668,6848,6968,7088,7153,7215,7277,7339,7398,7458,7519,7580,7639,7981"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\a3b53597472b39093af755f90fb87b98\\transformed\\jetified-glide-4.8.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\5829027e9bc4104ac7715c543b8358de\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "55",
- "endColumns": "57",
- "endOffsets": "108"
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
},
"to": {
- "startLines": "617",
- "startColumns": "4",
- "startOffsets": "36974",
- "endColumns": "57",
- "endOffsets": "37027"
+ "startLines": "44,3332",
+ "startColumns": "4,4",
+ "startOffsets": "2191,214423",
+ "endLines": "44,3334",
+ "endColumns": "60,12",
+ "endOffsets": "2247,214563"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7bd1a0e41b0fd55c93cf529ddb15a7aa\\transformed\\jetified-spiderman-1.0.2\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "55,101,148,199,243",
- "endColumns": "45,46,50,43,52",
- "endOffsets": "96,143,194,238,291"
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "225,226,227,316,559",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "11920,11966,12013,17904,33626",
- "endColumns": "45,46,50,43,52",
- "endOffsets": "11961,12008,12059,17943,33674"
+ "startLines": "295,560,561,562,563,2640,2642,2643,2648,2650",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "16267,33534,33587,33640,33693,170763,170939,171061,171323,171518",
+ "endColumns": "88,52,52,52,52,65,121,60,65,66",
+ "endOffsets": "16351,33582,33635,33688,33741,170824,171056,171117,171384,171580"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values\\values.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,83,84,88,89,90,91,98,141,173,210",
- "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",
- "startOffsets": "55,127,215,284,347,417,485,557,627,688,762,835,896,957,1019,1083,1145,1206,1274,1374,1434,1500,1573,1642,1699,1751,1813,1885,1961,2026,2085,2144,2204,2264,2324,2384,2444,2504,2564,2624,2684,2744,2803,2863,2923,2983,3043,3103,3163,3223,3283,3343,3403,3462,3522,3582,3641,3700,3759,3818,3877,3936,3971,4006,4061,4124,4179,4237,4294,4344,4405,4462,4496,4531,4566,4636,4707,4824,5025,5135,5336,5465,5537,5604,5902,8808,10873,12633",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,82,83,87,88,89,90,97,140,172,209,216",
- "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "122,210,279,342,412,480,552,622,683,757,830,891,952,1014,1078,1140,1201,1269,1369,1429,1495,1568,1637,1694,1746,1808,1880,1956,2021,2080,2139,2199,2259,2319,2379,2439,2499,2559,2619,2679,2739,2798,2858,2918,2978,3038,3098,3158,3218,3278,3338,3398,3457,3517,3577,3636,3695,3754,3813,3872,3931,3966,4001,4056,4119,4174,4232,4289,4339,4400,4457,4491,4526,4561,4631,4702,4819,5020,5130,5331,5460,5532,5599,5897,8803,10868,12628,13005"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2637,2638,2643,2646,2651,3059,3060,4128,4296,4339,4376,4413",
- "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",
- "startOffsets": "10501,10573,16280,16349,24945,25015,25083,25155,25225,25286,25360,32648,32709,32770,32832,32896,32958,33019,33087,33187,33247,33313,33386,33455,33512,33564,34606,34678,34754,34819,34878,34937,34997,35057,35117,35177,35237,35297,35357,35417,35477,35537,35596,35656,35716,35776,35836,35896,35956,36016,36076,36136,36196,36255,36315,36375,36434,36493,36552,36611,36670,37132,37167,37742,37797,37860,37915,37973,38030,38080,38141,38198,38232,38410,39656,53620,172458,172575,172842,173135,173402,199972,200044,261441,277301,280207,282668,284428",
- "endLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2637,2641,2643,2649,2651,3059,3060,4134,4338,4370,4412,4419",
- "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24,24",
- "endOffsets": "10568,10656,16344,16407,25010,25078,25150,25220,25281,25355,25428,32704,32765,32827,32891,32953,33014,33082,33182,33242,33308,33381,33450,33507,33559,33621,34673,34749,34814,34873,34932,34992,35052,35112,35172,35232,35292,35352,35412,35472,35532,35591,35651,35711,35771,35831,35891,35951,36011,36071,36131,36191,36250,36310,36370,36429,36488,36547,36606,36665,36724,37162,37197,37792,37855,37910,37968,38025,38075,38136,38193,38227,38262,38440,39721,53686,172570,172771,172947,173331,173526,200039,200106,261734,280202,282267,284423,284800"
+ "startLines": "883,889,890,894,2316,2320,2369,2373,2795,2799,2803,2807,2811,2815,2819,3335,3338",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "55097,55336,55426,55576,146368,146576,150401,150608,179347,179530,179715,179900,180103,180309,180492,214568,214751",
+ "endLines": "888,889,893,894,2319,2323,2372,2375,2798,2802,2806,2810,2814,2818,2822,3337,3341",
+ "endColumns": "12,89,12,79,12,12,12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "55331,55421,55571,55651,146571,146782,150603,150763,179525,179710,179895,180098,180304,180487,180688,214746,214983"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "23,19,20,21,22,18",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "998,788,840,892,945,730",
- "endColumns": "49,50,50,51,51,56",
- "endOffsets": "1043,834,886,939,992,782"
+ "startLines": "-1,-1",
+ "startColumns": "-1,-1",
+ "startOffsets": "-1,-1"
},
"to": {
- "startLines": "212,269,270,271,272,319",
- "startColumns": "4,4,4,4,4,4",
- "startOffsets": "10980,14850,14901,14952,15004,18069",
- "endColumns": "49,50,50,51,51,56",
- "endOffsets": "11025,14896,14947,14999,15051,18121"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "150,345",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "340,460"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "18,145,146,95,99,98,96,97,30,31,32,142,143,154,153,27,37,105,106,104,103,102,118,117,116,108,51,49,85,40,41,110,52,101,144,94,147,148,90,88,64,63,60,53,69,74,54,84,83,82,78,77,75,76,79,62,80,66,70,93,81,67,89,91,59,58,73,72,71,87,57,86,55,56,61,92,68,23,24,26,25,28,39,29,45,48,44,46,43,42,36,35,125,124,128,141,133,132,134,135,137,136,126,127,131,129,130,123,138,139,65,152,150,149,151,38,107,115,120,119,122,114,113,112,111,33,34",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "841,9360,9417,5440,5800,5703,5537,5633,1668,1712,1765,9190,9240,9863,9811,1520,2130,6260,6355,6188,6103,6019,7234,7150,7047,6533,2897,2813,4813,2337,2391,6614,2960,5916,9304,5368,9474,9531,5115,5001,3618,3561,3391,3020,3871,4177,3079,4741,4679,4621,4395,4342,4237,4291,4446,3505,4497,3723,3919,5301,4558,3769,5051,5171,3341,3293,4121,4032,3973,4938,3242,4892,3137,3181,3449,5233,3821,1254,1317,1443,1368,1569,2281,1620,2606,2759,2558,2662,2501,2452,2074,2020,7697,7629,7941,9093,8310,8228,8385,8475,8719,8639,7782,7858,8168,8006,8087,7573,8864,8987,3677,9769,9640,9582,9694,2215,6464,6960,7371,7301,7478,6900,6844,6781,6720,1818,1929",
- "endLines": "22,145,146,95,99,98,96,97,30,31,32,142,143,154,153,27,37,105,106,104,103,102,118,117,116,108,51,49,85,40,41,110,52,101,144,94,147,148,90,88,64,63,60,53,69,74,54,84,83,82,78,77,75,76,79,62,80,66,70,93,81,67,89,91,59,58,73,72,71,87,57,86,55,56,61,92,68,23,24,26,25,28,39,29,45,48,44,46,43,42,36,35,125,124,128,141,133,132,134,135,137,136,126,127,131,129,130,123,138,139,65,152,150,149,151,38,107,115,120,119,122,114,113,112,111,33,34",
- "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,49,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1248,9411,9468,5531,5878,5794,5627,5697,1706,1759,1812,9234,9298,9916,9857,1563,2209,6349,6458,6254,6182,6097,7295,7228,7144,6589,2954,2859,4886,2385,2446,6714,3014,6013,9354,5434,9525,9576,5165,5045,3671,3612,3443,3073,3913,4231,3131,4807,4735,4673,4440,4389,4285,4336,4491,3555,4552,3763,3967,5362,4615,3815,5109,5227,3385,3335,4171,4115,4026,4995,3287,4932,3175,3236,3499,5295,3865,1311,1362,1514,1437,1614,2331,1662,2656,2807,2600,2710,2552,2495,2124,2068,7776,7691,8000,9184,8379,8304,8469,8633,8858,8713,7852,7935,8222,8081,8162,7623,8981,9085,3717,9805,9688,9634,9763,2275,6527,7041,7446,7365,7567,6954,6894,6838,6775,1923,2014"
+ "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "669,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "39726,42876,42932,43041,43137,43220,43316,43411,43480,43523,43575,44061,44359,44613,44671,44722,44770,45062,45156,45264,45773,45857,45940,46006,46089,46664,46725,46787,46838,46916,46969,47029,47134,47193,47448,47503,47574,47630,47680,47735,47784,47842,47898,47955,48013,48060,48119,48176,48247,48308,48365,48415,48467,48520,48570,48620,48675,48735,48780,48833,48899,48961,49012,49075,49136,49185,49232,49287,49375,49433,49495,49545,49590,49633,49693,49748,49815,49945,50007,50057,50133,50207,50257,50312,50359,50414,50467,50514,50567,50623,50671,50726,51635,51719,51786,51850,51946,52020,52101,52190,52353,52497,52576,52651,52733,52792,52872,52952,53007,53129,53232,53277,53318,53371,53481,53555,53691,53759,53845,53925,53994,54088,54147,54202,54264,54324,54434",
- "endLines": "673,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
- "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,49,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "40113,42927,42983,43132,43215,43311,43406,43475,43518,43570,43622,44105,44417,44666,44717,44765,44849,45151,45259,45330,45852,45935,46001,46084,46186,46720,46782,46833,46911,46964,47024,47129,47188,47290,47498,47569,47625,47675,47730,47779,47837,47893,47950,48008,48055,48114,48171,48242,48303,48360,48410,48462,48515,48565,48615,48670,48730,48775,48828,48894,48956,49007,49070,49131,49180,49227,49282,49370,49428,49490,49540,49585,49628,49688,49743,49810,49859,50002,50052,50128,50202,50252,50307,50354,50409,50462,50509,50562,50618,50666,50721,50774,51714,51781,51845,51941,52015,52096,52185,52348,52492,52571,52646,52728,52787,52867,52947,53002,53124,53227,53272,53313,53366,53423,53550,53615,53754,53840,53920,53989,54083,54142,54197,54259,54319,54429,54519"
+ "startLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,879,1155,1156,1157,1162,1163,1167,1173,1177,1178,1179,1180,1191,1192,1193,1197,1203,1207,1277,1278,1279,1309,1329,1375,1405,1425,1445,1491,1495,2235,2249,2290,2298,2493,2494,2495,2496,2651,2654,2655,2658,2661,2662,2665,2669,2674,2682,2690,2699,2707,2711,2719,2727,2735,2743,2751,2760,2769,2777,2786,2852,2854,2859,2861,2866,2870,2874,2875,2880,2881,2882,2883,2884,2885,2887,2888,2893,2894,2895,2896,2897,2898,2899,2901,2905,2909,2913,2931,2932,2933,2934,2935,2936,2937,2938,2939,2942,2946,2949,3059,3067,3074,3083,3087,3102,3110,3113,3122,3127,3138,3146,3149,3158,3165,3166,3185,3188,3194,3197,3206,3209,3212,3215,3218,3221,3225,3228,3237,3240,3248,3253,3261,3266,3270,3271,3282,3289,3293,3297,3298,3302,3310,3314,3319,3324",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "1219,1275,1335,1396,1824,1877,1935,1983,2538,2628,8045,8103,8163,8436,8482,8542,8595,8641,8691,8738,8796,8854,8913,8973,9035,9097,9159,9221,9283,9345,9406,9468,9530,9846,11919,11993,12056,12124,12205,12269,12335,12405,12475,12545,12615,15583,15646,15711,15777,15830,15906,15972,16059,25340,25394,25473,25551,25624,25689,25752,25818,25889,25960,26022,26091,26157,26224,26291,26347,26398,26451,26503,26557,26628,26691,26750,26812,26871,26944,27011,27071,27134,27209,27281,27352,27408,27479,27536,27593,27659,27723,27794,27851,27904,27967,28019,28077,29545,29611,29677,29758,29833,29889,29942,30003,30061,30111,30160,30209,30258,30320,30372,30417,30498,30552,30605,30659,30710,30759,30810,30871,30932,30994,31044,31085,31135,31183,31245,31296,31345,31414,31475,31531,31602,31667,31736,31787,31850,31920,31989,32059,32121,32191,32261,32336,37057,37115,37463,37508,38122,38169,38214,38598,38772,38838,39017,39080,39152,39209,39266,39326,39384,39454,43482,43632,44277,44381,46205,46362,47150,49719,50633,50711,51012,51178,51333,54820,72659,72752,72859,73202,73309,73538,73947,74179,74279,74384,74503,75101,75248,75367,75602,76017,76255,81470,81591,81724,83808,85304,88543,90623,92131,93655,96890,97114,142321,143125,144885,145335,159475,159548,159635,159720,171585,171780,171872,172045,172207,172302,172471,172714,173007,173416,173830,174262,174680,174921,175351,175786,176196,176618,177028,177457,177883,178299,178737,182849,182917,183261,183341,183697,183847,183991,184075,184440,184538,184646,184744,184854,184970,185096,185192,185569,185679,185803,185941,186051,186173,186301,186439,186601,186817,186973,188246,188330,188434,188528,188642,188754,188878,188974,189054,189243,189449,189642,197986,198418,198839,199264,199461,200409,200930,201053,201690,201911,202726,203195,203378,203974,204434,204539,205800,205950,206367,206532,207212,207371,207462,207546,207742,207909,208131,208291,208668,208827,209155,209372,209947,210297,210546,210643,211349,211787,212028,212217,212351,212542,213179,213429,213732,213947",
+ "endLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,882,1155,1156,1161,1162,1166,1172,1176,1177,1178,1179,1190,1191,1192,1196,1202,1206,1207,1277,1278,1308,1328,1374,1404,1424,1444,1490,1494,1498,2248,2289,2297,2307,2493,2494,2495,2496,2653,2654,2657,2660,2661,2664,2668,2673,2681,2689,2698,2706,2710,2718,2726,2734,2742,2750,2759,2768,2776,2785,2788,2853,2858,2860,2865,2869,2873,2874,2879,2880,2881,2882,2883,2884,2886,2887,2892,2893,2894,2895,2896,2897,2898,2900,2904,2908,2912,2916,2931,2932,2933,2934,2935,2936,2937,2938,2941,2945,2948,2952,3066,3073,3082,3086,3101,3109,3112,3121,3126,3137,3145,3148,3157,3164,3165,3184,3187,3193,3196,3205,3208,3211,3214,3217,3220,3224,3227,3236,3239,3247,3252,3260,3265,3269,3270,3281,3288,3292,3296,3297,3301,3309,3313,3318,3323,3331",
+ "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10",
+ "endOffsets": "1270,1330,1391,1446,1872,1930,1978,2027,2578,2676,8098,8158,8216,8477,8537,8590,8636,8686,8733,8791,8849,8908,8968,9030,9092,9154,9216,9278,9340,9401,9463,9525,9578,9903,11988,12051,12119,12200,12264,12330,12400,12470,12540,12610,12677,15641,15706,15772,15825,15901,15967,16054,16130,25389,25468,25546,25619,25684,25747,25813,25884,25955,26017,26086,26152,26219,26286,26342,26393,26446,26498,26552,26623,26686,26745,26807,26866,26939,27006,27066,27129,27204,27276,27347,27403,27474,27531,27588,27654,27718,27789,27846,27899,27962,28014,28072,28139,29606,29672,29753,29828,29884,29937,29998,30056,30106,30155,30204,30253,30315,30367,30412,30493,30547,30600,30654,30705,30754,30805,30866,30927,30989,31039,31080,31130,31178,31240,31291,31340,31409,31470,31526,31597,31662,31731,31782,31845,31915,31984,32054,32116,32186,32256,32331,32390,37110,37172,37503,37546,38164,38209,38260,38641,38833,38895,39075,39147,39204,39261,39321,39379,39449,39506,43627,43758,44376,44463,46357,46514,47298,49795,50706,51007,51173,51328,51430,55092,72747,72854,73197,73304,73533,73942,74174,74274,74379,74498,75096,75243,75362,75597,76012,76250,76362,81586,81719,83803,85299,88538,90618,92126,93650,96885,97109,97346,143120,144880,145330,146045,159543,159630,159715,159814,171775,171867,172040,172202,172297,172466,172709,173002,173411,173825,174257,174675,174916,175346,175781,176191,176613,177023,177452,177878,178294,178732,178914,182912,183256,183336,183692,183842,183986,184070,184435,184533,184641,184739,184849,184965,185091,185187,185564,185674,185798,185936,186046,186168,186296,186434,186596,186812,186968,187172,188325,188429,188523,188637,188749,188873,188969,189049,189238,189444,189637,189847,198413,198834,199259,199456,200404,200925,201048,201685,201906,202721,203190,203373,203969,204429,204534,205795,205945,206362,206527,207207,207366,207457,207541,207737,207904,208126,208286,208663,208822,209150,209367,209942,210292,210541,210638,211344,211782,212023,212212,212346,212537,213174,213424,213727,213942,214418"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values\\values.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\themes.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1461,1462,1466,1470,1474,1479,1485,1492,1496,1500,1505,1509,1513,1517,1521,1525,1529,1535,1539,1545,1549,1555,1559,1564,1568,1571,1575,1581,1585,1591,1595,1601,1604,1608,1612,1616,1620,1624,1625,1626,1627,1630,1633,1636,1639,1643,1644,1645,1646,1647,1650,1652,1654,1656,1661,1662,1666,1672,1676,1677,1679,1690,1691,1695,1701,1705,1706,1707,1711,1738,1742,1743,1747,1775,1943,1969,2138,2164,2195,2203,2209,2223,2245,2250,2255,2265,2274,2283,2287,2294,2302,2309,2310,2319,2322,2325,2329,2333,2337,2340,2341,2345,2349,2359,2364,2371,2377,2378,2381,2385,2390,2392,2394,2397,2400,2402,2406,2409,2416,2419,2422,2426,2428,2432,2434,2436,2438,2442,2450,2458,2470,2476,2485,2488,2499,2502,2507,2508,2513,2571,2630,2631,2641,2650,2651,2653,2657,2660,2663,2666,2669,2672,2675,2678,2682,2685,2688,2691,2695,2698,2702,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2728,2730,2731,2732,2733,2734,2735,2736,2737,2739,2740,2742,2743,2745,2747,2748,2750,2751,2752,2753,2754,2755,2757,2758,2759,2760,2761,2762,2764,2766,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2780,2782,2783,2784,2785,2786,2787,2789,2793,2797,2798,2799,2800,2801,2802,2803,2804,2806,2808,2810,2812,2814,2815,2816,2817,2819,2821,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2837,2838,2839,2840,2842,2844,2845,2847,2848,2850,2852,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2865,2867,2868,2869,2870,2872,2873,2874,2875,2876,2878,2880,2882,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,69,152,155,158,161,175,186,196,223,230,241,271,298,307,344,725,730,756,774,810,816,822,845,986,1006,1012,1016,1022,1059,1071,1098,1103,1169,1184,1249,1268,1294",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "105,160,205,254,295,350,409,471,552,613,688,764,841,919,1004,1086,1162,1238,1315,1393,1499,1605,1684,1764,1821,1879,1953,2028,2093,2159,2219,2280,2352,2425,2492,2560,2619,2678,2737,2796,2855,2909,2963,3016,3070,3124,3178,3232,3306,3385,3458,3532,3603,3675,3747,3820,3877,3935,4008,4082,4156,4231,4303,4376,4446,4517,4577,70911,70980,71049,71119,71193,71269,71333,71410,71486,71563,71628,71697,71774,71849,71918,71986,72063,72129,72190,72287,72352,72421,72520,72591,72650,72708,72765,72824,72888,72959,73031,73103,73175,73247,73314,73382,73450,73509,73572,73636,73726,73817,73877,73943,74010,74076,74146,74210,74263,74376,74434,74497,74562,74627,74702,74775,74847,74896,74957,75018,75079,75141,75205,75269,75333,75398,75461,75521,75582,75648,75707,75767,75829,75900,75960,76028,76114,76201,76291,76378,76466,76548,76631,76721,76812,76864,76922,76967,77033,77097,77154,77211,77265,77322,77370,77419,77470,77504,77551,77600,77646,77678,77742,77804,77864,77921,77995,78065,78143,78197,78267,78352,78400,78446,78517,78595,78673,78745,78819,78893,78967,79047,79120,79189,79261,79338,79399,79462,79528,79592,79663,79726,79791,79855,79916,79977,80029,80102,80176,80245,80320,80394,80468,80609,80679,80732,80810,80900,80988,81084,81174,81756,81845,82092,82373,82625,82910,83303,83780,84002,84224,84500,84727,84957,85187,85417,85647,85874,86293,86519,86944,87174,87602,87821,88104,88312,88443,88670,89096,89321,89748,89969,90394,90514,90790,91091,91415,91706,92020,92157,92288,92393,92635,92802,93006,93214,93485,93597,93709,93814,93931,94145,94291,94431,94517,94865,94953,95199,95617,95866,95948,96046,96663,96763,97015,97439,97694,97788,97877,98114,100166,100408,100510,100763,102947,113668,115184,126004,127532,129289,129915,130335,131396,132661,132917,133153,133700,134194,134799,134997,135577,136141,136516,136634,137172,137329,137525,137798,138054,138224,138365,138429,138711,138997,139673,139937,140275,140628,140722,140908,141214,141476,141601,141728,141967,142178,142297,142490,142667,143122,143303,143425,143684,143797,143984,144086,144193,144322,144597,145105,145601,146478,146772,147342,147491,148223,148395,148731,148823,149101,153445,157932,157994,158624,159238,159329,159442,159671,159831,159983,160154,160320,160489,160656,160819,161062,161232,161405,161576,161850,162049,162254,162584,162668,162764,162860,162958,163058,163160,163262,163364,163466,163568,163668,163764,163876,164005,164128,164259,164390,164488,164602,164696,164836,164970,165066,165178,165278,165394,165490,165602,165702,165842,165978,166142,166272,166430,166580,166721,166865,167000,167112,167262,167390,167518,167654,167786,167916,168046,168158,168298,168444,168588,168726,168792,168882,168958,169062,169152,169254,169362,169470,169570,169650,169742,169840,169950,170028,170134,170226,170330,170440,170562,170725,170882,170962,171062,171152,171262,171356,171462,171554,171654,171766,171880,171996,172112,172206,172320,172432,172534,172654,172776,172858,172962,173082,173208,173306,173400,173488,173600,173716,173838,173950,174125,174241,174327,174419,174531,174655,174722,174848,174916,175044,175188,175316,175385,175480,175595,175708,175807,175916,176027,176138,176239,176344,176444,176574,176665,176788,176882,176994,177080,177184,177280,177368,177486,177590,177694,177820,177908,178016,178116,178206,178316,178400,178502,178586,178640,178704,178810,178920,179004,4638,9782,9900,10015,10147,10862,11554,12071,13718,14103,14700,16299,17832,18220,20527,40045,40305,41697,42730,44743,45005,45361,46191,52973,54107,54401,54624,54951,57001,57649,59282,59552,63403,64004,67813,69028,70437",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1460,1461,1465,1469,1473,1478,1484,1491,1495,1499,1504,1508,1512,1516,1520,1524,1528,1534,1538,1544,1548,1554,1558,1563,1567,1570,1574,1580,1584,1590,1594,1600,1603,1607,1611,1615,1619,1623,1624,1625,1626,1629,1632,1635,1638,1642,1643,1644,1645,1646,1649,1651,1653,1655,1660,1661,1665,1671,1675,1676,1678,1689,1690,1694,1700,1704,1705,1706,1710,1737,1741,1742,1746,1774,1942,1968,2137,2163,2194,2202,2208,2222,2244,2249,2254,2264,2273,2282,2286,2293,2301,2308,2309,2318,2321,2324,2328,2332,2336,2339,2340,2344,2348,2358,2363,2370,2376,2377,2380,2384,2389,2391,2393,2396,2399,2401,2405,2408,2415,2418,2421,2425,2427,2431,2433,2435,2437,2441,2449,2457,2469,2475,2484,2487,2498,2501,2506,2507,2512,2570,2629,2630,2640,2649,2650,2652,2656,2659,2662,2665,2668,2671,2674,2677,2681,2684,2687,2690,2694,2697,2701,2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2727,2729,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2744,2746,2747,2749,2750,2751,2752,2753,2754,2756,2757,2758,2759,2760,2761,2763,2765,2767,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,2781,2782,2783,2784,2785,2786,2788,2792,2796,2797,2798,2799,2800,2801,2802,2803,2805,2807,2809,2811,2813,2814,2815,2816,2818,2820,2822,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2836,2837,2838,2839,2841,2843,2844,2846,2847,2849,2851,2853,2854,2855,2856,2857,2858,2859,2860,2861,2862,2863,2864,2866,2867,2868,2869,2871,2872,2873,2874,2875,2877,2879,2881,2883,2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,151,154,157,160,174,185,195,222,229,240,270,297,306,343,724,729,755,773,809,815,821,844,985,1005,1011,1015,1021,1058,1070,1097,1102,1168,1183,1248,1267,1293,1302",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "155,200,249,290,345,404,466,547,608,683,759,836,914,999,1081,1157,1233,1310,1388,1494,1600,1679,1759,1816,1874,1948,2023,2088,2154,2214,2275,2347,2420,2487,2555,2614,2673,2732,2791,2850,2904,2958,3011,3065,3119,3173,3227,3301,3380,3453,3527,3598,3670,3742,3815,3872,3930,4003,4077,4151,4226,4298,4371,4441,4512,4572,4633,70975,71044,71114,71188,71264,71328,71405,71481,71558,71623,71692,71769,71844,71913,71981,72058,72124,72185,72282,72347,72416,72515,72586,72645,72703,72760,72819,72883,72954,73026,73098,73170,73242,73309,73377,73445,73504,73567,73631,73721,73812,73872,73938,74005,74071,74141,74205,74258,74371,74429,74492,74557,74622,74697,74770,74842,74891,74952,75013,75074,75136,75200,75264,75328,75393,75456,75516,75577,75643,75702,75762,75824,75895,75955,76023,76109,76196,76286,76373,76461,76543,76626,76716,76807,76859,76917,76962,77028,77092,77149,77206,77260,77317,77365,77414,77465,77499,77546,77595,77641,77673,77737,77799,77859,77916,77990,78060,78138,78192,78262,78347,78395,78441,78512,78590,78668,78740,78814,78888,78962,79042,79115,79184,79256,79333,79394,79457,79523,79587,79658,79721,79786,79850,79911,79972,80024,80097,80171,80240,80315,80389,80463,80604,80674,80727,80805,80895,80983,81079,81169,81751,81840,82087,82368,82620,82905,83298,83775,83997,84219,84495,84722,84952,85182,85412,85642,85869,86288,86514,86939,87169,87597,87816,88099,88307,88438,88665,89091,89316,89743,89964,90389,90509,90785,91086,91410,91701,92015,92152,92283,92388,92630,92797,93001,93209,93480,93592,93704,93809,93926,94140,94286,94426,94512,94860,94948,95194,95612,95861,95943,96041,96658,96758,97010,97434,97689,97783,97872,98109,100161,100403,100505,100758,102942,113663,115179,125999,127527,129284,129910,130330,131391,132656,132912,133148,133695,134189,134794,134992,135572,136136,136511,136629,137167,137324,137520,137793,138049,138219,138360,138424,138706,138992,139668,139932,140270,140623,140717,140903,141209,141471,141596,141723,141962,142173,142292,142485,142662,143117,143298,143420,143679,143792,143979,144081,144188,144317,144592,145100,145596,146473,146767,147337,147486,148218,148390,148726,148818,149096,153440,157927,157989,158619,159233,159324,159437,159666,159826,159978,160149,160315,160484,160651,160814,161057,161227,161400,161571,161845,162044,162249,162579,162663,162759,162855,162953,163053,163155,163257,163359,163461,163563,163663,163759,163871,164000,164123,164254,164385,164483,164597,164691,164831,164965,165061,165173,165273,165389,165485,165597,165697,165837,165973,166137,166267,166425,166575,166716,166860,166995,167107,167257,167385,167513,167649,167781,167911,168041,168153,168293,168439,168583,168721,168787,168877,168953,169057,169147,169249,169357,169465,169565,169645,169737,169835,169945,170023,170129,170221,170325,170435,170557,170720,170877,170957,171057,171147,171257,171351,171457,171549,171649,171761,171875,171991,172107,172201,172315,172427,172529,172649,172771,172853,172957,173077,173203,173301,173395,173483,173595,173711,173833,173945,174120,174236,174322,174414,174526,174650,174717,174843,174911,175039,175183,175311,175380,175475,175590,175703,175802,175911,176022,176133,176234,176339,176439,176569,176660,176783,176877,176989,177075,177179,177275,177363,177481,177585,177689,177815,177903,178011,178111,178201,178311,178395,178497,178581,178635,178699,178805,178915,178999,179119,9777,9895,10010,10142,10857,11549,12066,13713,14098,14695,16294,17827,18215,20522,40040,40300,41692,42725,44738,45000,45356,46186,52968,54102,54396,54619,54946,56996,57644,59277,59547,63398,63999,67808,69023,70432,70906"
+ "startLines": "-1,-1,-1",
+ "startColumns": "-1,-1,-1",
+ "startOffsets": "-1,-1,-1"
},
"to": {
- "startLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,895,903,904,908,912,923,928,934,941,945,949,954,958,962,966,970,974,978,984,988,994,998,1004,1008,1013,1017,1020,1024,1030,1034,1040,1044,1050,1053,1057,1061,1065,1069,1073,1074,1075,1076,1079,1082,1085,1088,1092,1093,1094,1095,1096,1099,1101,1103,1105,1110,1111,1115,1121,1125,1126,1128,1139,1140,1144,1150,1154,1208,1209,1213,1240,1244,1245,1249,1499,1667,1693,1862,1888,1919,1927,1933,1947,1969,1974,1979,1989,1998,2007,2011,2018,2026,2033,2034,2043,2046,2049,2053,2057,2061,2064,2065,2069,2073,2083,2088,2095,2101,2102,2105,2109,2114,2116,2118,2121,2124,2126,2130,2133,2140,2143,2146,2150,2152,2156,2158,2160,2162,2166,2174,2182,2194,2200,2209,2212,2223,2226,2231,2232,2378,2436,2499,2500,2510,2519,2526,2528,2532,2535,2538,2541,2544,2547,2550,2553,2557,2560,2563,2566,2570,2573,2577,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2601,2603,2605,2606,2607,2608,2609,2610,2611,2612,2614,2615,2617,2618,2620,2622,2623,2625,2626,2627,2628,2629,2630,2632,2633,2634,2635,2636,2791,2793,2795,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2839,2840,2841,2842,2843,2844,2846,2850,2926,2927,2928,2929,2930,2931,2932,2965,2967,2969,2971,2973,2975,2976,2977,2978,2980,2982,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2995,2998,2999,3000,3001,3003,3005,3006,3008,3009,3011,3013,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3026,3028,3029,3030,3031,3033,3034,3035,3036,3037,3039,3041,3043,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3345,3428,3431,3434,3437,3451,3462,3472,3499,3506,3538,3568,3595,3604,3641,4042,4135,4264,4421,4457,4463,4477,4500,4641,4662,4668,4672,4708,4747,4759,4786,4791,4881,4916,4981,5000,5026",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "2364,2695,2793,9728,9815,9870,9929,10053,10134,10195,10270,10346,10423,10661,10746,10828,10904,11030,11107,11185,11291,11397,11476,11556,11613,12827,12901,12976,13041,14449,14509,14570,14642,14715,14782,15056,15115,15174,15233,15292,15351,15405,15459,15512,15566,15620,15674,16619,16693,16772,16845,16919,16990,17062,17134,17207,17264,17322,17395,17469,17543,17618,17690,17763,17833,17948,18008,19495,19564,19633,19703,19777,19853,19917,19994,20070,20147,20212,20281,20358,20433,20502,20570,20647,20713,20774,20871,20936,21005,21104,21175,21234,21292,21349,21408,21472,21543,21615,21687,21759,21831,21898,21966,22034,22093,22156,22220,22310,22401,22461,22527,22594,22660,22730,22794,22847,22960,23018,23081,23146,23211,23286,23359,23431,23480,23541,23602,23663,23725,23789,23853,23917,23982,24045,24105,24166,24232,24291,24351,24413,24484,24544,28289,28375,28760,28850,28937,29025,29107,29190,29280,34153,34205,34263,34308,34374,34438,34495,34552,36729,36786,36834,36883,37032,37365,37412,37696,38711,38791,38855,39045,39105,40118,40192,40262,40340,40394,40464,40549,40597,40643,40714,40792,40870,40942,41016,41090,41164,41244,41317,41386,41458,41535,41596,41659,41725,41789,41860,41923,41988,42052,42113,42174,42226,42299,42373,42442,42517,42591,42665,42806,53428,54524,54602,54692,54780,54876,55837,56419,56508,56755,57036,57702,57987,58380,58857,59079,59301,59577,59804,60034,60264,60494,60724,60951,61370,61596,62021,62251,62679,62898,63181,63389,63520,63747,64173,64398,64825,65046,65471,65591,65867,66168,66492,66783,67097,67234,67365,67470,67712,67879,68083,68291,68562,68674,68786,68891,69008,69222,69368,69508,69594,69942,70030,70276,70694,70943,71025,71123,71740,71840,72092,72516,72771,76598,76687,76924,78976,79218,79320,79573,97974,108695,110211,121031,122559,124316,124942,125362,126423,127688,127944,128180,128727,129221,129826,130024,130604,131168,131543,131661,132199,132356,132552,132825,133081,133251,133392,133456,133738,134024,134700,134964,135302,135655,135749,135935,136241,136503,136628,136755,136994,137205,137324,137517,137694,138149,138330,138452,138711,138824,139011,139113,139220,139349,139624,140132,140628,141505,141799,142369,142518,143250,143422,143758,143850,152575,156919,161750,161812,162442,163056,163489,163602,163831,163991,164143,164314,164480,164649,164816,164979,165222,165392,165565,165736,166010,166209,166414,166744,166828,166924,167020,167118,167218,167320,167422,167524,167626,167728,167828,167924,168036,168165,168288,168419,168550,168648,168762,168856,168996,169130,169226,169338,169438,169554,169650,169762,169862,170002,170138,170302,170432,170590,170740,170881,171025,171160,171272,171422,171550,171678,171814,171946,172076,172206,172318,181044,181190,181334,182818,182884,182974,183050,183154,183244,183346,183454,183562,183662,183742,183834,183932,184042,184120,184226,184318,184422,184532,184654,184817,189699,189779,189879,189969,190079,190173,190279,192402,192502,192614,192728,192844,192960,193054,193168,193280,193382,193502,193624,193706,193810,193930,194056,194154,194248,194336,194448,194564,194686,194798,194973,195089,195175,195267,195379,195503,195570,195696,195764,195892,196036,196164,196233,196328,196443,196556,196655,196764,196875,196986,197087,197192,197292,197422,197513,197636,197730,197842,197928,198032,198128,198216,198334,198438,198542,198668,198756,198864,198964,199054,199164,199248,199350,199434,199488,199552,199658,199768,199852,217360,222504,222622,222737,222869,223584,224276,224793,226440,226825,228473,230072,231605,231993,234300,255252,261739,275053,284913,286926,287188,289518,290348,297130,298831,299125,299348,301417,303802,304450,306083,306353,312133,314782,318591,319806,321215",
- "endLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,902,903,907,911,915,927,933,940,944,948,953,957,961,965,969,973,977,983,987,993,997,1003,1007,1012,1016,1019,1023,1029,1033,1039,1043,1049,1052,1056,1060,1064,1068,1072,1073,1074,1075,1078,1081,1084,1087,1091,1092,1093,1094,1095,1098,1100,1102,1104,1109,1110,1114,1120,1124,1125,1127,1138,1139,1143,1149,1153,1154,1208,1212,1239,1243,1244,1248,1276,1666,1692,1861,1887,1918,1926,1932,1946,1968,1973,1978,1988,1997,2006,2010,2017,2025,2032,2033,2042,2045,2048,2052,2056,2060,2063,2064,2068,2072,2082,2087,2094,2100,2101,2104,2108,2113,2115,2117,2120,2123,2125,2129,2132,2139,2142,2145,2149,2151,2155,2157,2159,2161,2165,2173,2181,2193,2199,2208,2211,2222,2225,2230,2231,2236,2435,2494,2499,2509,2518,2519,2527,2531,2534,2537,2540,2543,2546,2549,2552,2556,2559,2562,2565,2569,2572,2576,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2602,2604,2605,2606,2607,2608,2609,2610,2611,2613,2614,2616,2617,2619,2621,2622,2624,2625,2626,2627,2628,2629,2631,2632,2633,2634,2635,2636,2792,2794,2796,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2838,2839,2840,2841,2842,2843,2845,2849,2853,2926,2927,2928,2929,2930,2931,2932,2966,2968,2970,2972,2974,2975,2976,2977,2979,2981,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2994,2997,2998,2999,3000,3002,3004,3005,3007,3008,3010,3012,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3025,3027,3028,3029,3030,3032,3033,3034,3035,3036,3038,3040,3042,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056,3057,3058,3427,3430,3433,3436,3450,3461,3471,3498,3505,3516,3567,3594,3603,3640,4021,4046,4160,4281,4456,4462,4468,4499,4640,4660,4667,4671,4677,4744,4758,4785,4790,4856,4895,4980,4999,5025,5034",
- "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24",
- "endOffsets": "2414,2735,2837,9764,9865,9924,9986,10129,10190,10265,10341,10418,10496,10741,10823,10899,10975,11102,11180,11286,11392,11471,11551,11608,11666,12896,12971,13036,13102,14504,14565,14637,14710,14777,14845,15110,15169,15228,15287,15346,15400,15454,15507,15561,15615,15669,15723,16688,16767,16840,16914,16985,17057,17129,17202,17259,17317,17390,17464,17538,17613,17685,17758,17828,17899,18003,18064,19559,19628,19698,19772,19848,19912,19989,20065,20142,20207,20276,20353,20428,20497,20565,20642,20708,20769,20866,20931,21000,21099,21170,21229,21287,21344,21403,21467,21538,21610,21682,21754,21826,21893,21961,22029,22088,22151,22215,22305,22396,22456,22522,22589,22655,22725,22789,22842,22955,23013,23076,23141,23206,23281,23354,23426,23475,23536,23597,23658,23720,23784,23848,23912,23977,24040,24100,24161,24227,24286,24346,24408,24479,24539,24607,28370,28457,28845,28932,29020,29102,29185,29275,29366,34200,34258,34303,34369,34433,34490,34547,34601,36781,36829,36878,36929,37061,37407,37456,37737,38738,38850,38912,39100,39157,40187,40257,40335,40389,40459,40544,40592,40638,40709,40787,40865,40937,41011,41085,41159,41239,41312,41381,41453,41530,41591,41654,41720,41784,41855,41918,41983,42047,42108,42169,42221,42294,42368,42437,42512,42586,42660,42801,42871,53476,54597,54687,54775,54871,54961,56414,56503,56750,57031,57283,57982,58375,58852,59074,59296,59572,59799,60029,60259,60489,60719,60946,61365,61591,62016,62246,62674,62893,63176,63384,63515,63742,64168,64393,64820,65041,65466,65586,65862,66163,66487,66778,67092,67229,67360,67465,67707,67874,68078,68286,68557,68669,68781,68886,69003,69217,69363,69503,69589,69937,70025,70271,70689,70938,71020,71118,71735,71835,72087,72511,72766,72860,76682,76919,78971,79213,79315,79568,81752,108690,110206,121026,122554,124311,124937,125357,126418,127683,127939,128175,128722,129216,129821,130019,130599,131163,131538,131656,132194,132351,132547,132820,133076,133246,133387,133451,133733,134019,134695,134959,135297,135650,135744,135930,136236,136498,136623,136750,136989,137200,137319,137512,137689,138144,138325,138447,138706,138819,139006,139108,139215,139344,139619,140127,140623,141500,141794,142364,142513,143245,143417,143753,143845,144123,156914,161401,161807,162437,163051,163142,163597,163826,163986,164138,164309,164475,164644,164811,164974,165217,165387,165560,165731,166005,166204,166409,166739,166823,166919,167015,167113,167213,167315,167417,167519,167621,167723,167823,167919,168031,168160,168283,168414,168545,168643,168757,168851,168991,169125,169221,169333,169433,169549,169645,169757,169857,169997,170133,170297,170427,170585,170735,170876,171020,171155,171267,171417,171545,171673,171809,171941,172071,172201,172313,172453,181185,181329,181467,182879,182969,183045,183149,183239,183341,183449,183557,183657,183737,183829,183927,184037,184115,184221,184313,184417,184527,184649,184812,184969,189774,189874,189964,190074,190168,190274,190366,192497,192609,192723,192839,192955,193049,193163,193275,193377,193497,193619,193701,193805,193925,194051,194149,194243,194331,194443,194559,194681,194793,194968,195084,195170,195262,195374,195498,195565,195691,195759,195887,196031,196159,196228,196323,196438,196551,196650,196759,196870,196981,197082,197187,197287,197417,197508,197631,197725,197837,197923,198027,198123,198211,198329,198433,198537,198663,198751,198859,198959,199049,199159,199243,199345,199429,199483,199547,199653,199763,199847,199967,222499,222617,222732,222864,223579,224271,224788,226435,226820,227417,230067,231600,231988,234295,253813,255507,263126,276081,286921,287183,287539,290343,297125,298259,299120,299343,299670,303462,304445,306078,306348,310199,312729,318586,319801,321210,321684"
+ "startLines": "2917,2918,2953",
+ "startColumns": "4,4,4",
+ "startOffsets": "187177,187247,189852",
+ "endLines": "2917,2923,2956",
+ "endColumns": "69,12,12",
+ "endOffsets": "187242,187569,190082"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\656f7c140db38b557c6f895c5997c1ff\\transformed\\drawerlayout-1.1.1\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\8847e733ac2464c2340f833a9a6b91dc\\transformed\\recyclerview-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,111,159,211",
- "endLines": "2,3,4,8",
- "endColumns": "55,47,51,24",
- "endOffsets": "106,154,206,426"
+ "startLines": "-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "46,47,429,4282",
- "startColumns": "4,4,4,4",
- "startOffsets": "2419,2475,25433,276086",
- "endLines": "46,47,429,4285",
- "endColumns": "55,47,51,24",
- "endOffsets": "2470,2518,25480,276301"
+ "startLines": "479,480,481,489,490,491,619",
+ "startColumns": "4,4,4,4,4,4,4",
+ "startOffsets": "28452,28511,28559,29226,29301,29377,36921",
+ "endColumns": "58,47,55,74,75,71,65",
+ "endOffsets": "28506,28554,28610,29296,29372,29444,36982"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\8847e733ac2464c2340f833a9a6b91dc\\transformed\\recyclerview-1.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "30,31,32,33,34,35,36,2",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "1535,1594,1642,1698,1773,1849,1921,55",
- "endLines": "30,31,32,33,34,35,36,29",
- "endColumns": "58,47,55,74,75,71,65,24",
- "endOffsets": "1589,1637,1693,1768,1844,1916,1982,1530"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "479,480,481,489,490,491,619,4678",
- "startColumns": "4,4,4,4,4,4,4,4",
- "startOffsets": "28597,28656,28704,29371,29446,29522,37066,299675",
- "endLines": "479,480,481,489,490,491,619,4705",
- "endColumns": "58,47,55,74,75,71,65,24",
- "endOffsets": "28651,28699,28755,29441,29517,29589,37127,301150"
+ "startLines": "35,221,222,223,224,419,420,421,916,2308,2310,2313",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "1724,11526,11587,11649,11711,24630,24689,24746,57107,146050,146114,146240",
+ "endLines": "35,221,222,223,224,419,420,421,922,2309,2312,2315",
+ "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12",
+ "endOffsets": "1771,11582,11644,11706,11770,24684,24741,24795,57516,146109,146235,146363"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\53c79fecd0f35b4ed434f8248fa7ecfb\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\d90a65d4ba4f9f63b01827ac34e90871\\transformed\\jetified-matisse-0.5.2-beta4\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,109,131,134,137,140",
- "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",
- "startOffsets": "55,126,197,261,315,385,457,531,592,668,730,807,880,941,1000,1052,1134,1215,1261,1331,1410,1480,1541,1598,1666,1744,1804,1876,1956,2006,2081,2152,2211,2261,2337,2423,2498,2548,2603,2659,2721,2787,2864,2932,2991,3046,3112,3188,3246,3316,3394,3442,3511,3584,3653,3710,3758,3832,3916,3989,4037,4090,4139,4186,4235,4288,4341,4396,4441,4482,4535,4586,4637,4690,4742,4808,4898,4986,5071,5178,5276,5336,5433,5495,5549,7412,9163,9333,9505,9601",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,108,130,133,136,139,142",
- "endColumns": "70,70,63,53,69,71,73,60,75,61,76,72,60,58,51,81,80,45,69,78,69,60,56,67,77,59,71,79,49,74,70,58,49,75,85,74,49,54,55,61,65,76,67,58,54,65,75,57,69,77,47,68,72,68,56,47,73,83,72,47,52,48,46,48,52,52,54,44,40,52,50,50,52,51,65,89,87,84,106,97,59,96,61,53,12,12,12,12,12,12",
- "endOffsets": "121,192,256,310,380,452,526,587,663,725,802,875,936,995,1047,1129,1210,1256,1326,1405,1475,1536,1593,1661,1739,1799,1871,1951,2001,2076,2147,2206,2256,2332,2418,2493,2543,2598,2654,2716,2782,2859,2927,2986,3041,3107,3183,3241,3311,3389,3437,3506,3579,3648,3705,3753,3827,3911,3984,4032,4085,4134,4181,4230,4283,4336,4391,4436,4477,4530,4581,4632,4685,4737,4803,4893,4981,5066,5173,5271,5331,5428,5490,5544,7407,9158,9328,9500,9596,9690"
+ "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",
+ "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",
+ "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"
},
"to": {
- "startLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2326,2349,2520,2523,2959,2962",
+ "startLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2324,2347,2518,2521,2957,2960",
"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",
- "startOffsets": "577,648,719,783,837,907,1563,1637,1698,1774,2842,2919,2992,8131,8366,8418,8500,9769,13107,13177,13256,13326,13387,13444,13512,13590,13650,13722,13802,13852,13927,13998,14057,14107,14183,14269,14344,14394,16501,16557,18126,18192,18269,18337,18396,18451,18517,18593,18651,18721,18799,18847,18916,18989,19058,19115,19163,19237,19321,19394,19442,24726,29594,29641,42988,43908,43961,44016,44110,44151,44204,44255,44306,44854,44906,44972,45335,45423,45508,45615,45713,46191,46288,51581,148594,150457,163147,163317,192212,192308",
- "endLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2348,2370,2522,2525,2961,2964",
+ "startOffsets": "465,536,607,671,725,795,1451,1525,1586,1662,2730,2807,2880,7986,8221,8273,8355,9624,12962,13032,13111,13181,13242,13299,13367,13445,13505,13577,13657,13707,13782,13853,13912,13962,14038,14124,14199,14249,16356,16412,17981,18047,18124,18192,18251,18306,18372,18448,18506,18576,18654,18702,18771,18844,18913,18970,19018,19092,19176,19249,19297,24581,29449,29496,42843,43763,43816,43871,43965,44006,44059,44110,44161,44709,44761,44827,45190,45278,45363,45470,45568,46046,46143,51435,146787,148650,161134,161304,190087,190183",
+ "endLines": "12,13,14,15,16,17,31,32,33,34,56,57,58,167,171,172,173,195,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,296,297,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,418,492,493,715,726,727,728,730,731,732,733,734,742,743,744,748,749,750,751,752,758,759,836,2346,2368,2520,2523,2959,2962",
"endColumns": "70,70,63,53,69,71,73,60,75,61,76,72,60,58,51,81,80,45,69,78,69,60,56,67,77,59,71,79,49,74,70,58,49,75,85,74,49,54,55,61,65,76,67,58,54,65,75,57,69,77,47,68,72,68,56,47,73,83,72,47,52,48,46,48,52,52,54,44,40,52,50,50,52,51,65,89,87,84,106,97,59,96,61,53,12,12,12,12,12,12",
- "endOffsets": "643,714,778,832,902,974,1632,1693,1769,1831,2914,2987,3048,8185,8413,8495,8576,9810,13172,13251,13321,13382,13439,13507,13585,13645,13717,13797,13847,13922,13993,14052,14102,14178,14264,14339,14389,14444,16552,16614,18187,18264,18332,18391,18446,18512,18588,18646,18716,18794,18842,18911,18984,19053,19110,19158,19232,19316,19389,19437,19490,24770,29636,29685,43036,43956,44011,44056,44146,44199,44250,44301,44354,44901,44967,45057,45418,45503,45610,45708,45768,46283,46345,51630,150452,152203,163312,163484,192303,192397"
+ "endOffsets": "531,602,666,720,790,862,1520,1581,1657,1719,2802,2875,2936,8040,8268,8350,8431,9665,13027,13106,13176,13237,13294,13362,13440,13500,13572,13652,13702,13777,13848,13907,13957,14033,14119,14194,14244,14299,16407,16469,18042,18119,18187,18246,18301,18367,18443,18501,18571,18649,18697,18766,18839,18908,18965,19013,19087,19171,19244,19292,19345,24625,29491,29540,42891,43811,43866,43911,44001,44054,44105,44156,44209,44756,44822,44912,45273,45358,45465,45563,45623,46138,46200,51484,148645,150396,161299,161471,190178,190272"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\5829027e9bc4104ac7715c543b8358de\\transformed\\coordinatorlayout-1.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\87c9b5cf7927446432e906fee083466c\\transformed\\core-1.3.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,102,3,13",
- "startColumns": "4,4,4,4",
- "startOffsets": "55,5935,116,724",
- "endLines": "2,104,12,101",
- "endColumns": "60,12,24,24",
- "endOffsets": "111,6075,719,5930"
+ "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",
+ "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",
+ "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"
},
"to": {
- "startLines": "44,3335,4164,4174",
- "startColumns": "4,4,4,4",
- "startOffsets": "2303,216795,269103,269711",
- "endLines": "44,3337,4173,4262",
- "endColumns": "60,12,24,24",
- "endOffsets": "2359,216935,269706,274917"
+ "startLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2635,2636,2641,2644,2649,3057,3058",
+ "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",
+ "startOffsets": "10356,10428,16135,16204,24800,24870,24938,25010,25080,25141,25215,32503,32564,32625,32687,32751,32813,32874,32942,33042,33102,33168,33241,33310,33367,33419,34461,34533,34609,34674,34733,34792,34852,34912,34972,35032,35092,35152,35212,35272,35332,35392,35451,35511,35571,35631,35691,35751,35811,35871,35931,35991,36051,36110,36170,36230,36289,36348,36407,36466,36525,36987,37022,37597,37652,37715,37770,37828,37885,37935,37996,38053,38087,38265,39511,53474,170445,170562,170829,171122,171389,197847,197919",
+ "endLines": "206,207,293,294,422,423,424,425,426,427,428,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,620,621,633,634,635,636,637,638,639,640,641,642,646,668,862,2635,2639,2641,2647,2649,3057,3058",
+ "endColumns": "71,87,68,62,69,67,71,69,60,73,72,60,60,61,63,61,60,67,99,59,65,72,68,56,51,61,71,75,64,58,58,59,59,59,59,59,59,59,59,59,59,58,59,59,59,59,59,59,59,59,59,59,58,59,59,58,58,58,58,58,58,34,34,54,62,54,57,56,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66",
+ "endOffsets": "10423,10511,16199,16262,24865,24933,25005,25075,25136,25210,25283,32559,32620,32682,32746,32808,32869,32937,33037,33097,33163,33236,33305,33362,33414,33476,34528,34604,34669,34728,34787,34847,34907,34967,35027,35087,35147,35207,35267,35327,35387,35446,35506,35566,35626,35686,35746,35806,35866,35926,35986,36046,36105,36165,36225,36284,36343,36402,36461,36520,36579,37017,37052,37647,37710,37765,37823,37880,37930,37991,38048,38082,38117,38295,39576,53540,170557,170758,170934,171318,171513,197914,197981"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\30d1ee0d1e89d746174a8183792b431a\\transformed\\transition-1.0.0\\res\\values\\values.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,95,138,185,240,285,339,391,440,501",
- "endColumns": "39,42,46,54,44,53,51,48,60,49",
- "endOffsets": "90,133,180,235,280,334,386,435,496,546"
+ "startLines": "-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "616,624,627,628,629,647,648,649,650,651",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "36934,37322,37461,37508,37563,38445,38499,38551,38600,38661",
- "endColumns": "39,42,46,54,44,53,51,48,60,49",
- "endOffsets": "36969,37360,37503,37558,37603,38494,38546,38595,38656,38706"
+ "startLines": "212,269,270,271,272,319",
+ "startColumns": "4,4,4,4,4,4",
+ "startOffsets": "10835,14705,14756,14807,14859,17924",
+ "endColumns": "49,50,50,51,51,56",
+ "endOffsets": "10880,14751,14802,14854,14906,17976"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\30d1ee0d1e89d746174a8183792b431a\\transformed\\transition-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "81,93,88,95,54,59,68,64,24,29,34,39,44,19,49,73,77",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "3359,3797,3641,3891,2120,2334,2716,2551,921,1110,1301,1492,1701,732,1913,2930,3118",
- "endLines": "86,93,91,95,57,62,71,66,27,32,37,42,47,22,52,75,80",
- "endColumns": "12,90,12,80,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "3633,3883,3789,3967,2326,2543,2922,2708,1102,1293,1484,1693,1905,913,2112,3110,3353"
+ "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "883,889,890,894,2318,2322,2371,2375,2797,2801,2805,2809,2813,2817,2821,3338,3341",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55243,55517,55607,55757,148175,148383,152208,152415,181472,181655,181840,182025,182228,182434,182617,216940,217123",
- "endLines": "888,889,893,894,2321,2325,2374,2377,2800,2804,2808,2812,2816,2820,2824,3340,3344",
- "endColumns": "12,89,12,79,12,12,12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "55512,55602,55752,55832,148378,148589,152410,152570,181650,181835,182020,182223,182429,182612,182813,217118,217355"
+ "startLines": "616,624,627,628,629,647,648,649,650,651",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "36789,37177,37316,37363,37418,38300,38354,38406,38455,38516",
+ "endColumns": "39,42,46,54,44,53,51,48,60,49",
+ "endOffsets": "36824,37215,37358,37413,37458,38349,38401,38450,38511,38561"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\7328fcb887502cd83900f08693815d36\\transformed\\material-1.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\68abc4c76a3a76864cad873b02a95549\\transformed\\appcompat-1.0.0\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,345,346,347,352,353,357,363,367,368,369,370,381,382,383,387,393,397,398,399,400,430,450,496,526,546,566,612,616,620,634,675,683,693,694,695,696,697,700,701,704,707,708,711,715,720,728,736,745,753,757,765,773,781,789,797,806,815,823,832,835,837,842,844,849,853,857,858,863,864,865,866,867,868,870,871,876,877,878,879,880,881,882,884,888,892,896,900,901,902,903,904,905,906,907,908,911,915,918,922,930,937,946,950,965,973,976,985,990,1001,1009,1012,1021,1028,1029,1048,1051,1057,1060,1069,1072,1075,1078,1081,1084,1088,1091,1100,1103,1111,1116,1124,1129,1133,1134,1145,1152,1156,1160,1161,1165,1173,1177,1182,1187,55,56,57,76,82,92,96,97,98,141,149,150,158,159,160,161,167,168,169,170,171,172,173,174,175,198,217",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "100,156,216,277,332,385,443,491,540,585,638,696,756,814,860,920,973,1019,1069,1116,1174,1232,1291,1351,1413,1475,1537,1599,1661,1723,1784,1846,1908,1961,2023,2097,2160,2228,2309,2373,2439,2509,2579,2649,2719,2786,2849,2914,2980,3033,3109,3175,3262,18372,18426,18505,18583,18656,18721,18784,18850,18921,18992,19054,19123,19189,19256,19323,19379,19430,19483,19535,19589,19660,19723,19782,19844,19903,19976,20043,20103,20166,20241,20313,20384,20440,20511,20568,20625,20691,20755,20826,20883,20936,20999,21051,21109,21176,21242,21308,21389,21464,21520,21573,21634,21692,21742,21791,21840,21889,21951,22003,22048,22129,22183,22236,22290,22341,22390,22441,22502,22563,22625,22675,22716,22766,22814,22876,22927,22976,23045,23106,23162,23233,23298,23367,23418,23481,23551,23620,23690,23752,23822,23892,23967,24026,24084,24146,24191,24234,24281,24326,24377,24425,24491,24553,24616,24688,24745,24802,24862,24920,24990,25047,25197,25328,25432,25519,25676,25833,25986,26067,26145,26446,26612,26767,26869,27146,27239,27346,27689,27796,28025,28434,28666,28766,28871,28990,29613,29760,29879,30114,30529,30767,30879,31000,31133,33276,34792,38088,40227,41755,43299,46591,46837,47096,47900,49660,50110,50825,50898,50985,51070,51169,51364,51456,51629,51791,51886,52055,52298,52591,53000,53414,53874,54292,54533,54963,55398,55808,56230,56640,57097,57551,57967,58433,58615,58683,59027,59107,59463,59613,59757,59841,60206,60304,60412,60510,60620,60736,60862,60958,61335,61445,61569,61707,61817,61939,62067,62205,62367,62583,62739,62943,63027,63131,63225,63339,63451,63575,63671,63751,63940,64146,64339,64549,64981,65402,65827,66024,66972,67493,67616,68253,68474,69289,69758,69941,70537,70997,71102,72363,72513,72930,73095,73775,73934,74096,74251,74447,74614,74836,74996,75373,75532,75860,76077,76652,77002,77251,77348,78054,78492,78733,78922,79056,79247,79884,80134,80437,80652,3338,3636,3892,4389,4823,5480,5823,7362,7710,9607,9929,10060,10766,10903,11055,11257,11962,12082,13231,13798,13927,14060,14220,14395,14537,16324,18162",
- "endLines": "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,344,345,346,351,352,356,362,366,367,368,369,380,381,382,386,392,396,397,398,399,429,449,495,525,545,565,611,615,619,633,674,682,692,693,694,695,696,699,700,703,706,707,710,714,719,727,735,744,752,756,764,772,780,788,796,805,814,822,831,834,836,841,843,848,852,856,857,862,863,864,865,866,867,869,870,875,876,877,878,879,880,881,883,887,891,895,899,900,901,902,903,904,905,906,907,910,914,917,921,929,936,945,949,964,972,975,984,989,1000,1008,1011,1020,1027,1028,1047,1050,1056,1059,1068,1071,1074,1077,1080,1083,1087,1090,1099,1102,1110,1115,1123,1128,1132,1133,1144,1151,1155,1159,1160,1164,1172,1176,1181,1186,1195,55,56,75,81,91,95,96,97,140,148,149,157,158,159,160,166,167,168,169,170,171,172,173,174,197,216,217",
- "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10,297,255,90,243,367,188,1538,347,95,94,130,412,136,151,201,220,119,1148,566,128,132,159,174,141,125,457,209",
- "endOffsets": "151,211,272,327,380,438,486,535,580,633,691,751,809,855,915,968,1014,1064,1111,1169,1227,1286,1346,1408,1470,1532,1594,1656,1718,1779,1841,1903,1956,2018,2092,2155,2223,2304,2368,2434,2504,2574,2644,2714,2781,2844,2909,2975,3028,3104,3170,3257,3333,18421,18500,18578,18651,18716,18779,18845,18916,18987,19049,19118,19184,19251,19318,19374,19425,19478,19530,19584,19655,19718,19777,19839,19898,19971,20038,20098,20161,20236,20308,20379,20435,20506,20563,20620,20686,20750,20821,20878,20931,20994,21046,21104,21171,21237,21303,21384,21459,21515,21568,21629,21687,21737,21786,21835,21884,21946,21998,22043,22124,22178,22231,22285,22336,22385,22436,22497,22558,22620,22670,22711,22761,22809,22871,22922,22971,23040,23101,23157,23228,23293,23362,23413,23476,23546,23615,23685,23747,23817,23887,23962,24021,24079,24141,24186,24229,24276,24321,24372,24420,24486,24548,24611,24683,24740,24797,24857,24915,24985,25042,25192,25323,25427,25514,25671,25828,25981,26062,26140,26441,26607,26762,26864,27141,27234,27341,27684,27791,28020,28429,28661,28761,28866,28985,29608,29755,29874,30109,30524,30762,30874,30995,31128,33271,34787,38083,40222,41750,43294,46586,46832,47091,47895,49655,50105,50820,50893,50980,51065,51164,51359,51451,51624,51786,51881,52050,52293,52586,52995,53409,53869,54287,54528,54958,55393,55803,56225,56635,57092,57546,57962,58428,58610,58678,59022,59102,59458,59608,59752,59836,60201,60299,60407,60505,60615,60731,60857,60953,61330,61440,61564,61702,61812,61934,62062,62200,62362,62578,62734,62938,63022,63126,63220,63334,63446,63570,63666,63746,63935,64141,64334,64544,64976,65397,65822,66019,66967,67488,67611,68248,68469,69284,69753,69936,70532,70992,71097,72358,72508,72925,73090,73770,73929,74091,74246,74442,74609,74831,74991,75368,75527,75855,76072,76647,76997,77246,77343,78049,78487,78728,78917,79051,79242,79879,80129,80432,80647,81228,3631,3887,4384,4818,5475,5818,7357,7705,9602,9924,10055,10761,10898,11050,11252,11957,12077,13226,13793,13922,14055,14215,14390,14532,16319,18157,18367"
+ "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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,879,1155,1156,1157,1162,1163,1167,1173,1177,1178,1179,1180,1191,1192,1193,1197,1203,1207,1277,1278,1279,1309,1329,1375,1405,1425,1445,1491,1495,2237,2251,2292,2300,2495,2496,2497,2498,2653,2656,2657,2660,2663,2664,2667,2671,2676,2684,2692,2701,2709,2713,2721,2729,2737,2745,2753,2762,2771,2779,2788,2854,2856,2861,2863,2868,2872,2876,2877,2882,2883,2884,2885,2886,2887,2889,2890,2895,2896,2897,2898,2899,2900,2901,2903,2907,2911,2915,2933,2934,2935,2936,2937,2938,2939,2940,2941,2944,2948,2951,3061,3069,3076,3085,3089,3104,3112,3115,3124,3129,3140,3148,3151,3160,3167,3168,3187,3190,3196,3199,3208,3211,3214,3217,3220,3223,3227,3230,3239,3242,3250,3255,3263,3268,3272,3273,3284,3291,3295,3299,3300,3304,3312,3316,3321,3326,3517,3518,3519,4022,4028,4038,4075,4076,4077,4120,4263,4286,4294,4295,4371,4469,4475,4476,4661,4706,4707,4745,4746,4857,4858,4896,4915",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "1331,1387,1447,1508,1936,1989,2047,2095,2650,2740,8190,8248,8308,8581,8627,8687,8740,8786,8836,8883,8941,8999,9058,9118,9180,9242,9304,9366,9428,9490,9551,9613,9675,9991,12064,12138,12201,12269,12350,12414,12480,12550,12620,12690,12760,15728,15791,15856,15922,15975,16051,16117,16204,25485,25539,25618,25696,25769,25834,25897,25963,26034,26105,26167,26236,26302,26369,26436,26492,26543,26596,26648,26702,26773,26836,26895,26957,27016,27089,27156,27216,27279,27354,27426,27497,27553,27624,27681,27738,27804,27868,27939,27996,28049,28112,28164,28222,29690,29756,29822,29903,29978,30034,30087,30148,30206,30256,30305,30354,30403,30465,30517,30562,30643,30697,30750,30804,30855,30904,30955,31016,31077,31139,31189,31230,31280,31328,31390,31441,31490,31559,31620,31676,31747,31812,31881,31932,31995,32065,32134,32204,32266,32336,32406,32481,37202,37260,37608,37653,38267,38314,38359,38743,38917,38983,39162,39225,39297,39354,39411,39471,39529,39599,43627,43777,44422,44526,46350,46507,47295,49864,50779,50857,51158,51324,51479,54966,72865,72958,73065,73408,73515,73744,74153,74385,74485,74590,74709,75332,75479,75598,75833,76248,76486,81757,81878,82011,84154,85670,88966,91105,92633,94177,97469,97715,144128,144932,146692,147142,161406,161479,161566,161651,173598,173793,173885,174058,174220,174315,174484,174727,175020,175429,175843,176303,176721,176962,177392,177827,178237,178659,179069,179526,179980,180396,180862,184974,185042,185386,185466,185822,185972,186116,186200,186565,186663,186771,186869,186979,187095,187221,187317,187694,187804,187928,188066,188176,188298,188426,188564,188726,188942,189098,190371,190455,190559,190653,190767,190879,191003,191099,191179,191368,191574,191767,200111,200543,200964,201389,201586,202534,203055,203178,203815,204036,204851,205320,205503,206099,206559,206664,207925,208075,208492,208657,209337,209496,209658,209813,210009,210176,210398,210558,210935,211094,211422,211639,212214,212564,212813,212910,213616,214054,214295,214484,214618,214809,215446,215696,215999,216214,227422,227720,227976,253818,254252,254909,257335,258874,259222,261119,274922,276306,277012,277149,282272,287544,288249,288369,298264,301155,301284,303467,303627,310204,310346,312734,314572",
- "endLines": "27,28,29,30,37,38,39,40,52,54,168,169,170,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,199,228,229,230,231,232,233,234,235,236,237,238,285,286,287,288,289,290,291,292,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,622,623,630,631,643,644,645,653,656,657,660,661,662,663,664,665,666,667,724,725,736,737,760,761,771,815,831,832,833,834,835,882,1155,1156,1161,1162,1166,1172,1176,1177,1178,1179,1190,1191,1192,1196,1202,1206,1207,1277,1278,1308,1328,1374,1404,1424,1444,1490,1494,1498,2250,2291,2299,2309,2495,2496,2497,2498,2655,2656,2659,2662,2663,2666,2670,2675,2683,2691,2700,2708,2712,2720,2728,2736,2744,2752,2761,2770,2778,2787,2790,2855,2860,2862,2867,2871,2875,2876,2881,2882,2883,2884,2885,2886,2888,2889,2894,2895,2896,2897,2898,2899,2900,2902,2906,2910,2914,2918,2933,2934,2935,2936,2937,2938,2939,2940,2943,2947,2950,2954,3068,3075,3084,3088,3103,3111,3114,3123,3128,3139,3147,3150,3159,3166,3167,3186,3189,3195,3198,3207,3210,3213,3216,3219,3222,3226,3229,3238,3241,3249,3254,3262,3267,3271,3272,3283,3290,3294,3298,3299,3303,3311,3315,3320,3325,3334,3517,3518,3537,4027,4037,4041,4075,4076,4119,4127,4263,4293,4294,4295,4371,4474,4475,4476,4661,4706,4707,4745,4746,4857,4880,4914,4915",
- "endColumns": "55,59,60,54,52,57,47,48,44,52,57,59,57,45,59,52,45,49,46,57,57,58,59,61,61,61,61,61,61,60,61,61,52,61,73,62,67,80,63,65,69,69,69,69,66,62,64,65,52,75,65,86,75,53,78,77,72,64,62,65,70,70,61,68,65,66,66,55,50,52,51,53,70,62,58,61,58,72,66,59,62,74,71,70,55,70,56,56,65,63,70,56,52,62,51,57,66,65,65,80,74,55,52,60,57,49,48,48,48,61,51,44,80,53,52,53,50,48,50,60,60,61,49,40,49,47,61,50,48,68,60,55,70,64,68,50,62,69,68,69,61,69,69,74,58,57,61,44,42,46,44,50,47,65,61,62,71,56,56,59,57,69,56,149,130,103,86,156,156,152,80,77,300,165,154,101,10,92,106,10,106,10,10,10,99,104,118,10,146,118,10,10,10,111,120,132,10,10,10,10,10,10,10,10,10,10,10,10,10,72,86,84,98,10,91,10,10,94,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,83,10,97,107,97,109,115,10,95,10,109,123,137,109,121,127,10,10,10,10,10,83,103,93,113,111,123,95,79,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,104,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,96,10,10,10,10,133,10,10,10,10,10,10,297,255,90,243,367,188,1538,347,95,94,130,412,136,151,201,220,119,1148,566,128,132,159,174,141,125,457,209",
- "endOffsets": "1382,1442,1503,1558,1984,2042,2090,2139,2690,2788,8243,8303,8361,8622,8682,8735,8781,8831,8878,8936,8994,9053,9113,9175,9237,9299,9361,9423,9485,9546,9608,9670,9723,10048,12133,12196,12264,12345,12409,12475,12545,12615,12685,12755,12822,15786,15851,15917,15970,16046,16112,16199,16275,25534,25613,25691,25764,25829,25892,25958,26029,26100,26162,26231,26297,26364,26431,26487,26538,26591,26643,26697,26768,26831,26890,26952,27011,27084,27151,27211,27274,27349,27421,27492,27548,27619,27676,27733,27799,27863,27934,27991,28044,28107,28159,28217,28284,29751,29817,29898,29973,30029,30082,30143,30201,30251,30300,30349,30398,30460,30512,30557,30638,30692,30745,30799,30850,30899,30950,31011,31072,31134,31184,31225,31275,31323,31385,31436,31485,31554,31615,31671,31742,31807,31876,31927,31990,32060,32129,32199,32261,32331,32401,32476,32535,37255,37317,37648,37691,38309,38354,38405,38786,38978,39040,39220,39292,39349,39406,39466,39524,39594,39651,43772,43903,44521,44608,46502,46659,47443,49940,50852,51153,51319,51474,51576,55238,72953,73060,73403,73510,73739,74148,74380,74480,74585,74704,75327,75474,75593,75828,76243,76481,76593,81873,82006,84149,85665,88961,91100,92628,94172,97464,97710,97969,144927,146687,147137,147852,161474,161561,161646,161745,173788,173880,174053,174215,174310,174479,174722,175015,175424,175838,176298,176716,176957,177387,177822,178232,178654,179064,179521,179975,180391,180857,181039,185037,185381,185461,185817,185967,186111,186195,186560,186658,186766,186864,186974,187090,187216,187312,187689,187799,187923,188061,188171,188293,188421,188559,188721,188937,189093,189297,190450,190554,190648,190762,190874,190998,191094,191174,191363,191569,191762,191972,200538,200959,201384,201581,202529,203050,203173,203810,204031,204846,205315,205498,206094,206554,206659,207920,208070,208487,208652,209332,209491,209653,209808,210004,210171,210393,210553,210930,211089,211417,211634,212209,212559,212808,212905,213611,214049,214290,214479,214613,214804,215441,215691,215994,216209,216790,227715,227971,228468,254247,254904,255247,258869,259217,261114,261436,275048,277007,277144,277296,282469,288244,288364,289513,298826,301279,301412,303622,303797,310341,312128,314567,314777"
+ "startLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,895,903,904,908,912,923,928,934,941,945,949,954,958,962,966,970,974,978,984,988,994,998,1004,1008,1013,1017,1020,1024,1030,1034,1040,1044,1050,1053,1057,1061,1065,1069,1073,1074,1075,1076,1079,1082,1085,1088,1092,1093,1094,1095,1096,1099,1101,1103,1105,1110,1111,1115,1121,1125,1126,1128,1139,1140,1144,1150,1154,1208,1209,1213,1240,1244,1245,1249,1499,1666,1692,1860,1886,1917,1925,1931,1945,1967,1972,1977,1987,1996,2005,2009,2016,2024,2031,2032,2041,2044,2047,2051,2055,2059,2062,2063,2067,2071,2081,2086,2093,2099,2100,2103,2107,2112,2114,2116,2119,2122,2124,2128,2131,2138,2141,2144,2148,2150,2154,2156,2158,2160,2164,2172,2180,2192,2198,2207,2210,2221,2224,2229,2230,2376,2434,2497,2498,2508,2517,2524,2526,2530,2533,2536,2539,2542,2545,2548,2551,2555,2558,2561,2564,2568,2571,2575,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2601,2603,2604,2605,2606,2607,2608,2609,2610,2612,2613,2615,2616,2618,2620,2621,2623,2624,2625,2626,2627,2628,2630,2631,2632,2633,2634,2789,2791,2793,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2837,2838,2839,2840,2841,2842,2844,2848,2924,2925,2926,2927,2928,2929,2930,2963,2965,2967,2969,2971,2973,2974,2975,2976,2978,2980,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2993,2996,2997,2998,2999,3001,3003,3004,3006,3007,3009,3011,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3024,3026,3027,3028,3029,3031,3032,3033,3034,3035,3037,3039,3041,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "2252,2583,2681,9583,9670,9725,9784,9908,9989,10050,10125,10201,10278,10516,10601,10683,10759,10885,10962,11040,11146,11252,11331,11411,11468,12682,12756,12831,12896,14304,14364,14425,14497,14570,14637,14911,14970,15029,15088,15147,15206,15260,15314,15367,15421,15475,15529,16474,16548,16627,16700,16774,16845,16917,16989,17062,17119,17177,17250,17324,17398,17473,17545,17618,17688,17803,17863,19350,19419,19488,19558,19632,19708,19772,19849,19925,20002,20067,20136,20213,20288,20357,20425,20502,20568,20629,20726,20791,20860,20959,21030,21089,21147,21204,21263,21327,21398,21470,21542,21614,21686,21753,21821,21889,21948,22011,22075,22165,22256,22316,22382,22449,22515,22585,22649,22702,22815,22873,22936,23001,23066,23141,23214,23286,23335,23396,23457,23518,23580,23644,23708,23772,23837,23900,23960,24021,24087,24146,24206,24268,24339,24399,28144,28230,28615,28705,28792,28880,28962,29045,29135,34008,34060,34118,34163,34229,34293,34350,34407,36584,36641,36689,36738,36887,37220,37267,37551,38566,38646,38710,38900,38960,39973,40047,40117,40195,40249,40319,40404,40452,40498,40569,40647,40725,40797,40871,40945,41019,41099,41172,41241,41313,41390,41451,41514,41580,41644,41715,41778,41843,41907,41968,42029,42081,42154,42228,42297,42372,42446,42520,42661,53282,54378,54456,54546,54634,54730,55656,56238,56327,56574,56855,57521,57806,58199,58676,58898,59120,59396,59623,59853,60083,60313,60543,60770,61189,61415,61840,62070,62498,62717,63000,63208,63339,63566,63992,64217,64644,64865,65290,65410,65686,65987,66311,66602,66916,67053,67184,67289,67531,67698,67902,68110,68381,68493,68605,68710,68827,69041,69187,69327,69413,69761,69849,70095,70513,70762,70844,70942,71534,71634,71886,72310,72565,76367,76456,76693,78717,78959,79061,79314,97351,107480,108996,119224,120752,122509,123135,123555,124616,125881,126137,126373,126920,127414,128019,128217,128797,129361,129736,129854,130392,130549,130745,131018,131274,131444,131585,131649,131931,132217,132893,133157,133495,133848,133942,134128,134434,134696,134821,134948,135187,135398,135517,135710,135887,136342,136523,136645,136904,137017,137204,137306,137413,137542,137817,138325,138821,139698,139992,140562,140711,141443,141615,141951,142043,150768,155050,159819,159881,160459,161043,161476,161589,161818,161978,162130,162301,162467,162636,162803,162966,163209,163379,163552,163723,163997,164196,164401,164731,164815,164911,165007,165105,165205,165307,165409,165511,165613,165715,165815,165911,166023,166152,166275,166406,166537,166635,166749,166843,166983,167117,167213,167325,167425,167541,167637,167749,167849,167989,168125,168289,168419,168577,168727,168868,169012,169147,169259,169409,169537,169665,169801,169933,170063,170193,170305,178919,179065,179209,180693,180759,180849,180925,181029,181119,181221,181329,181437,181537,181617,181709,181807,181917,181995,182101,182193,182297,182407,182529,182692,187574,187654,187754,187844,187954,188048,188154,190277,190377,190489,190603,190719,190835,190929,191043,191155,191257,191377,191499,191581,191685,191805,191931,192029,192123,192211,192323,192439,192561,192673,192848,192964,193050,193142,193254,193378,193445,193571,193639,193767,193911,194039,194108,194203,194318,194431,194530,194639,194750,194861,194962,195067,195167,195297,195388,195511,195605,195717,195803,195907,196003,196091,196209,196313,196417,196543,196631,196739,196839,196929,197039,197123,197225,197309,197363,197427,197533,197643,197727",
+ "endLines": "45,53,55,194,196,197,198,200,201,202,203,204,205,208,209,210,211,213,214,215,216,217,218,219,220,239,240,241,242,263,264,265,266,267,268,273,274,275,276,277,278,279,280,281,282,283,284,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,317,318,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,474,475,482,483,484,485,486,487,488,569,570,571,572,573,574,575,576,612,613,614,615,618,625,626,632,652,654,655,658,659,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,859,874,875,876,877,878,902,903,907,911,915,927,933,940,944,948,953,957,961,965,969,973,977,983,987,993,997,1003,1007,1012,1016,1019,1023,1029,1033,1039,1043,1049,1052,1056,1060,1064,1068,1072,1073,1074,1075,1078,1081,1084,1087,1091,1092,1093,1094,1095,1098,1100,1102,1104,1109,1110,1114,1120,1124,1125,1127,1138,1139,1143,1149,1153,1154,1208,1212,1239,1243,1244,1248,1276,1665,1691,1859,1885,1916,1924,1930,1944,1966,1971,1976,1986,1995,2004,2008,2015,2023,2030,2031,2040,2043,2046,2050,2054,2058,2061,2062,2066,2070,2080,2085,2092,2098,2099,2102,2106,2111,2113,2115,2118,2121,2123,2127,2130,2137,2140,2143,2147,2149,2153,2155,2157,2159,2163,2171,2179,2191,2197,2206,2209,2220,2223,2228,2229,2234,2433,2492,2497,2507,2516,2517,2525,2529,2532,2535,2538,2541,2544,2547,2550,2554,2557,2560,2563,2567,2570,2574,2578,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2600,2602,2603,2604,2605,2606,2607,2608,2609,2611,2612,2614,2615,2617,2619,2620,2622,2623,2624,2625,2626,2627,2629,2630,2631,2632,2633,2634,2790,2792,2794,2823,2824,2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2836,2837,2838,2839,2840,2841,2843,2847,2851,2924,2925,2926,2927,2928,2929,2930,2964,2966,2968,2970,2972,2973,2974,2975,2977,2979,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,2995,2996,2997,2998,3000,3002,3003,3005,3006,3008,3010,3012,3013,3014,3015,3016,3017,3018,3019,3020,3021,3022,3023,3025,3026,3027,3028,3030,3031,3032,3033,3034,3036,3038,3040,3042,3043,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3056",
+ "endColumns": "54,44,48,40,54,58,61,80,60,74,75,76,77,84,81,75,75,76,77,105,105,78,79,56,57,73,74,64,65,59,60,71,72,66,67,58,58,58,58,58,53,53,52,53,53,53,53,73,78,72,73,70,71,71,72,56,57,72,73,73,74,71,72,69,70,59,60,68,68,69,73,75,63,76,75,76,64,68,76,74,68,67,76,65,60,96,64,68,98,70,58,57,56,58,63,70,71,71,71,71,66,67,67,58,62,63,89,90,59,65,66,65,69,63,52,112,57,62,64,64,74,72,71,48,60,60,60,61,63,63,63,64,62,59,60,65,58,59,61,70,59,67,85,86,89,86,87,81,82,89,90,51,57,44,65,63,56,56,53,56,47,48,50,33,46,48,45,31,63,61,59,56,73,69,77,53,69,84,47,45,70,77,77,71,73,73,73,79,72,68,71,76,60,62,65,63,70,62,64,63,60,60,51,72,73,68,74,73,73,140,69,52,77,89,87,95,89,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,136,130,104,12,12,12,12,12,111,111,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,88,12,12,12,101,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,63,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,91,12,12,12,61,12,12,90,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,130,130,97,113,93,12,12,95,111,99,115,95,111,99,12,135,12,129,12,12,140,12,134,111,149,127,127,12,131,129,129,111,139,12,12,12,65,89,75,103,89,101,107,107,99,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,93,105,91,12,12,12,12,12,93,113,111,12,12,12,81,103,119,125,97,93,87,111,115,121,111,12,115,85,91,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,99,12,90,122,93,12,85,103,95,87,12,12,12,12,87,107,99,89,109,83,101,83,53,63,105,109,83,119",
+ "endOffsets": "2302,2623,2725,9619,9720,9779,9841,9984,10045,10120,10196,10273,10351,10596,10678,10754,10830,10957,11035,11141,11247,11326,11406,11463,11521,12751,12826,12891,12957,14359,14420,14492,14565,14632,14700,14965,15024,15083,15142,15201,15255,15309,15362,15416,15470,15524,15578,16543,16622,16695,16769,16840,16912,16984,17057,17114,17172,17245,17319,17393,17468,17540,17613,17683,17754,17858,17919,19414,19483,19553,19627,19703,19767,19844,19920,19997,20062,20131,20208,20283,20352,20420,20497,20563,20624,20721,20786,20855,20954,21025,21084,21142,21199,21258,21322,21393,21465,21537,21609,21681,21748,21816,21884,21943,22006,22070,22160,22251,22311,22377,22444,22510,22580,22644,22697,22810,22868,22931,22996,23061,23136,23209,23281,23330,23391,23452,23513,23575,23639,23703,23767,23832,23895,23955,24016,24082,24141,24201,24263,24334,24394,24462,28225,28312,28700,28787,28875,28957,29040,29130,29221,34055,34113,34158,34224,34288,34345,34402,34456,36636,36684,36733,36784,36916,37262,37311,37592,38593,38705,38767,38955,39012,40042,40112,40190,40244,40314,40399,40447,40493,40564,40642,40720,40792,40866,40940,41014,41094,41167,41236,41308,41385,41446,41509,41575,41639,41710,41773,41838,41902,41963,42024,42076,42149,42223,42292,42367,42441,42515,42656,42726,53330,54451,54541,54629,54725,54815,56233,56322,56569,56850,57102,57801,58194,58671,58893,59115,59391,59618,59848,60078,60308,60538,60765,61184,61410,61835,62065,62493,62712,62995,63203,63334,63561,63987,64212,64639,64860,65285,65405,65681,65982,66306,66597,66911,67048,67179,67284,67526,67693,67897,68105,68376,68488,68600,68705,68822,69036,69182,69322,69408,69756,69844,70090,70508,70757,70839,70937,71529,71629,71881,72305,72560,72654,76451,76688,78712,78954,79056,79309,81465,107475,108991,119219,120747,122504,123130,123550,124611,125876,126132,126368,126915,127409,128014,128212,128792,129356,129731,129849,130387,130544,130740,131013,131269,131439,131580,131644,131926,132212,132888,133152,133490,133843,133937,134123,134429,134691,134816,134943,135182,135393,135512,135705,135882,136337,136518,136640,136899,137012,137199,137301,137408,137537,137812,138320,138816,139693,139987,140557,140706,141438,141610,141946,142038,142316,155045,159470,159876,160454,161038,161129,161584,161813,161973,162125,162296,162462,162631,162798,162961,163204,163374,163547,163718,163992,164191,164396,164726,164810,164906,165002,165100,165200,165302,165404,165506,165608,165710,165810,165906,166018,166147,166270,166401,166532,166630,166744,166838,166978,167112,167208,167320,167420,167536,167632,167744,167844,167984,168120,168284,168414,168572,168722,168863,169007,169142,169254,169404,169532,169660,169796,169928,170058,170188,170300,170440,179060,179204,179342,180754,180844,180920,181024,181114,181216,181324,181432,181532,181612,181704,181802,181912,181990,182096,182188,182292,182402,182524,182687,182844,187649,187749,187839,187949,188043,188149,188241,190372,190484,190598,190714,190830,190924,191038,191150,191252,191372,191494,191576,191680,191800,191926,192024,192118,192206,192318,192434,192556,192668,192843,192959,193045,193137,193249,193373,193440,193566,193634,193762,193906,194034,194103,194198,194313,194426,194525,194634,194745,194856,194957,195062,195162,195292,195383,195506,195600,195712,195798,195902,195998,196086,196204,196308,196412,196538,196626,196734,196834,196924,197034,197118,197220,197304,197358,197422,197528,197638,197722,197842"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\1bbf379c87dedbe80347cf20a1163be0\\transformed\\constraintlayout-1.1.3\\res\\values\\values.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "2,3,11,12,13,14,15,19,20,21,22,25,26,29,32,33,34,35,36,39,42,43,44,45,50,53,56,57,58,63,64,65,68,71,72,75,78,81,84,85,88,91,92,97,98,103,106,109,110,111,112,113,114,115,116,117,118,127,128,129,130",
- "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",
- "startOffsets": "55,116,407,455,507,568,614,741,802,862,932,1065,1133,1262,1388,1450,1515,1583,1650,1773,1898,1965,2030,2095,2276,2397,2518,2584,2651,2861,2930,2996,3121,3247,3314,3440,3567,3692,3819,3884,4010,4133,4198,4406,4473,4653,4773,4893,4958,5020,5082,5144,5203,5263,5324,5385,5444,5819,8395,8527,11791",
- "endLines": "2,10,11,12,13,14,18,19,20,21,24,25,28,31,32,33,34,35,38,41,42,43,44,49,52,55,56,57,62,63,64,67,70,71,74,77,80,83,84,87,90,91,96,97,102,105,108,109,110,111,112,113,114,115,116,117,126,127,128,129,130",
- "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11,2575,131,3263,107",
- "endOffsets": "111,402,450,502,563,609,736,797,857,927,1060,1128,1257,1383,1445,1510,1578,1645,1768,1893,1960,2025,2090,2271,2392,2513,2579,2646,2856,2925,2991,3116,3242,3309,3435,3562,3687,3814,3879,4005,4128,4193,4401,4468,4648,4768,4888,4953,5015,5077,5139,5198,5258,5319,5380,5439,5814,8390,8522,11786,11894"
+ "startLines": "18,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "841,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1317,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endLines": "22,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,24,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+ "endOffsets": "1248,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1361,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "18,19,36,41,42,43,48,59,60,61,62,65,66,69,72,73,74,75,76,79,82,83,84,85,90,93,96,97,98,103,104,105,108,111,112,115,118,121,124,125,128,131,132,137,138,143,146,149,150,151,152,153,154,155,156,157,158,4161,4162,4163,4420",
- "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",
- "startOffsets": "979,1040,1888,2144,2196,2257,2523,3053,3114,3174,3244,3377,3445,3574,3700,3762,3827,3895,3962,4085,4210,4277,4342,4407,4588,4709,4830,4896,4963,5173,5242,5308,5433,5559,5626,5752,5879,6004,6131,6196,6322,6445,6510,6718,6785,6965,7085,7205,7270,7332,7394,7456,7515,7575,7636,7697,7756,263131,265707,265839,284805",
- "endLines": "18,26,36,41,42,43,51,59,60,61,64,65,68,71,72,73,74,75,78,81,82,83,84,89,92,95,96,97,102,103,104,107,110,111,114,117,120,123,124,127,130,131,136,137,142,145,148,149,150,151,152,153,154,155,156,157,166,4161,4162,4163,4420",
- "endColumns": "60,11,47,51,60,45,11,60,59,69,11,67,11,11,61,64,67,66,11,11,66,64,64,11,11,11,65,66,11,68,65,11,11,66,11,11,11,11,64,11,11,64,11,66,11,11,11,64,61,61,61,58,59,60,60,58,11,2575,131,3263,107",
- "endOffsets": "1035,1326,1931,2191,2252,2298,2645,3109,3169,3239,3372,3440,3569,3695,3757,3822,3890,3957,4080,4205,4272,4337,4402,4583,4704,4825,4891,4958,5168,5237,5303,5428,5554,5621,5747,5874,5999,6126,6191,6317,6440,6505,6713,6780,6960,7080,7200,7265,7327,7389,7451,7510,7570,7631,7692,7751,8126,265702,265834,269098,284908"
+ "startLines": "669,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "39581,42731,42787,42896,42992,43075,43171,43266,43335,43378,43430,43916,44214,44468,44526,44577,44625,44917,45011,45119,45628,45712,45795,45861,45944,46519,46580,46642,46693,46771,46824,46884,46989,47048,47303,47358,47429,47485,47535,47590,47639,47697,47753,47810,47868,47915,47974,48031,48102,48163,48220,48270,48322,48375,48425,48475,48530,48590,48635,48688,48754,48816,48867,48930,48991,49040,49087,49142,49230,49288,49350,49400,49445,49488,49548,49603,49670,49800,49862,49911,49987,50061,50111,50166,50213,50268,50321,50368,50421,50477,50525,50580,51489,51573,51640,51704,51800,51874,51955,52044,52207,52351,52430,52505,52587,52646,52726,52806,52861,52983,53086,53131,53172,53225,53335,53409,53545,53613,53699,53779,53848,53942,54001,54056,54118,54178,54288",
+ "endLines": "673,713,714,716,717,718,719,720,721,722,723,729,735,738,739,740,741,745,746,747,753,754,755,756,757,762,763,764,765,766,767,768,769,770,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,860,861,863,864,865,866,867,868,869,870,871,872,873",
+ "endColumns": "14,55,55,95,82,95,94,68,42,51,51,48,62,57,50,47,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,55,49,54,48,57,55,56,57,46,58,56,70,60,56,49,51,52,49,49,54,59,44,52,65,61,50,62,60,48,46,54,87,57,61,49,44,42,59,54,66,48,61,48,75,73,49,54,46,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,44,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "39968,42782,42838,42987,43070,43166,43261,43330,43373,43425,43477,43960,44272,44521,44572,44620,44704,45006,45114,45185,45707,45790,45856,45939,46041,46575,46637,46688,46766,46819,46879,46984,47043,47145,47353,47424,47480,47530,47585,47634,47692,47748,47805,47863,47910,47969,48026,48097,48158,48215,48265,48317,48370,48420,48470,48525,48585,48630,48683,48749,48811,48862,48925,48986,49035,49082,49137,49225,49283,49345,49395,49440,49483,49543,49598,49665,49714,49857,49906,49982,50056,50106,50161,50208,50263,50316,50363,50416,50472,50520,50575,50628,51568,51635,51699,51795,51869,51950,52039,52202,52346,52425,52500,52582,52641,52721,52801,52856,52978,53081,53126,53167,53220,53277,53404,53469,53608,53694,53774,53843,53937,53996,54051,54113,54173,54283,54373"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\656f7c140db38b557c6f895c5997c1ff\\transformed\\drawerlayout-1.1.1\\res\\values\\values.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
+ "startLines": "-1,-1,-1",
+ "startColumns": "-1,-1,-1",
+ "startOffsets": "-1,-1,-1"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "150,457",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "452,572"
+ "startLines": "46,47,429",
+ "startColumns": "4,4,4",
+ "startOffsets": "2307,2363,25288",
+ "endColumns": "55,47,51",
+ "endOffsets": "2358,2406,25335"
}
},
{
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\415894e42dd5c2a400e0eae80130f0f2\\transformed\\cardview-1.0.0\\res\\values\\values.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\7bd1a0e41b0fd55c93cf529ddb15a7aa\\transformed\\jetified-spiderman-1.0.2\\res\\values\\values.xml",
"from": {
- "startLines": "2,3,4,5,6,35,36,37,38,45,47,50,7",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,107,168,230,292,2179,2238,2295,2349,2763,2827,2953,356",
- "endLines": "2,3,4,5,6,35,36,37,44,46,49,52,34",
- "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
- "endOffsets": "102,163,225,287,351,2233,2290,2344,2758,2822,2948,3076,2174"
+ "startLines": "-1,-1,-1,-1,-1",
+ "startColumns": "-1,-1,-1,-1,-1",
+ "startOffsets": "-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "35,221,222,223,224,419,420,421,916,2310,2312,2315,4047",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "1836,11671,11732,11794,11856,24775,24834,24891,57288,147857,147921,148047,255512",
- "endLines": "35,221,222,223,224,419,420,421,922,2311,2314,2317,4074",
- "endColumns": "51,60,61,61,63,58,56,53,12,12,12,12,24",
- "endOffsets": "1883,11727,11789,11851,11915,24829,24886,24940,57697,147916,148042,148170,257330"
+ "startLines": "225,226,227,316,559",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "11775,11821,11868,17759,33481",
+ "endColumns": "45,46,50,43,52",
+ "endOffsets": "11816,11863,11914,17798,33529"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\themes.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "2,4,11",
- "startColumns": "4,4,4",
- "startOffsets": "19,93,428",
- "endLines": "2,9,14",
- "endColumns": "70,12,12",
- "endOffsets": "85,420,661"
+ "startLines": "-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",
+ "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
},
"to": {
- "startLines": "2919,2920,2955",
- "startColumns": "4,4,4",
- "startOffsets": "189302,189372,191977",
- "endLines": "2919,2925,2958",
- "endColumns": "69,12,12",
- "endOffsets": "189367,189694,192207"
+ "startLines": "416,417,476,477,478,542,543,564,565,566,567,568",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "24467,24525,28317,28359,28405,32395,32445,33746,33798,33851,33904,33956",
+ "endColumns": "57,55,41,45,46,49,57,51,52,52,51,51",
+ "endOffsets": "24520,24576,28354,28400,28447,32440,32498,33793,33846,33899,33951,34003"
}
},
{
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\attrs.xml",
+ "source": "C:\\Users\\小超人\\.gradle\\caches\\transforms-3\\b1fe022d8b933bedca75571d129b522a\\transformed\\jetified-glide-4.8.0\\res\\values\\values.xml",
"from": {
- "startLines": "1",
- "startColumns": "4",
- "startOffsets": "17",
- "endLines": "4",
- "endColumns": "24",
- "endOffsets": "211"
+ "startLines": "-1",
+ "startColumns": "-1",
+ "startOffsets": "-1"
},
"to": {
- "startLines": "4372",
+ "startLines": "617",
"startColumns": "4",
- "startOffsets": "282474",
- "endLines": "4375",
- "endColumns": "24",
- "endOffsets": "282663"
- }
- },
- {
- "source": "C:\\Users\\fanyi\\.gradle\\caches\\transforms-3\\e07d716be19ccd6ca157c39c2aad67bc\\transformed\\media-1.0.0\\res\\values\\values.xml",
- "from": {
- "startLines": "2,5,6,7,8,10,11,12,13,14",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "55,288,341,394,447,560,626,748,809,875",
- "endColumns": "88,52,52,52,52,65,121,60,65,66",
- "endOffsets": "139,336,389,442,495,621,743,804,870,937"
- },
- "to": {
- "startLines": "295,560,561,562,563,2642,2644,2645,2650,2652",
- "startColumns": "4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "16412,33679,33732,33785,33838,172776,172952,173074,173336,173531",
- "endColumns": "88,52,52,52,52,65,121,60,65,66",
- "endOffsets": "16496,33727,33780,33833,33886,172837,173069,173130,173397,173593"
+ "startOffsets": "36829",
+ "endColumns": "57",
+ "endOffsets": "36882"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index 38fb25e5..3e30bf4c 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -1,474 +1,474 @@
[
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_login.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_login.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_recycle.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_recycle.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_launcher.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_file_paths.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\file_paths.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_login.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_login.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_file_paths.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\file_paths.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\radio.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_user_img.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\user_img.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_app_bar_main.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\app_bar_main.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_app_bar_main.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\app_bar_main.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_all.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_all.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_life.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_life.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_work.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_work.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_user_img.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\user_img.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_register.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_register.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_life.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_life.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_recycle.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_recycle.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_delete_senote.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_activity_main_drawer.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\activity_main_drawer.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_activity_main_drawer.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\activity_main_drawer.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_all.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_all.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_nav_header_main.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\nav_header_main.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_side_nav_bar.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\side_nav_bar.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_delete_senote.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_side_nav_bar.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\side_nav_bar.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_ungrouped.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_ungrouped.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_background.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\background.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_register.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_register.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_work.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_work.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_nav_header_main.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\nav_header_main.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_background.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\background.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_menu_nav_ungrouped.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_menu_nav_ungrouped.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\radio.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\ic_launcher.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
}
]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
index 1e980b0f..10e0c27d 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json
@@ -1,86 +1,86 @@
[
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_register.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_register.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_register.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_register.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\app_bar_main.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\app_bar_main.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_login.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_login.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_delete_senote.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_delete_senote.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_input_passwd.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\nav_header_main.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\nav_header_main.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\app_bar_main.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\app_bar_main.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_add_secret.xml"
},
{
- "merged": "D:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\nav_header_main.xml",
- "source": "D:\\Notes-master1\\app\\src\\main\\res\\layout\\nav_header_main.xml"
+ "merged": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_login.xml",
+ "source": "E:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_login.xml"
}
]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml
index d4bc34a5..0e312495 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml
@@ -1,10 +1,10 @@
-
+
+ android:minSdkVersion="16"
+ android:targetSdkVersion="23" />
0" + ";" +
" END";
- private static final String LO_NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
+ public static final String LO_NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER lo_increase_folder_count_on_insert " +
" AFTER INSERT ON " + TABLE.LONOTE +
" BEGIN " +
@@ -502,7 +502,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END";
- private static final String LO_NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
+ public static final String LO_NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
"CREATE TRIGGER lo_decrease_folder_count_on_delete " +
" AFTER DELETE ON " + TABLE.LONOTE +
" BEGIN " +
@@ -512,7 +512,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" AND " + NoteColumns.NOTES_COUNT + ">0;" +
" END";
- private static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
+ public static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER lo_update_note_content_on_insert " +
" AFTER INSERT ON " + TABLE.LODATA +
" WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
@@ -522,7 +522,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END";
- private static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
+ public static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER lo_update_note_content_on_update " +
" AFTER UPDATE ON " + TABLE.LODATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
@@ -532,7 +532,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END";
- private static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
+ public static final String LO_DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
"CREATE TRIGGER lo_update_note_content_on_delete " +
" AFTER delete ON " + TABLE.LODATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
@@ -542,7 +542,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
" END";
- private static final String LO_NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
+ public static final String LO_NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER lo_delete_data_on_delete " +
" AFTER DELETE ON " + TABLE.LONOTE +
" BEGIN" +
@@ -550,7 +550,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
" END";
- private static final String LO_FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
+ public static final String LO_FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER lo_folder_delete_notes_on_delete " +
" AFTER DELETE ON " + TABLE.LONOTE +
" BEGIN" +
@@ -558,7 +558,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" END";
- private static final String LO_FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
+ public static final String LO_FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER lo_folder_move_notes_on_trash " +
" AFTER UPDATE ON " + TABLE.LONOTE +
" WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
index 470e9714..b779d01d 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -180,10 +180,24 @@ public class NotesProvider extends ContentProvider {
case URI_COPY:
String s_ta = values.getAsString("src");
String d_ta = values.getAsString("dis");
+ int lo = 0;
+ if(d_ta == "lonote" || d_ta == "lodata"){
+ lo = 1;
+ }
db.execSQL("DELETE FROM " + d_ta);
- disable(db);
+ if(lo == 1){
+ lo_disable(db);
+ }
+ else{
+ disable(db);
+ }
db.execSQL("INSERT INTO " + d_ta + " SELECT * from " + s_ta);
- enable(db);
+ if(lo == 1){
+ lo_enable(db);
+ }
+ else{
+ enable(db);
+ }
getContext().getContentResolver().notifyChange(Uri.parse("content://micode_notes/" + d_ta), null);
Log.d("copy", "success");
return null;
@@ -267,7 +281,7 @@ public class NotesProvider extends ContentProvider {
count = 1;
deleteData = true;
db.execSQL("DELETE FROM note");
- NotesDatabaseHelper.createSystemFolder(db);
+ //NotesDatabaseHelper.createSystemFolder(db);
break;
case URI_ALLD_DATA:
count = 1;
@@ -389,4 +403,32 @@ public class NotesProvider extends ContentProvider {
db.execSQL(NotesDatabaseHelper.DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
}
+ public void lo_disable(SQLiteDatabase db) {
+ db.execSQL("DROP TRIGGER IF EXISTS lo_increase_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_decrease_folder_count_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_decrease_folder_count_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_delete_data_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_increase_folder_count_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_folder_delete_notes_on_delete");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_folder_move_notes_on_trash");
+
+ db.execSQL("DROP TRIGGER IF EXISTS lo_update_note_content_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_update_note_content_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS lo_update_note_content_on_delete");
+ }
+
+ public void lo_enable(SQLiteDatabase db) {
+ db.execSQL(NotesDatabaseHelper.LO_NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
+
+ db.execSQL(NotesDatabaseHelper.LO_DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
+ db.execSQL(NotesDatabaseHelper.LO_DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
+ }
+
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DBConnection.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DBConnection.java
index 34a2a6b8..af2c1aac 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DBConnection.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DBConnection.java
@@ -236,7 +236,7 @@ public class DBConnection {
} catch (Exception e) {
e.printStackTrace();
}
- return flag;
+ return flag;
}
/***********
@@ -262,6 +262,7 @@ public class DBConnection {
String sql = "DELETE FROM " + User + "_note";
PreparedStatement ps0 = connection.prepareStatement(sql);
ps0.execute();
+
sql = "INSERT INTO " + User + "_note " + INSERT_NOTE_TABLE_SQL_ONE +
" VALUES (?,?,?,?,?,?," +
"?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -294,6 +295,7 @@ public class DBConnection {
} while (cursor.moveToNext());
}
cursor.close();
+
} else {
Log.e("upSync" , "failed");
}
@@ -303,6 +305,7 @@ public class DBConnection {
ps0.execute();
cursor = context.getContentResolver().query(Notes.CONTENT_DATA_URI, WorkingNote.LO_DATA_PROJECTION,
null, null, null);
+
sql = "INSERT INTO " + User + "_data " + INSERT_DATA_TABLE_SQL +
" VALUES (?,?,?,?,?,?,?,?,?,?,?)";
@@ -325,6 +328,7 @@ public class DBConnection {
} while (cursor.moveToNext());
}
cursor.close();
+
} else {
Log.e("upSync" , "failed");
}
@@ -450,4 +454,9 @@ public class DBConnection {
Looper.loop();
}
}
+
+
+
+
+
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 90fdd4ce..de2be91d 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -39,7 +39,9 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
import android.os.Looper;
+import android.os.Message;
import android.preference.PreferenceManager;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
@@ -72,6 +74,15 @@ import android.widget.PopupMenu;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
import com.google.android.material.navigation.NavigationView;
import net.micode.notes.R;
@@ -94,20 +105,15 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashSet;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-
public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener ,
NavigationView.OnNavigationItemSelectedListener{
private int time_mode = 0;
+ private int succ_login = 0;
+
+ private NavigationView mNavigationView;
+
private int islogin = 0;
private String loUser = "";
@@ -205,42 +211,55 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
this, drawer, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
drawer.addDrawerListener(toggle);
toggle.syncState();
- NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
- navigationView.setNavigationItemSelectedListener(this);
+ mNavigationView = (NavigationView) findViewById(R.id.nav_view);
+ mNavigationView.setNavigationItemSelectedListener(this);
+ if(islogin == 1){
+ mNavigationView.getMenu().findItem(R.id.nav_login).setVisible(false);
+ mNavigationView.getMenu().findItem(R.id.nav_register).setVisible(false);
+ mNavigationView.getMenu().findItem(R.id.nav_unlogin).setVisible(true);
+ }
+ else {
+ mNavigationView.getMenu().findItem(R.id.nav_login).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_register).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_unlogin).setVisible(false);
+ }
}
+ private Handler handler = new Handler() {
+ @Override
+ public void handleMessage(@NonNull Message msg) {
+ switch(msg.what) {
+ case 1:
+ TextView tv1 = (TextView) mNavigationView.getHeaderView(0).findViewById(R.id.nav_tv_user);
+ tv1.setText(loUser);
+ change_nav_item();
+ break;
+ default:
+ break;
+ }
+ super.handleMessage(msg);
+ }
+ };
+
@Override
public boolean onNavigationItemSelected(MenuItem item) {
// Handle navigation view item clicks here.
int id = item.getItemId();
- if (id == R.id.nav_all) {
- // Handle the camera action
+ if (id == R.id.nav_login) {
login();
- } else if (id == R.id.nav_unGrouped) {
+ } else if (id == R.id.nav_register) {
register();
- } else if (id == R.id.nav_life) {
- switch (item.getItemId()) {
- case R.id.menu_bg_photo: {
- time_mode = 3;
- bg_from_photo();
- break;
- }
- case R.id.menu_bg_camera: {
- time_mode = 2;
- bg_from_camera();
- break;
- }
- default:
- break;
- }
- } else if (id == R.id.nav_work) {
+ } else if (id == R.id.nav_background) {
+ showListDialog();
+ } else if (id == R.id.nav_unlogin) {
unlogin();
- } else if (id == R.id.nav_recycle) {
+ } else if (id == R.id.nav_restore) {
restoreDeletedNodes();
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
drawer.closeDrawer(GravityCompat.START);
+
return true;
}
@@ -253,7 +272,7 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
try {
Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
Drawable drawable = new BitmapDrawable(bitmap);
- Toast.makeText(context, " to get image chuxian", Toast.LENGTH_SHORT).show();
+ //Toast.makeText(context, " to get image chuxian", Toast.LENGTH_SHORT).show();
getWindow().setBackgroundDrawable(drawable);
} catch (FileNotFoundException e) {
e.printStackTrace();
@@ -553,6 +572,7 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
} else if(time_mode == 1){
getWindow().setBackgroundDrawableResource(R.drawable.p1);
}
+ Log.d("start", "Async");
}
@@ -563,8 +583,10 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
@Override
protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+ Log.d("first", "first");
switch (token) {
case FOLDER_NOTE_LIST_QUERY_TOKEN:
+ Log.d("first", "second");
mNotesListAdapter.changeCursor(cursor);
break;
case FOLDER_LIST_QUERY_TOKEN:
@@ -979,14 +1001,10 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
menu.findItem(R.id.menu_time_order).setTitle(
(mOrderBy == 0) ? R.string.menu_time_order : R.string.menu_init_order);
- menu.findItem(R.id.menu_login).setVisible(false);
- menu.findItem(R.id.menu_register).setVisible(false);
- menu.findItem(R.id.menu_unlogin).setVisible(false);
+
menu.findItem(R.id.menu_restore).setVisible(false);
menu.findItem(R.id.menu_bg_camera).setVisible(false);
menu.findItem(R.id.menu_bg_photo).setVisible(false);
- menu.findItem(R.id.menu_daytime).setVisible(false);
- menu.findItem(R.id.menu_night_time).setVisible(false);
}
else if (mState == ListEditState.SUB_FOLDER) {
@@ -1001,12 +1019,6 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
} else {
Log.e(TAG, "Wrong state:" + mState);
}
-
- if(time_mode==1) {
- menu.findItem(R.id.menu_night_time).setVisible(false);
- } else {
- menu.findItem(R.id.menu_daytime).setVisible(false);
- }
return true;
}
@@ -1051,9 +1063,6 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
case R.id.menu_search:
onSearchRequested();
break;
- case R.id.menu_restore:
- restoreDeletedNodes();
- break;
case R.id.menu_change_view:
VIEW_WAY = 1 - VIEW_WAY;
startAsyncNotesListQuery();
@@ -1062,38 +1071,6 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
mOrderBy = 1 - mOrderBy;
startAsyncNotesListQuery();
break;
- case R.id.menu_night_time: {
- time_mode = 1;
- getWindow().setBackgroundDrawableResource(R.drawable.p1);
- break;
- }
- case R.id.menu_daytime: {
- time_mode=0;
- getWindow().setBackgroundDrawableResource(R.drawable.list_background);
- break;
- }
- case R.id.menu_bg_camera: {
- time_mode = 2;
- bg_from_camera();
- break;
- }
- case R.id.menu_bg_photo: {
- time_mode = 3;
- bg_from_photo();
- break;
- }
- case R.id.menu_login:{
- login();
- break;
- }
- case R.id.menu_register: {
- register();
- break;
- }
- case R.id.menu_unlogin: {
- unlogin();
- break;
- }
default:
break;
}
@@ -1334,7 +1311,7 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
Bitmap bitmap = BitmapFactory.decodeFile(path);
//imageView.setImageBitmap(bitmap);
Drawable drawable = new BitmapDrawable(bitmap);
- Toast.makeText(context, " to get image", Toast.LENGTH_SHORT).show();
+ Toast.makeText(context, " 获取图片", Toast.LENGTH_SHORT).show();
getWindow().setBackgroundDrawable(drawable);
} else {
Toast.makeText(context, "failed to get image", Toast.LENGTH_SHORT).show();
@@ -1364,22 +1341,29 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
@Override
public void onClick(DialogInterface dialogInterface, int i) {
hideSoftInput(view);
- new Thread(new Runnable() {
+ Thread t1 = new Thread(new Runnable() {
@Override
public void run() {
- islogin = net.micode.notes.ui.DBConnection.link_login(eUser.getText().toString(), ePasswd.getText().toString(), NotesListActivity.this);
+ islogin = DBConnection.link_login(eUser.getText().toString(), ePasswd.getText().toString(), NotesListActivity.this);
Log.d("a", String.valueOf(islogin));
String hint = (islogin == 1) ? "登录成功" : "登录失败";
+ succ_login = 1;
if(islogin == 1){
loUser = eUser.getText().toString();
loPasswd = ePasswd.getText().toString();
downSync(NotesListActivity.this);
+ Message msg = new Message();
+ msg.what = 1;
+ Log.d("send", "message");
+ handler.sendMessage(msg);
}
+
Looper.prepare();
Toast.makeText(NotesListActivity.this, hint, Toast.LENGTH_SHORT).show();
Looper.loop();
}
- }).start();
+ });
+ t1.start();
}
});
builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@@ -1390,6 +1374,7 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
builder.show();
}
+
public void register() {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.dialog_register, null);
@@ -1427,7 +1412,19 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
}).start();
}
-
+ public void change_nav_item() {
+ Log.d("change", "nav_item");
+ if(islogin == 1){
+ mNavigationView.getMenu().findItem(R.id.nav_login).setVisible(false);
+ mNavigationView.getMenu().findItem(R.id.nav_register).setVisible(false);
+ mNavigationView.getMenu().findItem(R.id.nav_unlogin).setVisible(true);
+ }
+ else {
+ mNavigationView.getMenu().findItem(R.id.nav_login).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_register).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_unlogin).setVisible(false);
+ }
+ }
public void downSync(Context context) {
new Thread(new Runnable() {
@Override
@@ -1441,6 +1438,11 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
islogin = 0;
Toast.makeText(this, "退出登录", Toast.LENGTH_SHORT).show();
upSync(this, 1);
+ mNavigationView.getMenu().findItem(R.id.nav_login).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_register).setVisible(true);
+ mNavigationView.getMenu().findItem(R.id.nav_unlogin).setVisible(false);
+ TextView tv1 = (TextView) mNavigationView.getHeaderView(0).findViewById(R.id.nav_tv_user);
+ tv1.setText("未登录");
}
public void ul_upSync(Context context) {
@@ -1479,4 +1481,36 @@ public class NotesListActivity extends AppCompatActivity implements OnCl
builder.show();
}
+ public void showListDialog() {
+ final String[] items = {"从相册选取", "拍摄照片"};
+ AlertDialog.Builder listDialog = new AlertDialog.Builder(NotesListActivity.this);
+ listDialog.setTitle("背景");
+ listDialog.setItems(items, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ switch(i){
+ case 0:
+ time_mode = 3;
+ bg_from_photo();
+ break;
+ case 1:
+ time_mode = 2;
+ bg_from_camera();
+ break;
+ default:
+ break;
+ }
+ }
+ });
+ listDialog.show();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ Log.d("destroy", "destroy");
+ if(islogin == 1){
+ upSync(this, 1);
+ }
+ }
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/a.puml b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/a.puml
index 051fb2de..7285864f 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/a.puml
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/a.puml
@@ -1,23 +1,10 @@
@startuml
'https://plantuml.com/class-diagram
-class AlarmReceiver
-AlarmInitReceiver --> AlarmReceiver
-AlarmReceiver --> AlarmAlertActivity
-NoteEditActivity --> AlarmReceiver
-NoteEditActivity --> DateTimePickerDialog
-DateTimePicker --o DateTimePickerDialog
-NoteEditActivity -->NoteEditText
-NoteEditActivity --> NotesPreferenceActivity
+class NotesListActivity
NotesListActivity --> NotesPreferenceActivity
-NotesListAdapter --o NotesListActivity
-NoteItemData --o NotesListActivity
-NotesListActivity --> DropdownMenu
-NotesListActivity --> FolderListAdapter
-NotesListAdapter --> NotesListItem
-package widget{
-NoteEditActivity --> NoteWidgetProvider_2x
-NoteEditActivity --> NoteWidgetProvider_4x
-}
+DropdownMenu --> NotesListActivity
+NotesEditActivity --> NotesPreferenceActivity
+DropdownMenu --> NotesEditActivity
@enduml
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/layout/nav_header_main.xml b/src/Notes-master1/app/src/main/res/layout/nav_header_main.xml
index cedd4689..44ddbe77 100644
--- a/src/Notes-master1/app/src/main/res/layout/nav_header_main.xml
+++ b/src/Notes-master1/app/src/main/res/layout/nav_header_main.xml
@@ -21,6 +21,7 @@
app:srcCompat="@drawable/user_img" />
diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml
index 37da152b..4d3557ec 100644
--- a/src/Notes-master1/app/src/main/res/menu/note_list.xml
+++ b/src/Notes-master1/app/src/main/res/menu/note_list.xml
@@ -46,27 +46,12 @@
-
-
-
-
-
diff --git a/src/Notes-master1/app/src/main/res/menu/trash_folder.xml b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml
index 72298cdc..fe187c0c 100644
--- a/src/Notes-master1/app/src/main/res/menu/trash_folder.xml
+++ b/src/Notes-master1/app/src/main/res/menu/trash_folder.xml
@@ -1,9 +1,4 @@
-
-