diff --git a/doc/开源软件维护设计方案模板.docx b/doc/开源软件维护设计方案模板.docx deleted file mode 100644 index 6792dc8..0000000 Binary files a/doc/开源软件维护设计方案模板.docx and /dev/null differ diff --git a/src/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/.gradle/6.1.1/executionHistory/executionHistory.bin index cd1b847..3f5386c 100644 Binary files a/src/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/.gradle/6.1.1/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/.gradle/6.1.1/executionHistory/executionHistory.lock index 96f5b7a..2c5b127 100644 Binary files a/src/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/.gradle/6.1.1/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/.gradle/6.1.1/fileHashes/fileHashes.bin index 932a194..938e1c6 100644 Binary files a/src/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/.gradle/6.1.1/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/.gradle/6.1.1/fileHashes/fileHashes.lock index 0c56892..2f4ac44 100644 Binary files a/src/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/.gradle/6.1.1/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin index 2682de7..7a99264 100644 Binary files a/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/.gradle/6.1.1/javaCompile/classAnalysis.bin index 44cdc2f..3c519e5 100644 Binary files a/src/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/src/.gradle/6.1.1/javaCompile/classAnalysis.bin differ diff --git a/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin index 954d87a..2ac0c23 100644 Binary files a/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/src/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ diff --git a/src/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/.gradle/6.1.1/javaCompile/javaCompile.lock index 6cf6e79..953c81c 100644 Binary files a/src/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/.gradle/6.1.1/javaCompile/javaCompile.lock differ diff --git a/src/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/.gradle/6.1.1/javaCompile/taskHistory.bin index c8ba17f..5728797 100644 Binary files a/src/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/.gradle/6.1.1/javaCompile/taskHistory.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d3db3f0..e4c9d89 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.idea/caches/build_file_checksums.ser b/src/.idea/caches/build_file_checksums.ser index ecbea9e..c55c882 100644 Binary files a/src/.idea/caches/build_file_checksums.ser and b/src/.idea/caches/build_file_checksums.ser differ diff --git a/src/.idea/sonarIssues.xml b/src/.idea/sonarIssues.xml index c3805cd..22abbf3 100644 --- a/src/.idea/sonarIssues.xml +++ b/src/.idea/sonarIssues.xml @@ -233,6 +233,11 @@ + + + + + diff --git a/src/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 b/src/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 index 8b21a95..a4846d4 100644 --- a/src/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 +++ b/src/.idea/sonarlint/issuestore/0/8/08c35f02f11c35ae9ebf8db0a482054dfa1cf493 @@ -1,11 +1,13 @@ -t -java:S3776u"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(8ܙ. +J +java:S1125{"(Remove the literal "true" boolean value.(8ܙ. +U +java:S1128"8Remove this unused import 'net.micode.notes.model.Note'.(8ˊƁ. E -java:S1125W"(Remove the literal "true" boolean value.(8ܙ. +java:S1125|"(Remove the literal "true" boolean value.(8ܙ. s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 193.( -J -java:S1125v"(Remove the literal "true" boolean value.(8ܙ. +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 202.( E -java:S1125w"(Remove the literal "true" boolean value.(8ܙ. \ No newline at end of file +java:S1125["(Remove the literal "true" boolean value.(8ܙ. +t +java:S3776z"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(8ܙ. \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 b/src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 index 978bff4..429bce5 100644 --- a/src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 +++ b/src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 @@ -1,34 +1,35 @@ -v -java:S11929"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(޿ -Y -java:S1854";Remove this useless assignment to local variable "content".(8. +a +java:S1192n"FDefine a constant instead of duplicating this literal "=old." 6 times.( c -java:S1192`"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ +java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( c -java:S1192^"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( -\ -java:S1192a"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 -Y java:S125"").(8񣿴. +R +java:S1874C"5Remove this use of "CursorAdapter"; it is deprecated.(8񣿴. + +java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(҃ +Q +java:S2864r"4Iterate over the "entrySet" instead of the "keySet".(਷8񣿴. +r java:S117-"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ݙ. +R +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(਷8񣿴. K -java:S1125"(Remove the literal "true" boolean value.(8񣿴. -I -java:S1168"+Return an empty collection instead of null.(8񣿴. -r java:S117/"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ݙ. -r java:S117*"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ݙ. -m java:S117)"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ķ8ݙ. -J -java:S1125"(Remove the literal "true" boolean value.(ɯ8񣿴. +java:S1125"(Remove the literal "true" boolean value.(8񣿴. +{ +java:S2293D"YReplace the type specification in this constructor call with the diamond operator ("<>").(Қ·8񣿴. +F +java:S5411"*Use the primitive boolean expression here.(ɯ +q +java:S1104?"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +w +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ8񣿴. +l +java:S11927"ODefine a constant instead of duplicating this literal "Invalid cursor" 3 times.(8ݙ. J -java:S1125o"(Remove the literal "true" boolean value.(ɯ8񣿴. +java:S1125s"(Remove the literal "true" boolean value.(ɯ8񣿴. +j +java:S1104>"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +> +java:S1116@"Remove this empty statement.(8񣿴. v -java:S2293}"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ8񣿴. - -java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(ٓ -Q -java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷8񣿴. -{ -java:S2293@"YReplace the type specification in this constructor call with the diamond operator ("<>").(Қ·8񣿴. +java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(8񣿴. E -java:S5411o"*Use the primitive boolean expression here.(ɯ - -java:S1319|"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(҃ -> -java:S1116<"Remove this empty statement.(8񣿴. -l -java:S11923"ODefine a constant instead of duplicating this literal "Invalid cursor" 3 times.(8ݙ. +java:S5411s"*Use the primitive boolean expression here.(ɯ +I +java:S1168"+Return an empty collection instead of null.(8񣿴. +r java:S1173"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ݙ. J -java:S1066e"/Merge this if statement with the enclosing one.( -Q -java:S2864~"4Iterate over the "entrySet" instead of the "keySet".(਷8񣿴. +java:S1066i"/Merge this if statement with the enclosing one.( + +java:S1319p"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(ٓ +m java:S117,"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ķ8ݙ. +K +java:S1125"(Remove the literal "true" boolean value.(ɯ8񣿴. F -java:S5411"*Use the primitive boolean expression here.( -j -java:S1104:"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ -R -java:S1874?"5Remove this use of "CursorAdapter"; it is deprecated.(8񣿴. \ No newline at end of file +java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 index 88bc48c..d8aa9ab 100644 --- a/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 +++ b/src/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 @@ -1,35 +1,35 @@ -T -java:S1155-">Use isEmpty() to check whether the collection is empty or not.( +c +java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( +m +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(  java:S1319S"kThe type of the "ids" object should be an interface such as "Set" rather than the implementation "HashSet".(󆱋 -Z -java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 -b -java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( -[ -java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩 +J +java:S1066~"/Merge this if statement with the enclosing one.(䲜 +T +java:S1155-">Use isEmpty() to check whether the collection is empty or not.( + +java:S1319("kThe type of the "ids" object should be an interface such as "Set" rather than the implementation "HashSet".( U java:S1118&":Add a private constructor to hide the implicit public one.( -m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( -m -java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( u java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(ª -J -java:S1066~"/Merge this if statement with the enclosing one.(䲜 -t -java:S22932"YReplace the type specification in this constructor call with the diamond operator ("<>").(л  java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( - -java:S1319("kThe type of the "ids" object should be an interface such as "Set" rather than the implementation "HashSet".( -t -java:S2293Z"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +m +java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".( +b +java:S1192D"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.( +[ +java:S2147l"ECombine this catch with the one at line 106, which has the same body.(暩 k java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".( +t +java:S22932"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 ("<>").(л f java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ -c -java:S1192x"HDefine a constant instead of duplicating this literal "=? AND " 4 times.( \ No newline at end of file +Z +java:S2147E"DCombine this catch with the one at line 67, which has the same body.(暩 \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/4/5/450633e1eab01babe2904f3c67d659b3b244fd25 b/src/.idea/sonarlint/issuestore/4/5/450633e1eab01babe2904f3c67d659b3b244fd25 index eae62a9..0347bb0 100644 --- a/src/.idea/sonarlint/issuestore/4/5/450633e1eab01babe2904f3c67d659b3b244fd25 +++ b/src/.idea/sonarlint/issuestore/4/5/450633e1eab01babe2904f3c67d659b3b244fd25 @@ -1,32 +1,29 @@ -n java:S116 "RRename this field "SizeBox" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ɍ8. +[ +java:S1117\"9Rename "paint" which hides the field declared at line 26.(ԟ8. +u java:S116!"TRename this field "SizeIndex" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8⌰. M -java:S1172c"+Remove this unused method parameter "view".(8ر. +java:S1172`"+Remove this unused method parameter "view".(8ر. +n java:S116 "RRename this field "SizeBox" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ۀ8⌰. +G +java:S1172Z"+Remove this unused method parameter "View".(58. +q java:S116"URename this field "ColorIndex" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8⌰. +m java:S117l"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ࣲ. Y -java:S1854S"7Remove this useless assignment to local variable "upY".(8. -m java:S117o"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ࣲ. -T -java:S1854R"7Remove this useless assignment to local variable "upX".(ɐ8. -m java:S117]"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8Lj. -p java:S116!"TRename this field "SizeIndex" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ǟ8. -U -java:S1197"8Move the array designator from the variable to the type.(ݍ8. -] java:S125B"").( +^ +java:S1126"BReplace this if-then-else statement by a single method invocation.(忥 M java:S1135c"2Complete the task associated to this TODO comment.( K java:S2864"4Iterate over the "entrySet" instead of the "keySet".(̯ -^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(忥 \ No newline at end of file +Q +java:S1128!"4Remove this unused import 'android.widget.EditText'.(ś8. +o +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c index fe58e16..c04621a 100644 --- a/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +++ b/src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c @@ -1,88 +1,86 @@ k -java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(8. -x -java:S1104n"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ8. -N -java:S1874"0Remove this use of "getColor"; it is deprecated.(8. -^ java:S125"").(艥8. y java:S1104r"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(8і. -^ java:S125 "").(8. -\ -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(8. -? -java:S1116"Remove this empty statement.(8. -Y -java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(8. -_ -java:S1126"AReplace this if-then-else statement by a single return statement.(8. -w -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥8. -d java:S899 "BDo something with the "boolean" value returned by "createNewFile".(8. -V -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((8. -| -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(8. -M -java:S2093 -"*Change this "try" to a try-with-resources.(ߝ8. U -java:S1135"2Complete the task associated to this TODO comment.(8. +java:S1135"2Complete the task associated to this TODO comment.(8͹. k -java:S3252"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(8. -p -java:S3252"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(ԡ8. -n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. +java:S3252 "MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(8͹. +n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. U -java:S1135"2Complete the task associated to this TODO comment.(8. -[ -java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð8. -u -java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(8. -n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ǜ8. - -java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲8. -\ -java:S4973 "9Use the "equals" method if value comparison was intended.(8. -b -java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ8. +java:S1135"2Complete the task associated to this TODO comment.(8. +U +java:S1135"2Complete the task associated to this TODO comment.(8͹. +| +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(8. +N +java:S1874"0Remove this use of "getColor"; it is deprecated.(8. +Y +java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(8. +s java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8і. +e +java:S1126"BReplace this if-then-else statement by a single method invocation.(8͹. +k +java:S3252"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(8͹. +^ java:S125"").(ӏ8. +| +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(8. +\ +java:S4973 "9Use the "equals" method if value comparison was intended.(8͹. +n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ǜ8. +u +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(8. +[ +java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð8. +p +java:S3252"MUse static access with "android.provider.MediaStore$MediaColumns" for "DATA".(ԡ8͹. +V +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((8. +D +java:S1075 "&Remove this hard-coded path-delimiter.(8͹. _ java:S2259 -"AA "NullPointerException" could be thrown; "fos" is nullable here.(ۓ8. -u -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.(ݨ8. -| -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(8. +"AA "NullPointerException" could be thrown; "fos" is nullable here.(ۓ8. +M +java:S2093 +"*Change this "try" to a try-with-resources.(8. +r +java:S1104"OMake mId a static final constant or non-public and provide accessors if needed.(8. +_ +java:S1126"AReplace this if-then-else statement by a single return statement.(8. U -java:S1135"2Complete the task associated to this TODO comment.(8. -p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. -D -java:S1075 "&Remove this hard-coded path-delimiter.(8. \ No newline at end of file +java:S2589"7Remove this expression which always evaluates to "true"(8. +b +java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ8. +y +java:S1104p"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න8і. +j +java:S1192 "LDefine a constant instead of duplicating this literal "").( +x +java:S3252!"VUse static access with "android.provider.ContactsContract$DataColumns" for "MIMETYPE".(8Ɂ. +P +java:S1118":Add a private constructor to hide the implicit public one.( r java:S3252""\Use static access with "android.provider.ContactsContract$DataColumns" for "RAW_CONTACT_ID".( -x -java:S3252!"VUse static access with "android.provider.ContactsContract$DataColumns" for "MIMETYPE".(8Ɂ. \ No newline at end of file +t +java:S32524"^Use static access with "android.provider.ContactsContract$ContactsColumns" for "DISPLAY_NAME".( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af b/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af index f15b3fb..ca78d93 100644 --- a/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af +++ b/src/.idea/sonarlint/issuestore/a/4/a446c87b1013132f8adaf83656b582028e8809af @@ -1,26 +1,26 @@ +c +java:S2147"ECombine this catch with the one at line 305, which has the same body.(ߝȴ8. +c +java:S2147"ECombine this catch with the one at line 349, which has the same body.(ﭣ8. +Y java:S125"Remove this use of "setDrawingCacheEnabled"; it is deprecated.( -Y -java:S1874B">Remove this use of "setDrawingCacheEnabled"; it is deprecated.( -Q -java:S1874I";Remove this use of "destroyDrawingCache"; it is deprecated.( U java:S1118":Add a private constructor to hide the implicit public one.( M java:S1874D"7Remove this use of "getDrawingCache"; it is deprecated.( +Y +java:S1874S">Remove this use of "setDrawingCacheEnabled"; it is deprecated.( +O +java:S1874T"9Remove this use of "buildDrawingCache"; it is deprecated.(ݛ +Q +java:S1874I";Remove this use of "destroyDrawingCache"; it is deprecated.( +O +java:S1874C"9Remove this use of "buildDrawingCache"; it is deprecated.(ݛ Q java:S1874^";Remove this use of "destroyDrawingCache"; it is deprecated.( M -java:S1874U"7Remove this use of "getDrawingCache"; it is deprecated.( \ No newline at end of file +java:S1874U"7Remove this use of "getDrawingCache"; it is deprecated.( +Y +java:S1874B">Remove this use of "setDrawingCacheEnabled"; it is deprecated.( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 index 48e3090..4cfa1c1 100644 --- a/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 +++ b/src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 @@ -1,102 +1,104 @@ -e -java:S1126 "BReplace this if-then-else statement by a single method invocation.(8. -\ -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(۞ƣ -U -java:S1135"2Complete the task associated to this TODO comment.(8. -R -java:S3398"/Move this method into "BackgroundQueryHandler".(8. -_ -java:S2184"ACast one of the operands of this division operation to a "float".(8. -u -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(8. +K +java:S1199"-Extract this nested code block into a method.(տ8. +P +java:S1199"-Extract this nested code block into a method.(ڿ8. +p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. +H +java:S3398"%Move this method into "ModeCallback".(핺8. +c +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ϋ8. P -java:S1199"-Extract this nested code block into a method.(ٵÖ8. +java:S1199"-Extract this nested code block into a method.(8. +P +java:S1199"-Extract this nested code block into a method.(8. +u +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(`8. +K +java:S1199"-Extract this nested code block into a method.(8. +s java:S117 "QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. U -java:S1135"2Complete the task associated to this TODO comment.(8. -k java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. +java:S1135"2Complete the task associated to this TODO comment.(8. p -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(Թ8. -n -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד8. -U -java:S1135"2Complete the task associated to this TODO comment.(8. -U -java:S1135"2Complete the task associated to this TODO comment.(8. -^ -java:S2259"@A "NullPointerException" could be thrown; "db" is nullable here.(8. -O -java:S1874"1Remove this use of "getHeight"; it is deprecated.(Á8. -x java:S116"VRename this field "GestureMode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(Թ8. K -java:S1199"-Extract this nested code block into a method.(8. -H -java:S3398"%Move this method into "ModeCallback".(핺8. +java:S1199"-Extract this nested code block into a method.(8. +O +java:S1874"1Remove this use of "getHeight"; it is deprecated.(Á8. P -java:S1199"-Extract this nested code block into a method.(̀8. -_ -java:S2184"ACast one of the operands of this division operation to a "float".(Ӳ8. +java:S1199"-Extract this nested code block into a method.(8. +k java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. +u +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(핺8. U -java:S1135"2Complete the task associated to this TODO comment.(8. -9 -java:S3626"Remove this redundant jump.(݅8. -^ java:S125"").(艥8. -u -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(8. -K -java:S1199"-Extract this nested code block into a method.(8. +java:S1874"7Remove this use of "GestureDetector"; it is deprecated.(8. +o java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(8. +H +java:S3398 "%Move this method into "ModeCallback".(LjԔ8. U -java:S1874"7Remove this use of "GestureDetector"; it is deprecated.(8. +java:S1135 "2Complete the task associated to this TODO comment.(8. U -java:S1135 "2Complete the task associated to this TODO comment.(8. -o java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(8. -K -java:S1199"-Extract this nested code block into a method.(8. -i java:S101"MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.( 8. -c -java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ϋ8. -P -java:S1199"-Extract this nested code block into a method.(8. -` -java:S1126"BReplace this if-then-else statement by a single method invocation.(8. +java:S1135"2Complete the task associated to this TODO comment.(8. +R +java:S3398"/Move this method into "BackgroundQueryHandler".(8. _ -java:S2184"ACast one of the operands of this division operation to a "float".(Ԋ8. -x java:S116"[Rename this field "gestures_overlay" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ܬ. -P -java:S1199"-Extract this nested code block into a method.(ڿ8. -K -java:S1199"-Extract this nested code block into a method.(ȓ8. +java:S2184"ACast one of the operands of this division operation to a "float".(Ӳ8. u -java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(`8. -P -java:S1199"-Extract this nested code block into a method.(8. +java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(8. +o +java:S3776 "RRefactor this method to reduce its Cognitive Complexity from 16 to the 15 allowed.(-8. +U +java:S1135"2Complete the task associated to this TODO comment.(8. u -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(핺8. +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(8. +J +java:S1199"-Extract this nested code block into a method.(Փ58. U -java:S1135"2Complete the task associated to this TODO comment.(8. -H -java:S3398 "%Move this method into "ModeCallback".(LjԔ8. -K -java:S1199"-Extract this nested code block into a method.(ѵ8. +java:S1135"2Complete the task associated to this TODO comment.(8. +e +java:S1126 "BReplace this if-then-else statement by a single method invocation.(8. +9 +java:S3626"Remove this redundant jump.(݅8. +_ +java:S2184"ACast one of the operands of this division operation to a "float".(8ٷ. +c +java:S2259"@A "NullPointerException" could be thrown; "db" is nullable here.(Ո8. U -java:S1135 "2Complete the task associated to this TODO comment.(8. +java:S1135"2Complete the task associated to this TODO comment.(8. +h +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(я8. +w +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥8. +x java:S116"[Rename this field "gestures_overlay" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8ܬ. P -java:S1199"-Extract this nested code block into a method.(8. -F java:S108")Either remove or fill this block of code.(ʥ8. +java:S1199"-Extract this nested code block into a method.(8. +_ +java:S2184"ACast one of the operands of this division operation to a "float".(Ԋ8ٷ. +\ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(۞ƣ U -java:S1135"2Complete the task associated to this TODO comment.(8. -p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8. \ No newline at end of file +java:S1135"2Complete the task associated to this TODO comment.(8. +` +java:S1126"BReplace this if-then-else statement by a single method invocation.(8. +F java:S108")Either remove or fill this block of code.(ʥ8. +U +java:S1135 "2Complete the task associated to this TODO comment.(8. +P +java:S1199"-Extract this nested code block into a method.(̀8. \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb index 2fbf10b..0950d7c 100644 --- a/src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb +++ b/src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb @@ -1,13 +1,13 @@ -j -java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( \ java:S1126}"AReplace this if-then-else statement by a single return statement.(Ʒ -U -java:S1155">Use isEmpty() to check whether the collection is empty or not.( -i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +\ +java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 u java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л -\ -java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 \ No newline at end of file +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +U +java:S1155">Use isEmpty() to check whether the collection is empty or not.( +j +java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( \ No newline at end of file diff --git a/src/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 b/src/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 index 2e4f5bc..0b0478d 100644 --- a/src/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 +++ b/src/.idea/sonarlint/issuestore/f/9/f9f49497f95afd327db7a7a512612aa1089003d4 @@ -1,9 +1,9 @@ -K -java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж 3 java:S2386!"Make this member "protected".(Ꙗ +` +java:S1874)"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( M java:S1135+"2Complete the task associated to this TODO comment.( -` -java:S1874)"JDon't override a deprecated method or explicitly mark it as "@Deprecated".( \ No newline at end of file +K +java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж \ No newline at end of file diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json index 79532af..9b6c514 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -208,183 +208,204 @@ } ] }, - { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-bs_values-bs.arsc.flat", - "map": [ - { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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", - "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\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-bs\\values-bs.xml", - "from": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "55", - "endColumns": "100", - "endOffsets": "151" - }, - "to": { - "startLines": "30", - "startColumns": "4", - "startOffsets": "2926", - "endColumns": "100", - "endOffsets": "3022" - } - } - ] - }, { "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", "map": [ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "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", - "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" + "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,13,56,88,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,617,3523,5588,7348", + "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,55,87,124,131", + "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24", + "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,3518,5583,7343,7720" }, "to": { - "startLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1714,1715,1720,1723,1728,1894,1895", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "3608,3677,10409,10479,10547,10619,10689,10750,10824,11681,11742,11803,11865,11929,11991,12052,12120,12220,12280,12346,12419,12488,12545,12597,13586,13658,13973,14008,14185,14235,14296,14353,14387,14422,14732,24692,112480,112597,112864,113157,113424,125792,125864", - "endLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1714,1718,1720,1726,1728,1894,1895", - "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66", - "endOffsets": "3672,3735,10474,10542,10614,10684,10745,10819,10892,11737,11798,11860,11924,11986,12047,12115,12215,12275,12341,12414,12483,12540,12592,12654,13653,13729,14003,14038,14230,14291,14348,14382,14417,14452,14797,24758,112592,112793,112969,113353,113548,125859,125926" + "startLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1716,1717,1722,1725,1730,1896,1897,2661,2704,2736,2773", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "3720,3789,10521,10591,10659,10731,10801,10862,10936,11793,11854,11915,11977,12041,12103,12164,12232,12332,12392,12458,12531,12600,12657,12709,13698,13770,14085,14120,14297,14347,14408,14465,14499,14534,14844,24804,114063,114180,114447,114740,115007,127375,127447,169102,172008,174073,175833", + "endLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1716,1720,1722,1728,1730,1896,1897,2703,2735,2772,2779", + "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24", + "endOffsets": "3784,3847,10586,10654,10726,10796,10857,10931,11004,11849,11910,11972,12036,12098,12159,12227,12327,12387,12453,12526,12595,12652,12704,12766,13765,13841,14115,14150,14342,14403,14460,14494,14529,14564,14909,24870,114175,114376,114552,114936,115131,127442,127509,172003,174068,175828,176205" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { "startLines": "83", "startColumns": "4", - "startOffsets": "5235", + "startOffsets": "5347", "endColumns": "56", - "endOffsets": "5287" + "endOffsets": "5399" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-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,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,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8684,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1321,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1268,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-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,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", - "endOffsets": "9092,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1386,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1315,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "138,82,85,84,83,29,30,31,128,129,23,137,136,27,36,22,25,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,21,19,77,20,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,135,133,132,134,26,37,93,101,106,105,107,24,100,99,98,97,32,33", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8684,4518,4782,4685,4615,1394,1438,1491,8172,8222,1121,8625,8573,1321,1856,1054,1223,5242,5337,5170,5085,5001,6216,6132,6029,5515,2591,2539,4009,2063,2117,5577,2686,4866,8286,4446,987,846,4197,908,2746,3067,3373,2805,3937,3875,3817,3591,3538,3433,3487,3642,3693,3115,4379,3754,4247,3019,3317,3228,3169,4134,2968,4088,2863,2907,4311,2007,2332,2442,2284,2388,2227,2178,1800,1746,6679,6611,6923,8073,7292,7210,7367,7457,7701,7621,6764,6840,7150,6988,7069,6555,7846,7969,8531,8402,8344,8456,1268,1941,5446,5942,6353,6283,6434,1172,5882,5826,5763,5702,1544,1655", + "endLines": "142,82,85,84,83,29,30,31,128,129,23,137,136,27,36,22,25,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,21,19,77,20,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,135,133,132,134,26,37,93,101,106,105,107,24,100,99,98,97,32,33", + "endColumns": "14,95,82,95,68,42,51,51,48,62,49,57,50,69,83,65,43,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,65,60,48,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,51,64,67,85,79,68,93,49,58,54,61,59,109,89", + "endOffsets": "9092,4609,4860,4776,4679,1432,1485,1538,8216,8280,1166,8678,8619,1386,1935,1115,1262,5331,5440,5236,5164,5079,6277,6210,6126,5571,2648,2585,4082,2111,2172,5677,2740,4963,8336,4512,1048,902,4241,981,2799,3109,3427,2857,4003,3931,3869,3636,3585,3481,3532,3687,3748,3163,4440,3811,4305,3061,3367,3311,3222,4191,3013,4128,2901,2962,4373,2057,2382,2490,2326,2436,2278,2221,1850,1794,6758,6673,6982,8164,7361,7286,7451,7615,7840,7695,6834,6917,7204,7063,7144,6605,7963,8067,8567,8450,8396,8525,1315,2001,5509,6023,6428,6347,6523,1217,5936,5876,5820,5757,1649,1740" }, "to": { "startLines": "231,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,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,372,373,374,376,377,378,379,380,381,382,383,384,385,386,387", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "14802,17953,18049,18132,18228,18297,18340,18392,18444,18493,18556,18606,18664,18715,18785,18869,18935,18979,19073,19181,19252,19336,19419,19485,19568,19670,19731,19793,19844,19922,19975,20035,20140,20199,20301,20356,20427,20493,20554,20603,20681,20739,20786,20845,20902,20973,21034,21091,21141,21193,21246,21296,21346,21406,21459,21525,21587,21650,21697,21752,21840,21898,21960,22010,22055,22098,22158,22225,22280,22335,22388,22435,22488,22544,22592,22647,22700,22784,22851,22915,23011,23085,23166,23255,23418,23562,23641,23716,23798,23857,23937,24017,24072,24194,24297,24338,24391,24501,24575,24627,24763,24831,24917,24997,25066,25160,25210,25269,25324,25386,25446,25556", + "startOffsets": "14914,18065,18161,18244,18340,18409,18452,18504,18556,18605,18668,18718,18776,18827,18897,18981,19047,19091,19185,19293,19364,19448,19531,19597,19680,19782,19843,19905,19956,20034,20087,20147,20252,20311,20413,20468,20539,20605,20666,20715,20793,20851,20898,20957,21014,21085,21146,21203,21253,21305,21358,21408,21458,21518,21571,21637,21699,21762,21809,21864,21952,22010,22072,22122,22167,22210,22270,22337,22392,22447,22500,22547,22600,22656,22704,22759,22812,22896,22963,23027,23123,23197,23278,23367,23530,23674,23753,23828,23910,23969,24049,24129,24184,24306,24409,24450,24503,24613,24687,24739,24875,24943,25029,25109,25178,25272,25322,25381,25436,25498,25558,25668", "endLines": "235,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,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,372,373,374,376,377,378,379,380,381,382,383,384,385,386,387", "endColumns": "14,95,82,95,68,42,51,51,48,62,49,57,50,69,83,65,43,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,65,60,48,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,51,64,67,85,79,68,93,49,58,54,61,59,109,89", - "endOffsets": "15190,18044,18127,18223,18292,18335,18387,18439,18488,18551,18601,18659,18710,18780,18864,18930,18974,19068,19176,19247,19331,19414,19480,19563,19665,19726,19788,19839,19917,19970,20030,20135,20194,20296,20351,20422,20488,20549,20598,20676,20734,20781,20840,20897,20968,21029,21086,21136,21188,21241,21291,21341,21401,21454,21520,21582,21645,21692,21747,21835,21893,21955,22005,22050,22093,22153,22220,22275,22330,22383,22430,22483,22539,22587,22642,22695,22779,22846,22910,23006,23080,23161,23250,23413,23557,23636,23711,23793,23852,23932,24012,24067,24189,24292,24333,24386,24443,24570,24622,24687,24826,24912,24992,25061,25155,25205,25264,25319,25381,25441,25551,25641" + "endOffsets": "15302,18156,18239,18335,18404,18447,18499,18551,18600,18663,18713,18771,18822,18892,18976,19042,19086,19180,19288,19359,19443,19526,19592,19675,19777,19838,19900,19951,20029,20082,20142,20247,20306,20408,20463,20534,20600,20661,20710,20788,20846,20893,20952,21009,21080,21141,21198,21248,21300,21353,21403,21453,21513,21566,21632,21694,21757,21804,21859,21947,22005,22067,22117,22162,22205,22265,22332,22387,22442,22495,22542,22595,22651,22699,22754,22807,22891,22958,23022,23118,23192,23273,23362,23525,23669,23748,23823,23905,23964,24044,24124,24179,24301,24404,24445,24498,24555,24682,24734,24799,24938,25024,25104,25173,25267,25317,25376,25431,25493,25553,25663,25753" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" + "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,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,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,1391,1392,1396,1400,1404,1409,1415,1422,1426,1430,1435,1439,1443,1447,1451,1455,1459,1465,1469,1475,1479,1485,1489,1494,1498,1501,1505,1511,1515,1521,1525,1531,1534,1538,1542,1546,1550,1554,1555,1556,1557,1560,1563,1566,1569,1573,1574,1575,1576,1577,1580,1582,1584,1586,1591,1592,1596,1602,1606,1607,1609,1620,1621,1625,1631,1635,1636,1637,1641,1668,1672,1673,1677,1705,1873,1899,2068,2094,2125,2133,2139,2153,2175,2180,2185,2195,2204,2213,2217,2224,2232,2239,2240,2249,2252,2255,2259,2263,2267,2270,2271,2275,2279,2289,2294,2301,2307,2308,2311,2315,2320,2322,2324,2327,2330,2332,2336,2339,2346,2349,2352,2356,2358,2362,2364,2366,2368,2372,2380,2388,2400,2406,2415,2418,2429,2432,2437,2438,2443,2501,2560,2561,2571,2580,2581,2583,2587,2590,2593,2596,2599,2602,2605,2608,2612,2615,2618,2621,2625,2628,2632,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2658,2660,2661,2662,2663,2664,2665,2666,2667,2669,2670,2672,2673,2675,2677,2678,2680,2681,2682,2683,2684,2685,2687,2688,2689,2690,2691,2692,2694,2696,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,2710,2712,2713,2714,2715,2716,2717,2719,2723,2727,2728,2729,2730,2731,2732,2733,2734,2736,2738,2740,2742,2744,2745,2746,2747,2749,2751,2753,2754,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2767,2768,2769,2770,2772,2774,2775,2777,2778,2780,2782,2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2795,2797,2798,2799,2800,2802,2803,2804,2805,2806,2808,2810,2812,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,69,152,155,158,161,175,186,196,226,253,262,299,680,692,718,736,772,778,784,807,948,968,974,978,984,1021,1033,1099,1114,1179,1198,1224", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,66677,66746,66815,66885,66959,67035,67099,67176,67252,67329,67394,67463,67540,67615,67684,67752,67829,67895,67956,68053,68118,68187,68286,68357,68416,68474,68531,68590,68654,68725,68797,68869,68941,69013,69080,69148,69216,69275,69338,69402,69492,69583,69643,69709,69776,69842,69912,69976,70029,70142,70200,70263,70328,70393,70468,70541,70613,70662,70723,70784,70845,70907,70971,71035,71099,71164,71227,71287,71348,71414,71473,71533,71595,71666,71726,71794,71880,71967,72057,72144,72232,72314,72397,72487,72578,72630,72688,72733,72799,72863,72920,72977,73031,73088,73136,73185,73236,73270,73317,73366,73412,73444,73508,73570,73630,73687,73761,73831,73909,73963,74033,74118,74166,74212,74283,74361,74439,74511,74585,74659,74733,74813,74886,74955,75027,75104,75165,75228,75294,75358,75429,75492,75557,75621,75682,75743,75795,75868,75942,76011,76086,76160,76234,76375,76445,76498,76576,76666,76754,76850,76940,77522,77611,77858,78139,78391,78676,79069,79546,79768,79990,80266,80493,80723,80953,81183,81413,81640,82059,82285,82710,82940,83368,83587,83870,84078,84209,84436,84862,85087,85514,85735,86160,86280,86556,86857,87181,87472,87786,87923,88054,88159,88401,88568,88772,88980,89251,89363,89475,89580,89697,89911,90057,90197,90283,90631,90719,90965,91383,91632,91714,91812,92429,92529,92781,93205,93460,93554,93643,93880,95932,96174,96276,96529,98713,109434,110950,121770,123298,125055,125681,126101,127162,128427,128683,128919,129466,129960,130565,130763,131343,131907,132282,132400,132938,133095,133291,133564,133820,133990,134131,134195,134477,134763,135439,135703,136041,136394,136488,136674,136980,137242,137367,137494,137733,137944,138063,138256,138433,138888,139069,139191,139450,139563,139750,139852,139959,140088,140363,140871,141367,142244,142538,143108,143257,143989,144161,144497,144589,144867,149211,153698,153760,154390,155004,155095,155208,155437,155597,155749,155920,156086,156255,156422,156585,156828,156998,157171,157342,157616,157815,158020,158350,158434,158530,158626,158724,158824,158926,159028,159130,159232,159334,159434,159530,159642,159771,159894,160025,160156,160254,160368,160462,160602,160736,160832,160944,161044,161160,161256,161368,161468,161608,161744,161908,162038,162196,162346,162487,162631,162766,162878,163028,163156,163284,163420,163552,163682,163812,163924,164064,164210,164354,164492,164558,164648,164724,164828,164918,165020,165128,165236,165336,165416,165508,165606,165716,165794,165900,165992,166096,166206,166328,166491,166648,166728,166828,166918,167028,167122,167228,167320,167420,167532,167646,167762,167878,167972,168086,168198,168300,168420,168542,168624,168728,168848,168974,169072,169166,169254,169366,169482,169604,169716,169891,170007,170093,170185,170297,170421,170488,170614,170682,170810,170954,171082,171151,171246,171361,171474,171573,171682,171793,171904,172005,172110,172210,172340,172431,172554,172648,172760,172846,172950,173046,173134,173252,173356,173460,173586,173674,173782,173882,173972,174082,174166,174268,174352,174406,174470,174576,174686,174770,4638,9782,9900,10015,10147,10862,11554,12071,13670,15203,15591,17898,37416,37974,39366,40399,42412,42674,43030,43860,50642,51776,52070,52293,52620,54670,55318,59169,59770,63579,64794,66203", + "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,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,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,1390,1391,1395,1399,1403,1408,1414,1421,1425,1429,1434,1438,1442,1446,1450,1454,1458,1464,1468,1474,1478,1484,1488,1493,1497,1500,1504,1510,1514,1520,1524,1530,1533,1537,1541,1545,1549,1553,1554,1555,1556,1559,1562,1565,1568,1572,1573,1574,1575,1576,1579,1581,1583,1585,1590,1591,1595,1601,1605,1606,1608,1619,1620,1624,1630,1634,1635,1636,1640,1667,1671,1672,1676,1704,1872,1898,2067,2093,2124,2132,2138,2152,2174,2179,2184,2194,2203,2212,2216,2223,2231,2238,2239,2248,2251,2254,2258,2262,2266,2269,2270,2274,2278,2288,2293,2300,2306,2307,2310,2314,2319,2321,2323,2326,2329,2331,2335,2338,2345,2348,2351,2355,2357,2361,2363,2365,2367,2371,2379,2387,2399,2405,2414,2417,2428,2431,2436,2437,2442,2500,2559,2560,2570,2579,2580,2582,2586,2589,2592,2595,2598,2601,2604,2607,2611,2614,2617,2620,2624,2627,2631,2635,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2657,2659,2660,2661,2662,2663,2664,2665,2666,2668,2669,2671,2672,2674,2676,2677,2679,2680,2681,2682,2683,2684,2686,2687,2688,2689,2690,2691,2693,2695,2697,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,2711,2712,2713,2714,2715,2716,2718,2722,2726,2727,2728,2729,2730,2731,2732,2733,2735,2737,2739,2741,2743,2744,2745,2746,2748,2750,2752,2753,2754,2755,2756,2757,2758,2759,2760,2761,2762,2763,2766,2767,2768,2769,2771,2773,2774,2776,2777,2779,2781,2783,2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2796,2797,2798,2799,2801,2802,2803,2804,2805,2807,2809,2811,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,151,154,157,160,174,185,195,225,252,261,298,679,684,717,735,771,777,783,806,947,967,973,977,983,1020,1032,1098,1113,1178,1197,1223,1232", + "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", + "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,66741,66810,66880,66954,67030,67094,67171,67247,67324,67389,67458,67535,67610,67679,67747,67824,67890,67951,68048,68113,68182,68281,68352,68411,68469,68526,68585,68649,68720,68792,68864,68936,69008,69075,69143,69211,69270,69333,69397,69487,69578,69638,69704,69771,69837,69907,69971,70024,70137,70195,70258,70323,70388,70463,70536,70608,70657,70718,70779,70840,70902,70966,71030,71094,71159,71222,71282,71343,71409,71468,71528,71590,71661,71721,71789,71875,71962,72052,72139,72227,72309,72392,72482,72573,72625,72683,72728,72794,72858,72915,72972,73026,73083,73131,73180,73231,73265,73312,73361,73407,73439,73503,73565,73625,73682,73756,73826,73904,73958,74028,74113,74161,74207,74278,74356,74434,74506,74580,74654,74728,74808,74881,74950,75022,75099,75160,75223,75289,75353,75424,75487,75552,75616,75677,75738,75790,75863,75937,76006,76081,76155,76229,76370,76440,76493,76571,76661,76749,76845,76935,77517,77606,77853,78134,78386,78671,79064,79541,79763,79985,80261,80488,80718,80948,81178,81408,81635,82054,82280,82705,82935,83363,83582,83865,84073,84204,84431,84857,85082,85509,85730,86155,86275,86551,86852,87176,87467,87781,87918,88049,88154,88396,88563,88767,88975,89246,89358,89470,89575,89692,89906,90052,90192,90278,90626,90714,90960,91378,91627,91709,91807,92424,92524,92776,93200,93455,93549,93638,93875,95927,96169,96271,96524,98708,109429,110945,121765,123293,125050,125676,126096,127157,128422,128678,128914,129461,129955,130560,130758,131338,131902,132277,132395,132933,133090,133286,133559,133815,133985,134126,134190,134472,134758,135434,135698,136036,136389,136483,136669,136975,137237,137362,137489,137728,137939,138058,138251,138428,138883,139064,139186,139445,139558,139745,139847,139954,140083,140358,140866,141362,142239,142533,143103,143252,143984,144156,144492,144584,144862,149206,153693,153755,154385,154999,155090,155203,155432,155592,155744,155915,156081,156250,156417,156580,156823,156993,157166,157337,157611,157810,158015,158345,158429,158525,158621,158719,158819,158921,159023,159125,159227,159329,159429,159525,159637,159766,159889,160020,160151,160249,160363,160457,160597,160731,160827,160939,161039,161155,161251,161363,161463,161603,161739,161903,162033,162191,162341,162482,162626,162761,162873,163023,163151,163279,163415,163547,163677,163807,163919,164059,164205,164349,164487,164553,164643,164719,164823,164913,165015,165123,165231,165331,165411,165503,165601,165711,165789,165895,165987,166091,166201,166323,166486,166643,166723,166823,166913,167023,167117,167223,167315,167415,167527,167641,167757,167873,167967,168081,168193,168295,168415,168537,168619,168723,168843,168969,169067,169161,169249,169361,169477,169599,169711,169886,170002,170088,170180,170292,170416,170483,170609,170677,170805,170949,171077,171146,171241,171356,171469,171568,171677,171788,171899,172000,172105,172205,172335,172426,172549,172643,172755,172841,172945,173041,173129,173247,173351,173455,173581,173669,173777,173877,173967,174077,174161,174263,174347,174401,174465,174571,174681,174765,174885,9777,9895,10010,10142,10857,11549,12066,13665,15198,15586,17893,37411,37671,39361,40394,42407,42669,43025,43855,50637,51771,52065,52288,52615,54665,55313,59164,59765,63574,64789,66198,66672" }, "to": { - "startLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1730,1732,1734,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1778,1779,1780,1781,1782,1783,1785,1789,1793,1794,1795,1796,1797,1798,1799,1800,1802,1804,1806,1808,1810,1811,1812,1813,1815,1817,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1833,1834,1835,1836,1838,1840,1841,1843,1844,1846,1848,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1863,1864,1865,1866,1868,1869,1870,1871,1872,1874,1876,1878,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3829,3903,3982,4055,4129,4200,4272,4344,4417,4474,4532,4605,4679,4753,4828,4900,4973,5043,5114,5174,5292,5361,5430,5500,5574,5650,5714,5791,5867,5944,6009,6078,6155,6230,6299,6367,6444,6510,6571,6668,6733,6802,6901,6972,7031,7089,7146,7205,7269,7340,7412,7484,7556,7628,7695,7763,7831,7890,7953,8017,8107,8198,8258,8324,8391,8457,8527,8591,8644,8757,8815,8878,8943,9008,9083,9156,9228,9277,9338,9399,9460,9522,9586,9650,9714,9779,9842,9902,9963,10029,10088,10148,10210,10281,10341,10897,10983,11070,11160,11247,11335,11417,11500,11590,13133,13185,13243,13288,13354,13418,13475,13532,13734,13791,13839,13888,13939,14043,14090,14139,14457,14489,14553,14615,14675,15195,15269,15339,15417,15471,15541,15626,15674,15720,15791,15869,15947,16019,16093,16167,16241,16321,16394,16463,16535,16612,16673,16736,16802,16866,16937,17000,17065,17129,17190,17251,17303,17376,17450,17519,17594,17668,17742,17883,24448,25646,25724,25814,25902,25998,26088,26670,26759,27006,27287,27539,27824,28217,28694,28916,29138,29414,29641,29871,30101,30331,30561,30788,31207,31433,31858,32088,32516,32735,33018,33226,33357,33584,34010,34235,34662,34883,35308,35428,35704,36005,36329,36620,36934,37071,37202,37307,37549,37716,37920,38128,38399,38511,38623,38728,38845,39059,39205,39345,39431,39779,39867,40113,40531,40780,40862,40960,41552,41652,41904,42328,42583,42677,42766,43003,45027,45269,45371,45624,47780,57909,59425,69653,71181,72938,73564,73984,75045,76310,76566,76802,77349,77843,78448,78646,79226,79790,80165,80283,80821,80978,81174,81447,81703,81873,82014,82078,82360,82646,83322,83586,83924,84277,84371,84557,84863,85125,85250,85377,85616,85827,85946,86139,86316,86771,86952,87074,87333,87446,87633,87735,87842,87971,88246,88754,89250,90127,90421,90991,91140,91872,92044,92380,92472,93489,97771,102196,102258,102836,103420,103511,103624,103853,104013,104165,104336,104502,104671,104838,105001,105244,105414,105587,105758,106032,106231,106436,106766,106850,106946,107042,107140,107240,107342,107444,107546,107648,107750,107850,107946,108058,108187,108310,108441,108572,108670,108784,108878,109018,109152,109248,109360,109460,109576,109672,109784,109884,110024,110160,110324,110454,110612,110762,110903,111047,111182,111294,111444,111572,111700,111836,111968,112098,112228,112340,113620,113766,113910,115394,115460,115550,115626,115730,115820,115922,116030,116138,116238,116318,116410,116508,116618,116696,116802,116894,116998,117108,117230,117393,117550,117630,117730,117820,117930,118024,118130,118222,118322,118434,118548,118664,118780,118874,118988,119100,119202,119322,119444,119526,119630,119750,119876,119974,120068,120156,120268,120384,120506,120618,120793,120909,120995,121087,121199,121323,121390,121516,121584,121712,121856,121984,122053,122148,122263,122376,122475,122584,122695,122806,122907,123012,123112,123242,123333,123456,123550,123662,123748,123852,123948,124036,124154,124258,124362,124488,124576,124684,124784,124874,124984,125068,125170,125254,125308,125372,125478,125588,125672", - "endLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1450,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1731,1733,1735,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1777,1778,1779,1780,1781,1782,1784,1788,1792,1793,1794,1795,1796,1797,1798,1799,1801,1803,1805,1807,1809,1810,1811,1812,1814,1816,1818,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1832,1833,1834,1835,1837,1839,1840,1842,1843,1845,1847,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1862,1863,1864,1865,1867,1868,1869,1870,1871,1873,1875,1877,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893", - "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": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3898,3977,4050,4124,4195,4267,4339,4412,4469,4527,4600,4674,4748,4823,4895,4968,5038,5109,5169,5230,5356,5425,5495,5569,5645,5709,5786,5862,5939,6004,6073,6150,6225,6294,6362,6439,6505,6566,6663,6728,6797,6896,6967,7026,7084,7141,7200,7264,7335,7407,7479,7551,7623,7690,7758,7826,7885,7948,8012,8102,8193,8253,8319,8386,8452,8522,8586,8639,8752,8810,8873,8938,9003,9078,9151,9223,9272,9333,9394,9455,9517,9581,9645,9709,9774,9837,9897,9958,10024,10083,10143,10205,10276,10336,10404,10978,11065,11155,11242,11330,11412,11495,11585,11676,13180,13238,13283,13349,13413,13470,13527,13581,13786,13834,13883,13934,13968,14085,14134,14180,14484,14548,14610,14670,14727,15264,15334,15412,15466,15536,15621,15669,15715,15786,15864,15942,16014,16088,16162,16236,16316,16389,16458,16530,16607,16668,16731,16797,16861,16932,16995,17060,17124,17185,17246,17298,17371,17445,17514,17589,17663,17737,17878,17948,24496,25719,25809,25897,25993,26083,26665,26754,27001,27282,27534,27819,28212,28689,28911,29133,29409,29636,29866,30096,30326,30556,30783,31202,31428,31853,32083,32511,32730,33013,33221,33352,33579,34005,34230,34657,34878,35303,35423,35699,36000,36324,36615,36929,37066,37197,37302,37544,37711,37915,38123,38394,38506,38618,38723,38840,39054,39200,39340,39426,39774,39862,40108,40526,40775,40857,40955,41547,41647,41899,42323,42578,42672,42761,42998,45022,45264,45366,45619,47775,57904,59420,69648,71176,72933,73559,73979,75040,76305,76561,76797,77344,77838,78443,78641,79221,79785,80160,80278,80816,80973,81169,81442,81698,81868,82009,82073,82355,82641,83317,83581,83919,84272,84366,84552,84858,85120,85245,85372,85611,85822,85941,86134,86311,86766,86947,87069,87328,87441,87628,87730,87837,87966,88241,88749,89245,90122,90416,90986,91135,91867,92039,92375,92467,92745,97766,102191,102253,102831,103415,103506,103619,103848,104008,104160,104331,104497,104666,104833,104996,105239,105409,105582,105753,106027,106226,106431,106761,106845,106941,107037,107135,107235,107337,107439,107541,107643,107745,107845,107941,108053,108182,108305,108436,108567,108665,108779,108873,109013,109147,109243,109355,109455,109571,109667,109779,109879,110019,110155,110319,110449,110607,110757,110898,111042,111177,111289,111439,111567,111695,111831,111963,112093,112223,112335,112475,113761,113905,114043,115455,115545,115621,115725,115815,115917,116025,116133,116233,116313,116405,116503,116613,116691,116797,116889,116993,117103,117225,117388,117545,117625,117725,117815,117925,118019,118125,118217,118317,118429,118543,118659,118775,118869,118983,119095,119197,119317,119439,119521,119625,119745,119871,119969,120063,120151,120263,120379,120501,120613,120788,120904,120990,121082,121194,121318,121385,121511,121579,121707,121851,121979,122048,122143,122258,122371,122470,122579,122690,122801,122902,123007,123107,123237,123328,123451,123545,123657,123743,123847,123943,124031,124149,124253,124357,124483,124571,124679,124779,124869,124979,125063,125165,125249,125303,125367,125473,125583,125667,125787" + "startLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,883,909,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1467,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1732,1734,1736,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1780,1781,1782,1783,1784,1785,1787,1791,1795,1796,1797,1798,1799,1800,1801,1802,1804,1806,1808,1810,1812,1813,1814,1815,1817,1819,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1835,1836,1837,1838,1840,1842,1843,1845,1846,1848,1850,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1865,1866,1867,1868,1870,1871,1872,1873,1874,1876,1878,1880,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1901,1984,1987,1990,1993,2007,2018,2028,2058,2085,2094,2131,2512,2518,2643,2780,2816,2822,2828,2851,2992,3012,3018,3022,3028,3065,3077,3143,3158,3223,3242,3268", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3941,4015,4094,4167,4241,4312,4384,4456,4529,4586,4644,4717,4791,4865,4940,5012,5085,5155,5226,5286,5404,5473,5542,5612,5686,5762,5826,5903,5979,6056,6121,6190,6267,6342,6411,6479,6556,6622,6683,6780,6845,6914,7013,7084,7143,7201,7258,7317,7381,7452,7524,7596,7668,7740,7807,7875,7943,8002,8065,8129,8219,8310,8370,8436,8503,8569,8639,8703,8756,8869,8927,8990,9055,9120,9195,9268,9340,9389,9450,9511,9572,9634,9698,9762,9826,9891,9954,10014,10075,10141,10200,10260,10322,10393,10453,11009,11095,11182,11272,11359,11447,11529,11612,11702,13245,13297,13355,13400,13466,13530,13587,13644,13846,13903,13951,14000,14051,14155,14202,14251,14569,14601,14665,14727,14787,15307,15381,15451,15529,15583,15653,15738,15786,15832,15903,15981,16059,16131,16205,16279,16353,16433,16506,16575,16647,16724,16785,16848,16914,16978,17049,17112,17177,17241,17302,17363,17415,17488,17562,17631,17706,17780,17854,17995,24560,25758,25836,25926,26014,26110,26200,26782,26871,27118,27399,27651,27936,28329,28806,29028,29250,29526,29753,29983,30213,30443,30673,30900,31319,31545,31970,32200,32628,32847,33130,33338,33469,33696,34122,34347,34774,34995,35420,35540,35816,36117,36441,36732,37046,37183,37314,37419,37661,37828,38032,38240,38511,38623,38735,38840,38957,39171,39317,39457,39543,39891,39979,40225,40643,40892,40974,41072,41689,41789,42041,42465,42720,42814,42903,43140,45192,45434,45536,45789,47973,58694,60210,71030,72558,74315,74941,75361,76422,77687,77943,78179,78726,79220,79825,80023,80603,81167,81542,81660,82198,82355,82551,82824,83080,83250,83391,83455,83737,84023,84699,84963,85301,85654,85748,85934,86240,86502,86627,86754,86993,87204,87323,87516,87693,88148,88329,88451,88710,88823,89010,89112,89219,89348,89623,90131,90627,91504,91798,92368,92517,93249,93421,93757,93849,94866,99210,103697,103759,104389,105003,105094,105207,105436,105596,105748,105919,106085,106254,106421,106584,106827,106997,107170,107341,107615,107814,108019,108349,108433,108529,108625,108723,108823,108925,109027,109129,109231,109333,109433,109529,109641,109770,109893,110024,110155,110253,110367,110461,110601,110735,110831,110943,111043,111159,111255,111367,111467,111607,111743,111907,112037,112195,112345,112486,112630,112765,112877,113027,113155,113283,113419,113551,113681,113811,113923,115203,115349,115493,116977,117043,117133,117209,117313,117403,117505,117613,117721,117821,117901,117993,118091,118201,118279,118385,118477,118581,118691,118813,118976,119133,119213,119313,119403,119513,119607,119713,119805,119905,120017,120131,120247,120363,120457,120571,120683,120785,120905,121027,121109,121213,121333,121459,121557,121651,121739,121851,121967,122089,122201,122376,122492,122578,122670,122782,122906,122973,123099,123167,123295,123439,123567,123636,123731,123846,123959,124058,124167,124278,124389,124490,124595,124695,124825,124916,125039,125133,125245,125331,125435,125531,125619,125737,125841,125945,126071,126159,126267,126367,126457,126567,126651,126753,126837,126891,126955,127061,127171,127255,127659,132803,132921,133036,133168,133883,134575,135092,136691,138224,138612,140919,160437,160858,168069,176210,178223,178485,178841,179671,186453,187587,187881,188104,188431,190481,191129,194980,195581,199390,200605,202014", + "endLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,882,908,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1715,1733,1735,1737,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1779,1780,1781,1782,1783,1784,1786,1790,1794,1795,1796,1797,1798,1799,1800,1801,1803,1805,1807,1809,1811,1812,1813,1814,1816,1818,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1834,1835,1836,1837,1839,1841,1842,1844,1845,1847,1849,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1864,1865,1866,1867,1869,1870,1871,1872,1873,1875,1877,1879,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1983,1986,1989,1992,2006,2017,2027,2057,2084,2093,2130,2511,2516,2543,2660,2815,2821,2827,2850,2991,3011,3017,3021,3027,3064,3076,3142,3157,3222,3241,3267,3276", + "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", + "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,4010,4089,4162,4236,4307,4379,4451,4524,4581,4639,4712,4786,4860,4935,5007,5080,5150,5221,5281,5342,5468,5537,5607,5681,5757,5821,5898,5974,6051,6116,6185,6262,6337,6406,6474,6551,6617,6678,6775,6840,6909,7008,7079,7138,7196,7253,7312,7376,7447,7519,7591,7663,7735,7802,7870,7938,7997,8060,8124,8214,8305,8365,8431,8498,8564,8634,8698,8751,8864,8922,8985,9050,9115,9190,9263,9335,9384,9445,9506,9567,9629,9693,9757,9821,9886,9949,10009,10070,10136,10195,10255,10317,10388,10448,10516,11090,11177,11267,11354,11442,11524,11607,11697,11788,13292,13350,13395,13461,13525,13582,13639,13693,13898,13946,13995,14046,14080,14197,14246,14292,14596,14660,14722,14782,14839,15376,15446,15524,15578,15648,15733,15781,15827,15898,15976,16054,16126,16200,16274,16348,16428,16501,16570,16642,16719,16780,16843,16909,16973,17044,17107,17172,17236,17297,17358,17410,17483,17557,17626,17701,17775,17849,17990,18060,24608,25831,25921,26009,26105,26195,26777,26866,27113,27394,27646,27931,28324,28801,29023,29245,29521,29748,29978,30208,30438,30668,30895,31314,31540,31965,32195,32623,32842,33125,33333,33464,33691,34117,34342,34769,34990,35415,35535,35811,36112,36436,36727,37041,37178,37309,37414,37656,37823,38027,38235,38506,38618,38730,38835,38952,39166,39312,39452,39538,39886,39974,40220,40638,40887,40969,41067,41684,41784,42036,42460,42715,42809,42898,43135,45187,45429,45531,45784,47968,58689,60205,71025,72553,74310,74936,75356,76417,77682,77938,78174,78721,79215,79820,80018,80598,81162,81537,81655,82193,82350,82546,82819,83075,83245,83386,83450,83732,84018,84694,84958,85296,85649,85743,85929,86235,86497,86622,86749,86988,87199,87318,87511,87688,88143,88324,88446,88705,88818,89005,89107,89214,89343,89618,90126,90622,91499,91793,92363,92512,93244,93416,93752,93844,94122,99205,103692,103754,104384,104998,105089,105202,105431,105591,105743,105914,106080,106249,106416,106579,106822,106992,107165,107336,107610,107809,108014,108344,108428,108524,108620,108718,108818,108920,109022,109124,109226,109328,109428,109524,109636,109765,109888,110019,110150,110248,110362,110456,110596,110730,110826,110938,111038,111154,111250,111362,111462,111602,111738,111902,112032,112190,112340,112481,112625,112760,112872,113022,113150,113278,113414,113546,113676,113806,113918,114058,115344,115488,115626,117038,117128,117204,117308,117398,117500,117608,117716,117816,117896,117988,118086,118196,118274,118380,118472,118576,118686,118808,118971,119128,119208,119308,119398,119508,119602,119708,119800,119900,120012,120126,120242,120358,120452,120566,120678,120780,120900,121022,121104,121208,121328,121454,121552,121646,121734,121846,121962,122084,122196,122371,122487,122573,122665,122777,122901,122968,123094,123162,123290,123434,123562,123631,123726,123841,123954,124053,124162,124273,124384,124485,124590,124690,124820,124911,125034,125128,125240,125326,125430,125526,125614,125732,125836,125940,126066,126154,126262,126362,126452,126562,126646,126748,126832,126886,126950,127056,127166,127250,127370,132798,132916,133031,133163,133878,134570,135087,136686,138219,138607,140914,160432,160692,162245,169097,178218,178480,178836,179666,186448,187582,187876,188099,188426,190476,191124,194975,195576,199385,200600,202009,202483" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,300", + "startOffsets": "105,412", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "295,415" + "endOffsets": "407,527" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "1451,1455,1459,1462,1736,1740,1744,1748,1752,1756,1760", + "startLines": "1453,1457,1461,1464,1738,1742,1746,1750,1754,1758,1762", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "92750,92954,93165,93329,114048,114231,114416,114601,114804,115010,115193", - "endLines": "1454,1458,1461,1464,1739,1743,1747,1751,1755,1759,1763", + "startOffsets": "94127,94331,94542,94706,115631,115814,115999,116184,116387,116593,116776", + "endLines": "1456,1460,1463,1466,1741,1745,1749,1753,1757,1761,1765", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92949,93160,93324,93484,114226,114411,114596,114799,115005,115188,115389" + "endOffsets": "94326,94537,94701,94861,115809,115994,116179,116382,116588,116771,116972" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\2f42828d6ee707186c1f0dd1f7f0a382\\coordinatorlayout-1.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "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": "12,1896", - "startColumns": "4,4", - "startOffsets": "420,125931", - "endLines": "12,1898", - "endColumns": "60,12", - "endOffsets": "476,126071" + "startLines": "12,1898,2544,2554", + "startColumns": "4,4,4,4", + "startOffsets": "532,127514,162250,162858", + "endLines": "12,1900,2553,2642", + "endColumns": "60,12,24,24", + "endOffsets": "588,127654,162853,168064" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e07d0e610d848e1704966f0c1c566747\\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" + "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": "62,190,191,192,193,1719,1721,1722,1727,1729", + "startLines": "62,190,191,192,193,1721,1723,1724,1729,1731", "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "3740,12659,12712,12765,12818,112798,112974,113096,113358,113553", + "startOffsets": "3852,12771,12824,12877,12930,114381,114557,114679,114941,115136", "endColumns": "88,52,52,52,52,65,121,60,65,66", - "endOffsets": "3824,12707,12760,12813,12866,112859,113091,113152,113419,113615" + "endOffsets": "3936,12819,12872,12925,12978,114442,114674,114735,115002,115198" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { "startLines": "194,195,196,197,198", "startColumns": "4,4,4,4,4", - "startOffsets": "12871,12923,12976,13029,13081", + "startOffsets": "12983,13035,13088,13141,13193", "endColumns": "51,52,52,51,51", - "endOffsets": "12918,12971,13024,13076,13128" + "endOffsets": "13030,13083,13136,13188,13240" + } + } + ] + }, + { + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-bs_values-bs.arsc.flat", + "map": [ + { + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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", + "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\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-bs\\values-bs.xml", + "from": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" + }, + "to": { + "startLines": "30", + "startColumns": "4", + "startOffsets": "2926", + "endColumns": "100", + "endOffsets": "3022" } } ] @@ -522,11 +543,12 @@ { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,29,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,-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,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,4,-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,1275,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1226,-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,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,47,-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,1321,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1269,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "134,84,83,82,81,32,33,34,125,126,25,133,132,29,39,24,27,90,91,89,88,87,103,102,101,93,73,42,43,94,85,127,80,23,21,76,22,51,57,62,52,72,71,70,66,65,63,64,67,68,58,79,69,77,56,61,60,59,75,55,74,53,54,78,41,47,49,46,48,45,44,38,37,110,109,112,124,117,116,118,119,121,120,111,115,113,114,108,122,123,131,129,128,130,28,40,92,100,105,104,106,26,99,98,97,96,35,36", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "7173,4086,4019,3945,3894,1366,1407,1456,6715,6761,1101,7118,7067,1275,1745,1049,1187,4458,4527,4398,4332,4268,5202,5141,5077,4661,3457,1918,1972,4716,4160,6819,3834,995,885,3617,938,2356,2643,2894,2410,3396,3342,3290,3091,3042,2946,2995,3138,3186,2687,3774,3237,3661,2599,2846,2789,2733,3561,2554,3518,2461,2503,3714,1866,2177,2275,2129,2227,2081,2035,1693,1639,5584,5524,5727,6640,6043,5973,6108,6187,6372,6298,5660,5917,5785,5851,5474,6477,6561,7028,6919,6870,6965,1226,1808,4605,5017,5317,5258,5385,1142,4968,4922,4873,4821,1505,1572", + "endLines": "136,84,83,82,81,32,33,34,125,126,25,133,132,29,39,24,27,90,91,89,88,87,103,102,101,93,73,42,43,94,85,127,80,23,21,76,22,51,57,62,52,72,71,70,66,65,63,64,67,68,58,79,69,77,56,61,60,59,75,55,74,53,54,78,41,47,49,46,48,45,44,38,37,110,109,112,124,117,116,118,119,121,120,111,115,113,114,108,122,123,131,129,128,130,28,40,92,100,105,104,106,26,99,98,97,96,35,36", + "endColumns": "14,72,65,72,49,39,47,47,44,56,39,53,49,50,61,50,37,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,52,51,42,55,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,47,56,54,58,66,57,61,43,47,44,47,50,65,65", + "endOffsets": "7347,4154,4080,4013,3939,1401,1450,1499,6755,6813,1136,7167,7112,1321,1802,1095,1220,4521,4599,4452,4392,4326,5252,5196,5135,4710,3512,1966,2029,4796,4236,6864,3888,1043,932,3655,989,2404,2681,2940,2455,3451,3390,3336,3132,3085,2989,3036,3180,3231,2727,3828,3284,3708,2637,2888,2840,2783,3611,2593,3555,2497,2548,3768,1912,2221,2319,2171,2269,2123,2075,1739,1687,5654,5578,5779,6709,6102,6037,6181,6292,6471,6366,5721,5967,5845,5911,5518,6555,6634,7061,6959,6913,7022,1269,1860,4655,5071,5379,5311,5442,1181,5011,4962,4916,4867,1566,1633" }, "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,129,130,131,133,134,135,136,137,138,139,140,141,142,143,144", @@ -540,9 +562,11 @@ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "132", @@ -555,9 +579,11 @@ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,128", @@ -570,9 +596,12 @@ { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { "startLines": "2", @@ -1017,20 +1046,20 @@ ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-pl_values-pl.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-lt_values-lt.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,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" + "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" } }, { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-pl\\values-pl.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-lt\\values-lt.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1041,28 +1070,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2909", + "startOffsets": "2978", "endColumns": "100", - "endOffsets": "3005" + "endOffsets": "3074" } } ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-lt_values-lt.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-pl_values-pl.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,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,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" } }, { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-lt\\values-lt.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-pl\\values-pl.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1073,9 +1102,9 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2978", + "startOffsets": "2909", "endColumns": "100", - "endOffsets": "3074" + "endOffsets": "3005" } } ] @@ -1177,31 +1206,31 @@ ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-large-v4_values-large-v4.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-large-v4\\values-large-v4.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-sw600dp-v13\\values-sw600dp-v13.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": "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" } } ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-sw600dp-v13_values-sw600dp-v13.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-large-v4_values-large-v4.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-sw600dp-v13\\values-sw600dp-v13.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-large-v4\\values-large-v4.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,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" } } ] @@ -1508,10 +1537,10 @@ ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-ru_values-ru.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-ja_values-ja.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-ja\\values-ja.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1522,28 +1551,28 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2913", + "startOffsets": "2771", "endColumns": "100", - "endOffsets": "3009" + "endOffsets": "2867" } }, { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-ru\\values-ru.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,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,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" } } ] }, { - "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-ja_values-ja.arsc.flat", + "outputFile": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\values-ru_values-ru.arsc.flat", "map": [ { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-ru\\values-ru.xml", "from": { "startLines": "2", "startColumns": "4", @@ -1554,19 +1583,19 @@ "to": { "startLines": "30", "startColumns": "4", - "startOffsets": "2771", + "startOffsets": "2913", "endColumns": "100", - "endOffsets": "2867" + "endOffsets": "3009" } }, { - "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values-ja\\values-ja.xml", + "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,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,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" } } ] diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json index 53fed3c..7ab5659 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json @@ -6,11 +6,12 @@ { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,29,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,28,-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,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,4,-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,1275,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1226,-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,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,47,-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,1321,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1269,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "134,84,83,82,81,32,33,34,125,126,25,133,132,29,39,24,27,90,91,89,88,87,103,102,101,93,73,42,43,94,85,127,80,23,21,76,22,51,57,62,52,72,71,70,66,65,63,64,67,68,58,79,69,77,56,61,60,59,75,55,74,53,54,78,41,47,49,46,48,45,44,38,37,110,109,112,124,117,116,118,119,121,120,111,115,113,114,108,122,123,131,129,128,130,28,40,92,100,105,104,106,26,99,98,97,96,35,36", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "7173,4086,4019,3945,3894,1366,1407,1456,6715,6761,1101,7118,7067,1275,1745,1049,1187,4458,4527,4398,4332,4268,5202,5141,5077,4661,3457,1918,1972,4716,4160,6819,3834,995,885,3617,938,2356,2643,2894,2410,3396,3342,3290,3091,3042,2946,2995,3138,3186,2687,3774,3237,3661,2599,2846,2789,2733,3561,2554,3518,2461,2503,3714,1866,2177,2275,2129,2227,2081,2035,1693,1639,5584,5524,5727,6640,6043,5973,6108,6187,6372,6298,5660,5917,5785,5851,5474,6477,6561,7028,6919,6870,6965,1226,1808,4605,5017,5317,5258,5385,1142,4968,4922,4873,4821,1505,1572", + "endLines": "136,84,83,82,81,32,33,34,125,126,25,133,132,29,39,24,27,90,91,89,88,87,103,102,101,93,73,42,43,94,85,127,80,23,21,76,22,51,57,62,52,72,71,70,66,65,63,64,67,68,58,79,69,77,56,61,60,59,75,55,74,53,54,78,41,47,49,46,48,45,44,38,37,110,109,112,124,117,116,118,119,121,120,111,115,113,114,108,122,123,131,129,128,130,28,40,92,100,105,104,106,26,99,98,97,96,35,36", + "endColumns": "14,72,65,72,49,39,47,47,44,56,39,53,49,50,61,50,37,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,52,51,42,55,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,47,56,54,58,66,57,61,43,47,44,47,50,65,65", + "endOffsets": "7347,4154,4080,4013,3939,1401,1450,1499,6755,6813,1136,7167,7112,1321,1802,1095,1220,4521,4599,4452,4392,4326,5252,5196,5135,4710,3512,1966,2029,4796,4236,6864,3888,1043,932,3655,989,2404,2681,2940,2455,3451,3390,3336,3132,3085,2989,3036,3180,3231,2727,3828,3284,3708,2637,2888,2840,2783,3611,2593,3555,2497,2548,3768,1912,2221,2319,2171,2269,2123,2075,1739,1687,5654,5578,5779,6709,6102,6037,6181,6292,6471,6366,5721,5967,5845,5911,5518,6555,6634,7061,6959,6913,7022,1269,1860,4655,5071,5379,5311,5442,1181,5011,4962,4916,4867,1566,1633" }, "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,129,130,131,133,134,135,136,137,138,139,140,141,142,143,144", @@ -24,9 +25,11 @@ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values-zh-rCN\\values-zh-rCN.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "2", + "startColumns": "4", + "startOffsets": "55", + "endColumns": "100", + "endOffsets": "151" }, "to": { "startLines": "132", @@ -39,9 +42,11 @@ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\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,128", @@ -54,9 +59,12 @@ { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json index 95209ba..4d1efac 100644 --- a/src/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -6,145 +6,166 @@ { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e4e0a5e35a3d558d6a79b640a6620774\\core-1.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "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", - "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" + "startLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,171,172,176,177,178,13,56,88,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,124,7725,7795,7863,7935,8005,8066,8140,8213,8274,8335,8397,8461,8523,8584,8652,8752,8812,8878,8951,9020,9077,9129,9191,9263,9339,9374,9409,9459,9520,9577,9611,9646,9681,9751,9822,9939,10140,10250,10451,10580,10652,617,3523,5588,7348", + "endLines": "2,3,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,170,171,175,176,177,178,55,87,124,131", + "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24", + "endOffsets": "119,182,7790,7858,7930,8000,8061,8135,8208,8269,8330,8392,8456,8518,8579,8647,8747,8807,8873,8946,9015,9072,9124,9186,9258,9334,9369,9404,9454,9515,9572,9606,9641,9676,9746,9817,9934,10135,10245,10446,10575,10647,10714,3518,5583,7343,7720" }, "to": { - "startLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1714,1715,1720,1723,1728,1894,1895", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "3608,3677,10409,10479,10547,10619,10689,10750,10824,11681,11742,11803,11865,11929,11991,12052,12120,12220,12280,12346,12419,12488,12545,12597,13586,13658,13973,14008,14185,14235,14296,14353,14387,14422,14732,24692,112480,112597,112864,113157,113424,125792,125864", - "endLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1714,1718,1720,1726,1728,1894,1895", - "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66", - "endOffsets": "3672,3735,10474,10542,10614,10684,10745,10819,10892,11737,11798,11860,11924,11986,12047,12115,12215,12275,12341,12414,12483,12540,12592,12654,13653,13729,14003,14038,14230,14291,14348,14382,14417,14452,14797,24758,112592,112793,112969,113353,113548,125859,125926" + "startLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1716,1717,1722,1725,1730,1896,1897,2661,2704,2736,2773", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "3720,3789,10521,10591,10659,10731,10801,10862,10936,11793,11854,11915,11977,12041,12103,12164,12232,12332,12392,12458,12531,12600,12657,12709,13698,13770,14085,14120,14297,14347,14408,14465,14499,14534,14844,24804,114063,114180,114447,114740,115007,127375,127447,169102,172008,174073,175833", + "endLines": "60,61,159,160,161,162,163,164,165,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,207,208,214,215,219,220,221,222,223,224,230,375,1716,1720,1722,1728,1730,1896,1897,2703,2735,2772,2779", + "endColumns": "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,34,34,49,60,56,33,34,34,69,70,116,12,109,12,128,71,66,24,24,24,24", + "endOffsets": "3784,3847,10586,10654,10726,10796,10857,10931,11004,11849,11910,11972,12036,12098,12159,12227,12327,12387,12453,12526,12595,12652,12704,12766,13765,13841,14115,14150,14342,14403,14460,14494,14529,14564,14909,24870,114175,114376,114552,114936,115131,127442,127509,172003,174068,175828,176205" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { "startLines": "83", "startColumns": "4", - "startOffsets": "5235", + "startOffsets": "5347", "endColumns": "56", - "endOffsets": "5287" + "endOffsets": "5399" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "138,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-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,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,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "8684,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1321,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1268,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "142,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-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,69,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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", - "endOffsets": "9092,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1386,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,1315,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "138,82,85,84,83,29,30,31,128,129,23,137,136,27,36,22,25,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,21,19,77,20,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,135,133,132,134,26,37,93,101,106,105,107,24,100,99,98,97,32,33", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8684,4518,4782,4685,4615,1394,1438,1491,8172,8222,1121,8625,8573,1321,1856,1054,1223,5242,5337,5170,5085,5001,6216,6132,6029,5515,2591,2539,4009,2063,2117,5577,2686,4866,8286,4446,987,846,4197,908,2746,3067,3373,2805,3937,3875,3817,3591,3538,3433,3487,3642,3693,3115,4379,3754,4247,3019,3317,3228,3169,4134,2968,4088,2863,2907,4311,2007,2332,2442,2284,2388,2227,2178,1800,1746,6679,6611,6923,8073,7292,7210,7367,7457,7701,7621,6764,6840,7150,6988,7069,6555,7846,7969,8531,8402,8344,8456,1268,1941,5446,5942,6353,6283,6434,1172,5882,5826,5763,5702,1544,1655", + "endLines": "142,82,85,84,83,29,30,31,128,129,23,137,136,27,36,22,25,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,21,19,77,20,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,135,133,132,134,26,37,93,101,106,105,107,24,100,99,98,97,32,33", + "endColumns": "14,95,82,95,68,42,51,51,48,62,49,57,50,69,83,65,43,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,65,60,48,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,51,64,67,85,79,68,93,49,58,54,61,59,109,89", + "endOffsets": "9092,4609,4860,4776,4679,1432,1485,1538,8216,8280,1166,8678,8619,1386,1935,1115,1262,5331,5440,5236,5164,5079,6277,6210,6126,5571,2648,2585,4082,2111,2172,5677,2740,4963,8336,4512,1048,902,4241,981,2799,3109,3427,2857,4003,3931,3869,3636,3585,3481,3532,3687,3748,3163,4440,3811,4305,3061,3367,3311,3222,4191,3013,4128,2901,2962,4373,2057,2382,2490,2326,2436,2278,2221,1850,1794,6758,6673,6982,8164,7361,7286,7451,7615,7840,7695,6834,6917,7204,7063,7144,6605,7963,8067,8567,8450,8396,8525,1315,2001,5509,6023,6428,6347,6523,1217,5936,5876,5820,5757,1649,1740" }, "to": { "startLines": "231,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,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,372,373,374,376,377,378,379,380,381,382,383,384,385,386,387", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "14802,17953,18049,18132,18228,18297,18340,18392,18444,18493,18556,18606,18664,18715,18785,18869,18935,18979,19073,19181,19252,19336,19419,19485,19568,19670,19731,19793,19844,19922,19975,20035,20140,20199,20301,20356,20427,20493,20554,20603,20681,20739,20786,20845,20902,20973,21034,21091,21141,21193,21246,21296,21346,21406,21459,21525,21587,21650,21697,21752,21840,21898,21960,22010,22055,22098,22158,22225,22280,22335,22388,22435,22488,22544,22592,22647,22700,22784,22851,22915,23011,23085,23166,23255,23418,23562,23641,23716,23798,23857,23937,24017,24072,24194,24297,24338,24391,24501,24575,24627,24763,24831,24917,24997,25066,25160,25210,25269,25324,25386,25446,25556", + "startOffsets": "14914,18065,18161,18244,18340,18409,18452,18504,18556,18605,18668,18718,18776,18827,18897,18981,19047,19091,19185,19293,19364,19448,19531,19597,19680,19782,19843,19905,19956,20034,20087,20147,20252,20311,20413,20468,20539,20605,20666,20715,20793,20851,20898,20957,21014,21085,21146,21203,21253,21305,21358,21408,21458,21518,21571,21637,21699,21762,21809,21864,21952,22010,22072,22122,22167,22210,22270,22337,22392,22447,22500,22547,22600,22656,22704,22759,22812,22896,22963,23027,23123,23197,23278,23367,23530,23674,23753,23828,23910,23969,24049,24129,24184,24306,24409,24450,24503,24613,24687,24739,24875,24943,25029,25109,25178,25272,25322,25381,25436,25498,25558,25668", "endLines": "235,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,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,372,373,374,376,377,378,379,380,381,382,383,384,385,386,387", "endColumns": "14,95,82,95,68,42,51,51,48,62,49,57,50,69,83,65,43,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,65,60,48,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,51,64,67,85,79,68,93,49,58,54,61,59,109,89", - "endOffsets": "15190,18044,18127,18223,18292,18335,18387,18439,18488,18551,18601,18659,18710,18780,18864,18930,18974,19068,19176,19247,19331,19414,19480,19563,19665,19726,19788,19839,19917,19970,20030,20135,20194,20296,20351,20422,20488,20549,20598,20676,20734,20781,20840,20897,20968,21029,21086,21136,21188,21241,21291,21341,21401,21454,21520,21582,21645,21692,21747,21835,21893,21955,22005,22050,22093,22153,22220,22275,22330,22383,22430,22483,22539,22587,22642,22695,22779,22846,22910,23006,23080,23161,23250,23413,23557,23636,23711,23793,23852,23932,24012,24067,24189,24292,24333,24386,24443,24570,24622,24687,24826,24912,24992,25061,25155,25205,25264,25319,25381,25441,25551,25641" + "endOffsets": "15302,18156,18239,18335,18404,18447,18499,18551,18600,18663,18713,18771,18822,18892,18976,19042,19086,19180,19288,19359,19443,19526,19592,19675,19777,19838,19900,19951,20029,20082,20142,20247,20306,20408,20463,20534,20600,20661,20710,20788,20846,20893,20952,21009,21080,21141,21198,21248,21300,21353,21403,21453,21513,21566,21632,21694,21757,21804,21859,21947,22005,22067,22117,22162,22205,22265,22332,22387,22442,22495,22542,22595,22651,22699,22754,22807,22891,22958,23022,23118,23192,23273,23362,23525,23669,23748,23823,23905,23964,24044,24124,24179,24301,24404,24445,24498,24555,24682,24734,24799,24938,25024,25104,25173,25267,25317,25376,25431,25493,25553,25663,25753" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\4934a1cc56a737fda53ad43d7fd2ad53\\appcompat-1.0.0-alpha1\\res\\values\\values.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" + "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,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,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,1391,1392,1396,1400,1404,1409,1415,1422,1426,1430,1435,1439,1443,1447,1451,1455,1459,1465,1469,1475,1479,1485,1489,1494,1498,1501,1505,1511,1515,1521,1525,1531,1534,1538,1542,1546,1550,1554,1555,1556,1557,1560,1563,1566,1569,1573,1574,1575,1576,1577,1580,1582,1584,1586,1591,1592,1596,1602,1606,1607,1609,1620,1621,1625,1631,1635,1636,1637,1641,1668,1672,1673,1677,1705,1873,1899,2068,2094,2125,2133,2139,2153,2175,2180,2185,2195,2204,2213,2217,2224,2232,2239,2240,2249,2252,2255,2259,2263,2267,2270,2271,2275,2279,2289,2294,2301,2307,2308,2311,2315,2320,2322,2324,2327,2330,2332,2336,2339,2346,2349,2352,2356,2358,2362,2364,2366,2368,2372,2380,2388,2400,2406,2415,2418,2429,2432,2437,2438,2443,2501,2560,2561,2571,2580,2581,2583,2587,2590,2593,2596,2599,2602,2605,2608,2612,2615,2618,2621,2625,2628,2632,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2658,2660,2661,2662,2663,2664,2665,2666,2667,2669,2670,2672,2673,2675,2677,2678,2680,2681,2682,2683,2684,2685,2687,2688,2689,2690,2691,2692,2694,2696,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,2710,2712,2713,2714,2715,2716,2717,2719,2723,2727,2728,2729,2730,2731,2732,2733,2734,2736,2738,2740,2742,2744,2745,2746,2747,2749,2751,2753,2754,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2767,2768,2769,2770,2772,2774,2775,2777,2778,2780,2782,2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2795,2797,2798,2799,2800,2802,2803,2804,2805,2806,2808,2810,2812,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,69,152,155,158,161,175,186,196,226,253,262,299,680,692,718,736,772,778,784,807,948,968,974,978,984,1021,1033,1099,1114,1179,1198,1224", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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,66677,66746,66815,66885,66959,67035,67099,67176,67252,67329,67394,67463,67540,67615,67684,67752,67829,67895,67956,68053,68118,68187,68286,68357,68416,68474,68531,68590,68654,68725,68797,68869,68941,69013,69080,69148,69216,69275,69338,69402,69492,69583,69643,69709,69776,69842,69912,69976,70029,70142,70200,70263,70328,70393,70468,70541,70613,70662,70723,70784,70845,70907,70971,71035,71099,71164,71227,71287,71348,71414,71473,71533,71595,71666,71726,71794,71880,71967,72057,72144,72232,72314,72397,72487,72578,72630,72688,72733,72799,72863,72920,72977,73031,73088,73136,73185,73236,73270,73317,73366,73412,73444,73508,73570,73630,73687,73761,73831,73909,73963,74033,74118,74166,74212,74283,74361,74439,74511,74585,74659,74733,74813,74886,74955,75027,75104,75165,75228,75294,75358,75429,75492,75557,75621,75682,75743,75795,75868,75942,76011,76086,76160,76234,76375,76445,76498,76576,76666,76754,76850,76940,77522,77611,77858,78139,78391,78676,79069,79546,79768,79990,80266,80493,80723,80953,81183,81413,81640,82059,82285,82710,82940,83368,83587,83870,84078,84209,84436,84862,85087,85514,85735,86160,86280,86556,86857,87181,87472,87786,87923,88054,88159,88401,88568,88772,88980,89251,89363,89475,89580,89697,89911,90057,90197,90283,90631,90719,90965,91383,91632,91714,91812,92429,92529,92781,93205,93460,93554,93643,93880,95932,96174,96276,96529,98713,109434,110950,121770,123298,125055,125681,126101,127162,128427,128683,128919,129466,129960,130565,130763,131343,131907,132282,132400,132938,133095,133291,133564,133820,133990,134131,134195,134477,134763,135439,135703,136041,136394,136488,136674,136980,137242,137367,137494,137733,137944,138063,138256,138433,138888,139069,139191,139450,139563,139750,139852,139959,140088,140363,140871,141367,142244,142538,143108,143257,143989,144161,144497,144589,144867,149211,153698,153760,154390,155004,155095,155208,155437,155597,155749,155920,156086,156255,156422,156585,156828,156998,157171,157342,157616,157815,158020,158350,158434,158530,158626,158724,158824,158926,159028,159130,159232,159334,159434,159530,159642,159771,159894,160025,160156,160254,160368,160462,160602,160736,160832,160944,161044,161160,161256,161368,161468,161608,161744,161908,162038,162196,162346,162487,162631,162766,162878,163028,163156,163284,163420,163552,163682,163812,163924,164064,164210,164354,164492,164558,164648,164724,164828,164918,165020,165128,165236,165336,165416,165508,165606,165716,165794,165900,165992,166096,166206,166328,166491,166648,166728,166828,166918,167028,167122,167228,167320,167420,167532,167646,167762,167878,167972,168086,168198,168300,168420,168542,168624,168728,168848,168974,169072,169166,169254,169366,169482,169604,169716,169891,170007,170093,170185,170297,170421,170488,170614,170682,170810,170954,171082,171151,171246,171361,171474,171573,171682,171793,171904,172005,172110,172210,172340,172431,172554,172648,172760,172846,172950,173046,173134,173252,173356,173460,173586,173674,173782,173882,173972,174082,174166,174268,174352,174406,174470,174576,174686,174770,4638,9782,9900,10015,10147,10862,11554,12071,13670,15203,15591,17898,37416,37974,39366,40399,42412,42674,43030,43860,50642,51776,52070,52293,52620,54670,55318,59169,59770,63579,64794,66203", + "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,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,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,1390,1391,1395,1399,1403,1408,1414,1421,1425,1429,1434,1438,1442,1446,1450,1454,1458,1464,1468,1474,1478,1484,1488,1493,1497,1500,1504,1510,1514,1520,1524,1530,1533,1537,1541,1545,1549,1553,1554,1555,1556,1559,1562,1565,1568,1572,1573,1574,1575,1576,1579,1581,1583,1585,1590,1591,1595,1601,1605,1606,1608,1619,1620,1624,1630,1634,1635,1636,1640,1667,1671,1672,1676,1704,1872,1898,2067,2093,2124,2132,2138,2152,2174,2179,2184,2194,2203,2212,2216,2223,2231,2238,2239,2248,2251,2254,2258,2262,2266,2269,2270,2274,2278,2288,2293,2300,2306,2307,2310,2314,2319,2321,2323,2326,2329,2331,2335,2338,2345,2348,2351,2355,2357,2361,2363,2365,2367,2371,2379,2387,2399,2405,2414,2417,2428,2431,2436,2437,2442,2500,2559,2560,2570,2579,2580,2582,2586,2589,2592,2595,2598,2601,2604,2607,2611,2614,2617,2620,2624,2627,2631,2635,2636,2637,2638,2639,2640,2641,2642,2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2657,2659,2660,2661,2662,2663,2664,2665,2666,2668,2669,2671,2672,2674,2676,2677,2679,2680,2681,2682,2683,2684,2686,2687,2688,2689,2690,2691,2693,2695,2697,2698,2699,2700,2701,2702,2703,2704,2705,2706,2707,2708,2709,2711,2712,2713,2714,2715,2716,2718,2722,2726,2727,2728,2729,2730,2731,2732,2733,2735,2737,2739,2741,2743,2744,2745,2746,2748,2750,2752,2753,2754,2755,2756,2757,2758,2759,2760,2761,2762,2763,2766,2767,2768,2769,2771,2773,2774,2776,2777,2779,2781,2783,2784,2785,2786,2787,2788,2789,2790,2791,2792,2793,2794,2796,2797,2798,2799,2801,2802,2803,2804,2805,2807,2809,2811,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,2825,2826,2827,151,154,157,160,174,185,195,225,252,261,298,679,684,717,735,771,777,783,806,947,967,973,977,983,1020,1032,1098,1113,1178,1197,1223,1232", + "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", + "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,66741,66810,66880,66954,67030,67094,67171,67247,67324,67389,67458,67535,67610,67679,67747,67824,67890,67951,68048,68113,68182,68281,68352,68411,68469,68526,68585,68649,68720,68792,68864,68936,69008,69075,69143,69211,69270,69333,69397,69487,69578,69638,69704,69771,69837,69907,69971,70024,70137,70195,70258,70323,70388,70463,70536,70608,70657,70718,70779,70840,70902,70966,71030,71094,71159,71222,71282,71343,71409,71468,71528,71590,71661,71721,71789,71875,71962,72052,72139,72227,72309,72392,72482,72573,72625,72683,72728,72794,72858,72915,72972,73026,73083,73131,73180,73231,73265,73312,73361,73407,73439,73503,73565,73625,73682,73756,73826,73904,73958,74028,74113,74161,74207,74278,74356,74434,74506,74580,74654,74728,74808,74881,74950,75022,75099,75160,75223,75289,75353,75424,75487,75552,75616,75677,75738,75790,75863,75937,76006,76081,76155,76229,76370,76440,76493,76571,76661,76749,76845,76935,77517,77606,77853,78134,78386,78671,79064,79541,79763,79985,80261,80488,80718,80948,81178,81408,81635,82054,82280,82705,82935,83363,83582,83865,84073,84204,84431,84857,85082,85509,85730,86155,86275,86551,86852,87176,87467,87781,87918,88049,88154,88396,88563,88767,88975,89246,89358,89470,89575,89692,89906,90052,90192,90278,90626,90714,90960,91378,91627,91709,91807,92424,92524,92776,93200,93455,93549,93638,93875,95927,96169,96271,96524,98708,109429,110945,121765,123293,125050,125676,126096,127157,128422,128678,128914,129461,129955,130560,130758,131338,131902,132277,132395,132933,133090,133286,133559,133815,133985,134126,134190,134472,134758,135434,135698,136036,136389,136483,136669,136975,137237,137362,137489,137728,137939,138058,138251,138428,138883,139064,139186,139445,139558,139745,139847,139954,140083,140358,140866,141362,142239,142533,143103,143252,143984,144156,144492,144584,144862,149206,153693,153755,154385,154999,155090,155203,155432,155592,155744,155915,156081,156250,156417,156580,156823,156993,157166,157337,157611,157810,158015,158345,158429,158525,158621,158719,158819,158921,159023,159125,159227,159329,159429,159525,159637,159766,159889,160020,160151,160249,160363,160457,160597,160731,160827,160939,161039,161155,161251,161363,161463,161603,161739,161903,162033,162191,162341,162482,162626,162761,162873,163023,163151,163279,163415,163547,163677,163807,163919,164059,164205,164349,164487,164553,164643,164719,164823,164913,165015,165123,165231,165331,165411,165503,165601,165711,165789,165895,165987,166091,166201,166323,166486,166643,166723,166823,166913,167023,167117,167223,167315,167415,167527,167641,167757,167873,167967,168081,168193,168295,168415,168537,168619,168723,168843,168969,169067,169161,169249,169361,169477,169599,169711,169886,170002,170088,170180,170292,170416,170483,170609,170677,170805,170949,171077,171146,171241,171356,171469,171568,171677,171788,171899,172000,172105,172205,172335,172426,172549,172643,172755,172841,172945,173041,173129,173247,173351,173455,173581,173669,173777,173877,173967,174077,174161,174263,174347,174401,174465,174571,174681,174765,174885,9777,9895,10010,10142,10857,11549,12066,13665,15198,15586,17893,37411,37671,39361,40394,42407,42669,43025,43855,50637,51771,52065,52288,52615,54665,55313,59164,59765,63574,64789,66198,66672" }, "to": { - "startLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,882,908,1076,1102,1133,1141,1147,1161,1183,1188,1193,1203,1212,1221,1225,1232,1240,1247,1248,1257,1260,1263,1267,1271,1275,1278,1279,1283,1287,1297,1302,1309,1315,1316,1319,1323,1328,1330,1332,1335,1338,1340,1344,1347,1354,1357,1360,1364,1366,1370,1372,1374,1376,1380,1388,1396,1408,1414,1423,1426,1437,1440,1445,1446,1465,1523,1582,1583,1593,1602,1603,1605,1609,1612,1615,1618,1621,1624,1627,1630,1634,1637,1640,1643,1647,1650,1654,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1680,1682,1683,1684,1685,1686,1687,1688,1689,1691,1692,1694,1695,1697,1699,1700,1702,1703,1704,1705,1706,1707,1709,1710,1711,1712,1713,1730,1732,1734,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1778,1779,1780,1781,1782,1783,1785,1789,1793,1794,1795,1796,1797,1798,1799,1800,1802,1804,1806,1808,1810,1811,1812,1813,1815,1817,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1833,1834,1835,1836,1838,1840,1841,1843,1844,1846,1848,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1863,1864,1865,1866,1868,1869,1870,1871,1872,1874,1876,1878,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "481,536,581,630,671,726,785,847,928,989,1064,1140,1217,1295,1380,1462,1538,1614,1691,1769,1875,1981,2060,2140,2197,2255,2329,2404,2469,2535,2595,2656,2728,2801,2868,2936,2995,3054,3113,3172,3231,3285,3339,3392,3446,3500,3554,3829,3903,3982,4055,4129,4200,4272,4344,4417,4474,4532,4605,4679,4753,4828,4900,4973,5043,5114,5174,5292,5361,5430,5500,5574,5650,5714,5791,5867,5944,6009,6078,6155,6230,6299,6367,6444,6510,6571,6668,6733,6802,6901,6972,7031,7089,7146,7205,7269,7340,7412,7484,7556,7628,7695,7763,7831,7890,7953,8017,8107,8198,8258,8324,8391,8457,8527,8591,8644,8757,8815,8878,8943,9008,9083,9156,9228,9277,9338,9399,9460,9522,9586,9650,9714,9779,9842,9902,9963,10029,10088,10148,10210,10281,10341,10897,10983,11070,11160,11247,11335,11417,11500,11590,13133,13185,13243,13288,13354,13418,13475,13532,13734,13791,13839,13888,13939,14043,14090,14139,14457,14489,14553,14615,14675,15195,15269,15339,15417,15471,15541,15626,15674,15720,15791,15869,15947,16019,16093,16167,16241,16321,16394,16463,16535,16612,16673,16736,16802,16866,16937,17000,17065,17129,17190,17251,17303,17376,17450,17519,17594,17668,17742,17883,24448,25646,25724,25814,25902,25998,26088,26670,26759,27006,27287,27539,27824,28217,28694,28916,29138,29414,29641,29871,30101,30331,30561,30788,31207,31433,31858,32088,32516,32735,33018,33226,33357,33584,34010,34235,34662,34883,35308,35428,35704,36005,36329,36620,36934,37071,37202,37307,37549,37716,37920,38128,38399,38511,38623,38728,38845,39059,39205,39345,39431,39779,39867,40113,40531,40780,40862,40960,41552,41652,41904,42328,42583,42677,42766,43003,45027,45269,45371,45624,47780,57909,59425,69653,71181,72938,73564,73984,75045,76310,76566,76802,77349,77843,78448,78646,79226,79790,80165,80283,80821,80978,81174,81447,81703,81873,82014,82078,82360,82646,83322,83586,83924,84277,84371,84557,84863,85125,85250,85377,85616,85827,85946,86139,86316,86771,86952,87074,87333,87446,87633,87735,87842,87971,88246,88754,89250,90127,90421,90991,91140,91872,92044,92380,92472,93489,97771,102196,102258,102836,103420,103511,103624,103853,104013,104165,104336,104502,104671,104838,105001,105244,105414,105587,105758,106032,106231,106436,106766,106850,106946,107042,107140,107240,107342,107444,107546,107648,107750,107850,107946,108058,108187,108310,108441,108572,108670,108784,108878,109018,109152,109248,109360,109460,109576,109672,109784,109884,110024,110160,110324,110454,110612,110762,110903,111047,111182,111294,111444,111572,111700,111836,111968,112098,112228,112340,113620,113766,113910,115394,115460,115550,115626,115730,115820,115922,116030,116138,116238,116318,116410,116508,116618,116696,116802,116894,116998,117108,117230,117393,117550,117630,117730,117820,117930,118024,118130,118222,118322,118434,118548,118664,118780,118874,118988,119100,119202,119322,119444,119526,119630,119750,119876,119974,120068,120156,120268,120384,120506,120618,120793,120909,120995,121087,121199,121323,121390,121516,121584,121712,121856,121984,122053,122148,122263,122376,122475,122584,122695,122806,122907,123012,123112,123242,123333,123456,123550,123662,123748,123852,123948,124036,124154,124258,124362,124488,124576,124684,124784,124874,124984,125068,125170,125254,125308,125372,125478,125588,125672", - "endLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,881,907,1075,1101,1132,1140,1146,1160,1182,1187,1192,1202,1211,1220,1224,1231,1239,1246,1247,1256,1259,1262,1266,1270,1274,1277,1278,1282,1286,1296,1301,1308,1314,1315,1318,1322,1327,1329,1331,1334,1337,1339,1343,1346,1353,1356,1359,1363,1365,1369,1371,1373,1375,1379,1387,1395,1407,1413,1422,1425,1436,1439,1444,1445,1450,1522,1581,1582,1592,1601,1602,1604,1608,1611,1614,1617,1620,1623,1626,1629,1633,1636,1639,1642,1646,1649,1653,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1679,1681,1682,1683,1684,1685,1686,1687,1688,1690,1691,1693,1694,1696,1698,1699,1701,1702,1703,1704,1705,1706,1708,1709,1710,1711,1712,1713,1731,1733,1735,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1777,1778,1779,1780,1781,1782,1784,1788,1792,1793,1794,1795,1796,1797,1798,1799,1801,1803,1805,1807,1809,1810,1811,1812,1814,1816,1818,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1832,1833,1834,1835,1837,1839,1840,1842,1843,1845,1847,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1862,1863,1864,1865,1867,1868,1869,1870,1871,1873,1875,1877,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893", - "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": "531,576,625,666,721,780,842,923,984,1059,1135,1212,1290,1375,1457,1533,1609,1686,1764,1870,1976,2055,2135,2192,2250,2324,2399,2464,2530,2590,2651,2723,2796,2863,2931,2990,3049,3108,3167,3226,3280,3334,3387,3441,3495,3549,3603,3898,3977,4050,4124,4195,4267,4339,4412,4469,4527,4600,4674,4748,4823,4895,4968,5038,5109,5169,5230,5356,5425,5495,5569,5645,5709,5786,5862,5939,6004,6073,6150,6225,6294,6362,6439,6505,6566,6663,6728,6797,6896,6967,7026,7084,7141,7200,7264,7335,7407,7479,7551,7623,7690,7758,7826,7885,7948,8012,8102,8193,8253,8319,8386,8452,8522,8586,8639,8752,8810,8873,8938,9003,9078,9151,9223,9272,9333,9394,9455,9517,9581,9645,9709,9774,9837,9897,9958,10024,10083,10143,10205,10276,10336,10404,10978,11065,11155,11242,11330,11412,11495,11585,11676,13180,13238,13283,13349,13413,13470,13527,13581,13786,13834,13883,13934,13968,14085,14134,14180,14484,14548,14610,14670,14727,15264,15334,15412,15466,15536,15621,15669,15715,15786,15864,15942,16014,16088,16162,16236,16316,16389,16458,16530,16607,16668,16731,16797,16861,16932,16995,17060,17124,17185,17246,17298,17371,17445,17514,17589,17663,17737,17878,17948,24496,25719,25809,25897,25993,26083,26665,26754,27001,27282,27534,27819,28212,28689,28911,29133,29409,29636,29866,30096,30326,30556,30783,31202,31428,31853,32083,32511,32730,33013,33221,33352,33579,34005,34230,34657,34878,35303,35423,35699,36000,36324,36615,36929,37066,37197,37302,37544,37711,37915,38123,38394,38506,38618,38723,38840,39054,39200,39340,39426,39774,39862,40108,40526,40775,40857,40955,41547,41647,41899,42323,42578,42672,42761,42998,45022,45264,45366,45619,47775,57904,59420,69648,71176,72933,73559,73979,75040,76305,76561,76797,77344,77838,78443,78641,79221,79785,80160,80278,80816,80973,81169,81442,81698,81868,82009,82073,82355,82641,83317,83581,83919,84272,84366,84552,84858,85120,85245,85372,85611,85822,85941,86134,86311,86766,86947,87069,87328,87441,87628,87730,87837,87966,88241,88749,89245,90122,90416,90986,91135,91867,92039,92375,92467,92745,97766,102191,102253,102831,103415,103506,103619,103848,104008,104160,104331,104497,104666,104833,104996,105239,105409,105582,105753,106027,106226,106431,106761,106845,106941,107037,107135,107235,107337,107439,107541,107643,107745,107845,107941,108053,108182,108305,108436,108567,108665,108779,108873,109013,109147,109243,109355,109455,109571,109667,109779,109879,110019,110155,110319,110449,110607,110757,110898,111042,111177,111289,111439,111567,111695,111831,111963,112093,112223,112335,112475,113761,113905,114043,115455,115545,115621,115725,115815,115917,116025,116133,116233,116313,116405,116503,116613,116691,116797,116889,116993,117103,117225,117388,117545,117625,117725,117815,117925,118019,118125,118217,118317,118429,118543,118659,118775,118869,118983,119095,119197,119317,119439,119521,119625,119745,119871,119969,120063,120151,120263,120379,120501,120613,120788,120904,120990,121082,121194,121318,121385,121511,121579,121707,121851,121979,122048,122143,122258,122371,122470,122579,122690,122801,122902,123007,123107,123237,123328,123451,123545,123657,123743,123847,123943,124031,124149,124253,124357,124483,124571,124679,124779,124869,124979,125063,125165,125249,125303,125367,125473,125583,125667,125787" + "startLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,393,401,402,406,410,414,419,425,432,436,440,445,449,453,457,461,465,469,475,479,485,489,495,499,504,508,511,515,521,525,531,535,541,544,548,552,556,560,564,565,566,567,570,573,576,579,583,584,585,586,587,590,592,594,596,601,602,606,612,616,617,619,630,631,635,641,645,646,647,651,678,682,683,687,715,883,909,1078,1104,1135,1143,1149,1163,1185,1190,1195,1205,1214,1223,1227,1234,1242,1249,1250,1259,1262,1265,1269,1273,1277,1280,1281,1285,1289,1299,1304,1311,1317,1318,1321,1325,1330,1332,1334,1337,1340,1342,1346,1349,1356,1359,1362,1366,1368,1372,1374,1376,1378,1382,1390,1398,1410,1416,1425,1428,1439,1442,1447,1448,1467,1525,1584,1585,1595,1604,1605,1607,1611,1614,1617,1620,1623,1626,1629,1632,1636,1639,1642,1645,1649,1652,1656,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1682,1684,1685,1686,1687,1688,1689,1690,1691,1693,1694,1696,1697,1699,1701,1702,1704,1705,1706,1707,1708,1709,1711,1712,1713,1714,1715,1732,1734,1736,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1780,1781,1782,1783,1784,1785,1787,1791,1795,1796,1797,1798,1799,1800,1801,1802,1804,1806,1808,1810,1812,1813,1814,1815,1817,1819,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1835,1836,1837,1838,1840,1842,1843,1845,1846,1848,1850,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1865,1866,1867,1868,1870,1871,1872,1873,1874,1876,1878,1880,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1901,1984,1987,1990,1993,2007,2018,2028,2058,2085,2094,2131,2512,2518,2643,2780,2816,2822,2828,2851,2992,3012,3018,3022,3028,3065,3077,3143,3158,3223,3242,3268", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "593,648,693,742,783,838,897,959,1040,1101,1176,1252,1329,1407,1492,1574,1650,1726,1803,1881,1987,2093,2172,2252,2309,2367,2441,2516,2581,2647,2707,2768,2840,2913,2980,3048,3107,3166,3225,3284,3343,3397,3451,3504,3558,3612,3666,3941,4015,4094,4167,4241,4312,4384,4456,4529,4586,4644,4717,4791,4865,4940,5012,5085,5155,5226,5286,5404,5473,5542,5612,5686,5762,5826,5903,5979,6056,6121,6190,6267,6342,6411,6479,6556,6622,6683,6780,6845,6914,7013,7084,7143,7201,7258,7317,7381,7452,7524,7596,7668,7740,7807,7875,7943,8002,8065,8129,8219,8310,8370,8436,8503,8569,8639,8703,8756,8869,8927,8990,9055,9120,9195,9268,9340,9389,9450,9511,9572,9634,9698,9762,9826,9891,9954,10014,10075,10141,10200,10260,10322,10393,10453,11009,11095,11182,11272,11359,11447,11529,11612,11702,13245,13297,13355,13400,13466,13530,13587,13644,13846,13903,13951,14000,14051,14155,14202,14251,14569,14601,14665,14727,14787,15307,15381,15451,15529,15583,15653,15738,15786,15832,15903,15981,16059,16131,16205,16279,16353,16433,16506,16575,16647,16724,16785,16848,16914,16978,17049,17112,17177,17241,17302,17363,17415,17488,17562,17631,17706,17780,17854,17995,24560,25758,25836,25926,26014,26110,26200,26782,26871,27118,27399,27651,27936,28329,28806,29028,29250,29526,29753,29983,30213,30443,30673,30900,31319,31545,31970,32200,32628,32847,33130,33338,33469,33696,34122,34347,34774,34995,35420,35540,35816,36117,36441,36732,37046,37183,37314,37419,37661,37828,38032,38240,38511,38623,38735,38840,38957,39171,39317,39457,39543,39891,39979,40225,40643,40892,40974,41072,41689,41789,42041,42465,42720,42814,42903,43140,45192,45434,45536,45789,47973,58694,60210,71030,72558,74315,74941,75361,76422,77687,77943,78179,78726,79220,79825,80023,80603,81167,81542,81660,82198,82355,82551,82824,83080,83250,83391,83455,83737,84023,84699,84963,85301,85654,85748,85934,86240,86502,86627,86754,86993,87204,87323,87516,87693,88148,88329,88451,88710,88823,89010,89112,89219,89348,89623,90131,90627,91504,91798,92368,92517,93249,93421,93757,93849,94866,99210,103697,103759,104389,105003,105094,105207,105436,105596,105748,105919,106085,106254,106421,106584,106827,106997,107170,107341,107615,107814,108019,108349,108433,108529,108625,108723,108823,108925,109027,109129,109231,109333,109433,109529,109641,109770,109893,110024,110155,110253,110367,110461,110601,110735,110831,110943,111043,111159,111255,111367,111467,111607,111743,111907,112037,112195,112345,112486,112630,112765,112877,113027,113155,113283,113419,113551,113681,113811,113923,115203,115349,115493,116977,117043,117133,117209,117313,117403,117505,117613,117721,117821,117901,117993,118091,118201,118279,118385,118477,118581,118691,118813,118976,119133,119213,119313,119403,119513,119607,119713,119805,119905,120017,120131,120247,120363,120457,120571,120683,120785,120905,121027,121109,121213,121333,121459,121557,121651,121739,121851,121967,122089,122201,122376,122492,122578,122670,122782,122906,122973,123099,123167,123295,123439,123567,123636,123731,123846,123959,124058,124167,124278,124389,124490,124595,124695,124825,124916,125039,125133,125245,125331,125435,125531,125619,125737,125841,125945,126071,126159,126267,126367,126457,126567,126651,126753,126837,126891,126955,127061,127171,127255,127659,132803,132921,133036,133168,133883,134575,135092,136691,138224,138612,140919,160437,160858,168069,176210,178223,178485,178841,179671,186453,187587,187881,188104,188431,190481,191129,194980,195581,199390,200605,202014", + "endLines": "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,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,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,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,166,167,168,169,170,171,172,173,174,199,200,201,202,203,204,205,206,209,210,211,212,213,216,217,218,225,226,227,228,229,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,371,388,389,390,391,392,400,401,405,409,413,418,424,431,435,439,444,448,452,456,460,464,468,474,478,484,488,494,498,503,507,510,514,520,524,530,534,540,543,547,551,555,559,563,564,565,566,569,572,575,578,582,583,584,585,586,589,591,593,595,600,601,605,611,615,616,618,629,630,634,640,644,645,646,650,677,681,682,686,714,882,908,1077,1103,1134,1142,1148,1162,1184,1189,1194,1204,1213,1222,1226,1233,1241,1248,1249,1258,1261,1264,1268,1272,1276,1279,1280,1284,1288,1298,1303,1310,1316,1317,1320,1324,1329,1331,1333,1336,1339,1341,1345,1348,1355,1358,1361,1365,1367,1371,1373,1375,1377,1381,1389,1397,1409,1415,1424,1427,1438,1441,1446,1447,1452,1524,1583,1584,1594,1603,1604,1606,1610,1613,1616,1619,1622,1625,1628,1631,1635,1638,1641,1644,1648,1651,1655,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1681,1683,1684,1685,1686,1687,1688,1689,1690,1692,1693,1695,1696,1698,1700,1701,1703,1704,1705,1706,1707,1708,1710,1711,1712,1713,1714,1715,1733,1735,1737,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1779,1780,1781,1782,1783,1784,1786,1790,1794,1795,1796,1797,1798,1799,1800,1801,1803,1805,1807,1809,1811,1812,1813,1814,1816,1818,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1834,1835,1836,1837,1839,1841,1842,1844,1845,1847,1849,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1864,1865,1866,1867,1869,1870,1871,1872,1873,1875,1877,1879,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1983,1986,1989,1992,2006,2017,2027,2057,2084,2093,2130,2511,2516,2543,2660,2815,2821,2827,2850,2991,3011,3017,3021,3027,3064,3076,3142,3157,3222,3241,3267,3276", + "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", + "endOffsets": "643,688,737,778,833,892,954,1035,1096,1171,1247,1324,1402,1487,1569,1645,1721,1798,1876,1982,2088,2167,2247,2304,2362,2436,2511,2576,2642,2702,2763,2835,2908,2975,3043,3102,3161,3220,3279,3338,3392,3446,3499,3553,3607,3661,3715,4010,4089,4162,4236,4307,4379,4451,4524,4581,4639,4712,4786,4860,4935,5007,5080,5150,5221,5281,5342,5468,5537,5607,5681,5757,5821,5898,5974,6051,6116,6185,6262,6337,6406,6474,6551,6617,6678,6775,6840,6909,7008,7079,7138,7196,7253,7312,7376,7447,7519,7591,7663,7735,7802,7870,7938,7997,8060,8124,8214,8305,8365,8431,8498,8564,8634,8698,8751,8864,8922,8985,9050,9115,9190,9263,9335,9384,9445,9506,9567,9629,9693,9757,9821,9886,9949,10009,10070,10136,10195,10255,10317,10388,10448,10516,11090,11177,11267,11354,11442,11524,11607,11697,11788,13292,13350,13395,13461,13525,13582,13639,13693,13898,13946,13995,14046,14080,14197,14246,14292,14596,14660,14722,14782,14839,15376,15446,15524,15578,15648,15733,15781,15827,15898,15976,16054,16126,16200,16274,16348,16428,16501,16570,16642,16719,16780,16843,16909,16973,17044,17107,17172,17236,17297,17358,17410,17483,17557,17626,17701,17775,17849,17990,18060,24608,25831,25921,26009,26105,26195,26777,26866,27113,27394,27646,27931,28324,28801,29023,29245,29521,29748,29978,30208,30438,30668,30895,31314,31540,31965,32195,32623,32842,33125,33333,33464,33691,34117,34342,34769,34990,35415,35535,35811,36112,36436,36727,37041,37178,37309,37414,37656,37823,38027,38235,38506,38618,38730,38835,38952,39166,39312,39452,39538,39886,39974,40220,40638,40887,40969,41067,41684,41784,42036,42460,42715,42809,42898,43135,45187,45429,45531,45784,47968,58689,60205,71025,72553,74310,74936,75356,76417,77682,77938,78174,78721,79215,79820,80018,80598,81162,81537,81655,82193,82350,82546,82819,83075,83245,83386,83450,83732,84018,84694,84958,85296,85649,85743,85929,86235,86497,86622,86749,86988,87199,87318,87511,87688,88143,88324,88446,88705,88818,89005,89107,89214,89343,89618,90126,90622,91499,91793,92363,92512,93244,93416,93752,93844,94122,99205,103692,103754,104384,104998,105089,105202,105431,105591,105743,105914,106080,106249,106416,106579,106822,106992,107165,107336,107610,107809,108014,108344,108428,108524,108620,108718,108818,108920,109022,109124,109226,109328,109428,109524,109636,109765,109888,110019,110150,110248,110362,110456,110596,110730,110826,110938,111038,111154,111250,111362,111462,111602,111738,111902,112032,112190,112340,112481,112625,112760,112872,113022,113150,113278,113414,113546,113676,113806,113918,114058,115344,115488,115626,117038,117128,117204,117308,117398,117500,117608,117716,117816,117896,117988,118086,118196,118274,118380,118472,118576,118686,118808,118971,119128,119208,119308,119398,119508,119602,119708,119800,119900,120012,120126,120242,120358,120452,120566,120678,120780,120900,121022,121104,121208,121328,121454,121552,121646,121734,121846,121962,122084,122196,122371,122487,122573,122665,122777,122901,122968,123094,123162,123290,123434,123562,123631,123726,123841,123954,124053,124162,124273,124384,124485,124590,124690,124820,124911,125034,125128,125240,125326,125430,125526,125614,125732,125836,125940,126066,126154,126262,126362,126452,126562,126646,126748,126832,126886,126950,127056,127166,127250,127370,132798,132916,133031,133163,133878,134570,135087,136686,138219,138607,140914,160432,160692,162245,169097,178218,178480,178836,179666,186448,187582,187876,188099,188426,190476,191124,194975,195576,199385,200600,202009,202483" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,300", + "startOffsets": "105,412", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "295,415" + "endOffsets": "407,527" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,66,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "1451,1455,1459,1462,1736,1740,1744,1748,1752,1756,1760", + "startLines": "1453,1457,1461,1464,1738,1742,1746,1750,1754,1758,1762", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "92750,92954,93165,93329,114048,114231,114416,114601,114804,115010,115193", - "endLines": "1454,1458,1461,1464,1739,1743,1747,1751,1755,1759,1763", + "startOffsets": "94127,94331,94542,94706,115631,115814,115999,116184,116387,116593,116776", + "endLines": "1456,1460,1463,1466,1741,1745,1749,1753,1757,1761,1765", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "92949,93160,93324,93484,114226,114411,114596,114799,115005,115188,115389" + "endOffsets": "94326,94537,94701,94861,115809,115994,116179,116382,116588,116771,116972" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\2f42828d6ee707186c1f0dd1f7f0a382\\coordinatorlayout-1.0.0\\res\\values\\values.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "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": "12,1896", - "startColumns": "4,4", - "startOffsets": "420,125931", - "endLines": "12,1898", - "endColumns": "60,12", - "endOffsets": "476,126071" + "startLines": "12,1898,2544,2554", + "startColumns": "4,4,4,4", + "startOffsets": "532,127514,162250,162858", + "endLines": "12,1900,2553,2642", + "endColumns": "60,12,24,24", + "endOffsets": "588,127654,162853,168064" } }, { "source": "C:\\Users\\Lenovo\\.gradle\\caches\\transforms-2\\files-2.1\\e07d0e610d848e1704966f0c1c566747\\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" + "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": "62,190,191,192,193,1719,1721,1722,1727,1729", + "startLines": "62,190,191,192,193,1721,1723,1724,1729,1731", "startColumns": "4,4,4,4,4,4,4,4,4,4", - "startOffsets": "3740,12659,12712,12765,12818,112798,112974,113096,113358,113553", + "startOffsets": "3852,12771,12824,12877,12930,114381,114557,114679,114941,115136", "endColumns": "88,52,52,52,52,65,121,60,65,66", - "endOffsets": "3824,12707,12760,12813,12866,112859,113091,113152,113419,113615" + "endOffsets": "3936,12819,12872,12925,12978,114442,114674,114735,115002,115198" } }, { "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { "startLines": "194,195,196,197,198", "startColumns": "4,4,4,4,4", - "startOffsets": "12871,12923,12976,13029,13081", + "startOffsets": "12983,13035,13088,13141,13193", "endColumns": "51,52,52,51,51", - "endOffsets": "12918,12971,13024,13076,13128" + "endOffsets": "13030,13083,13136,13188,13240" } } ] diff --git a/src/app/build/intermediates/blame/res/debug/single/debug.json b/src/app/build/intermediates/blame/res/debug/single/debug.json index aac646e..73e5eda 100644 --- a/src/app/build/intermediates/blame/res/debug/single/debug.json +++ b/src/app/build/intermediates/blame/res/debug/single/debug.json @@ -1,4 +1,8 @@ [ + { + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_pwd_confirm.xml.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\dialog_pwd_confirm.xml" + }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" @@ -19,14 +23,14 @@ "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, - { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" - }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_gestures.txt.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\gestures.txt" }, + { + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" @@ -47,26 +51,26 @@ "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\searchable.xml" }, - { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" - }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_event.txt.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw-zh-rCN\\event.txt" + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, + { + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_event.txt.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw-zh-rCN\\event.txt" + }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" @@ -199,14 +203,14 @@ "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\introduction" }, - { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_options.xml" - }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, + { + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_options.xml" + }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" @@ -411,14 +415,14 @@ "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, - { - "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" - }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_gesture_setting.xml.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\gesture_setting.xml" }, + { + "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + }, { "merged": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\delete.png" diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 5c0998f..dbb30af 100644 Binary files a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 22235ec..9281946 100644 Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 3ee5311..b643eb5 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 347a2dc..78b556f 100644 --- a/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Nov 21 22:37:44 CST 2020 +#Thu Nov 26 14:58:59 CST 2020 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw-zh-rCN\\contact.txt=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_contact.txt.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\myboard.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_myboard.xml.flat @@ -9,7 +9,6 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list.xml=F\ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\gestruesetting.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_gestruesetting.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\delete.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_edit.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat @@ -39,7 +38,6 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\note_edit.xml= F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\clock.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\call_note_edit.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\gestrueview.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_gestrueview.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\introduction=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat @@ -69,8 +67,9 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_gr F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\widget_4x_info.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\settings_header.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\dialog_pwd_confirm.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_pwd_confirm.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw-zh-rCN\\event.txt=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_event.txt.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\contact.txt=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_contact.txt.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat @@ -84,29 +83,29 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\event.txt=F\:\\Gi F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\datetime_picker.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\add_account_text.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\gestures.txt=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_gestures.txt.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\dialog_pwd.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_pwd.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_options.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\dialog_pwd.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_pwd.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw-zh-rCN\\gestures.txt=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_gestures.txt.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\preferences.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\note_item.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat +F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat diff --git a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 87bc457..0f4c00d 100644 --- a/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -2567,7 +2567,7 @@ 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" + 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" -%s --%s --%s @@ -2575,11 +2575,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spset private modecount how many notes are theredelete private modePlease input PassWordopen the albumtake photostart drawNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spset private modecount how many notes are theredelete private modePlease input PassWordopen the albumtake photostart drawset gestrueswitch to default gestrueNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - switch to default gestrueset gestrue 短信 邮件 - 设置为隐私便签显示目前便签数量撤销隐私便签输入隐私密码打开图库打开相机开始画图便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 设置为隐私便签显示目前便签数量撤销隐私便签输入隐私密码打开图库打开相机开始画图采用自定义手势采用默认手势便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - 采用自定义手势采用默认手势 + 短信 郵件 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - + diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d93d606..c76f3b8 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun Nov 22 00:11:23 CST 2020 +#Fri Nov 27 10:33:57 CST 2020 base.0=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 840dcbd..09f3d83 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 06047c5..64f2fde 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index de746db..2a35549 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 42e6a3f..330ce77 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index c36ad54..fb06a11 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 3097641..f7b2393 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 7a7a3c0..5a8eb72 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 06a6def..288e20d 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 33af419..012a337 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 48324b6..b4458a4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 9575f4d..d52bcdf 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index e9ec140..c11a81e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 78b06cd..bad4631 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 02576ba..b3f9a33 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index dedd6e8..3c4c8c4 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index bd27e83..53bbbad 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 5536419..2f15b99 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index edb8a15..ad0cffd 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 08adb63..ed1ae69 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 5e489bc..29d6411 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 9bf52e6..3f38c0f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index e56502e..55ab09b 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index b45ae8d..8599758 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index fd6e8fb..9f74ee3 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 1cc9040..a281872 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index f29ba59..baada3e 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 2d30116..1f9bf3c 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 60bcf3b..e3c3ec7 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 72b1058..22dfea6 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index f1e80ae..cadf825 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index 00eb5b1..c971264 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 7d3ad58..c493132 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 2ee3603..7e04c8f 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 3bcdda6..20268c5 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 6db68d8..b0b6632 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 39d848e..362aa05 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index 6b73296..5c2dc61 100644 Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 75d61b7..a4e0ea3 100644 Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 664071f..5b6ab1e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index 581c3f5..839805e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 6d9a76f..f2a41d7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 3b07008..ee6fcb1 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 718741f..f953244 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index ca5b3c4..5480a7e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 2323bee..d139a90 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 1e09c38..5843513 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index aafb934..e33918a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 9413aba..9553d89 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index c697890..346af9d 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index b0fc9bb..b77fb39 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 0502f8f..61ad3d0 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 5bddff6..4382374 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index bde2ab8..f10cf52 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index ad5875e..a8c1667 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index e67c221..1f57f6c 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 0c7fcd6..f514c74 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index ec2367b..09ecd83 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 4c38ede..d91fb4e 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 3b53f35..749b097 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index a219f3e..44323fe 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index b475952..65b330b 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index b352a62..6e6919a 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ca3b93c..5e0c741 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index d61cafa..23e8fb3 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 7a5359f..7f280dc 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 21fe6d2..3ed7019 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index c1da81a..cc30f32 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index c468f92..14b44b7 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 8e7d636..ccc2c58 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index cbf57a2..5461bb4 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 61f28ff..bc7b4eb 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 57ae76d..c51b133 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 503f66a..7b452e9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index ecdf345..98c7ca9 100644 Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/src/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat index 5301343..b6bf6c2 100644 Binary files a/src/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/src/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ diff --git a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat index 7f213ad..dd937f3 100644 Binary files a/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt index ce65c0f..67df454 100644 --- a/src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -822,76 +822,80 @@ int id notification_background 0x7f08009a int id notification_main_column 0x7f08009b int id notification_main_column_container 0x7f08009c int id parentPanel 0x7f08009d -int id prefenerece_sync_status_textview 0x7f08009e -int id preference_sync_button 0x7f08009f -int id progress_circular 0x7f0800a0 -int id progress_horizontal 0x7f0800a1 -int id radio 0x7f0800a2 -int id radioGroup 0x7f0800a3 -int id right 0x7f0800a4 -int id right_icon 0x7f0800a5 -int id right_side 0x7f0800a6 -int id screen 0x7f0800a7 -int id scrollIndicatorDown 0x7f0800a8 -int id scrollIndicatorUp 0x7f0800a9 -int id scrollView 0x7f0800aa -int id search_badge 0x7f0800ab -int id search_bar 0x7f0800ac -int id search_button 0x7f0800ad -int id search_close_btn 0x7f0800ae -int id search_edit_frame 0x7f0800af -int id search_go_btn 0x7f0800b0 -int id search_mag_icon 0x7f0800b1 -int id search_plate 0x7f0800b2 -int id search_src_text 0x7f0800b3 -int id search_voice_btn 0x7f0800b4 -int id select_dialog_listview 0x7f0800b5 -int id selection_menu 0x7f0800b6 -int id set_gesture 0x7f0800b7 -int id set_private_pwd 0x7f0800b8 -int id shortcut 0x7f0800b9 -int id showCustom 0x7f0800ba -int id showHome 0x7f0800bb -int id showTitle 0x7f0800bc -int id spacer 0x7f0800bd -int id split_action_bar 0x7f0800be -int id src_atop 0x7f0800bf -int id src_in 0x7f0800c0 -int id src_over 0x7f0800c1 -int id start 0x7f0800c2 -int id status_bar_latest_event_content 0x7f0800c3 -int id submenuarrow 0x7f0800c4 -int id submit_area 0x7f0800c5 -int id sv_note_edit 0x7f0800c6 -int id tabMode 0x7f0800c7 -int id tag_transition_group 0x7f0800c8 -int id tag_unhandled_key_event_manager 0x7f0800c9 -int id tag_unhandled_key_listeners 0x7f0800ca -int id text 0x7f0800cb -int id text2 0x7f0800cc -int id textSpacerNoButtons 0x7f0800cd -int id textSpacerNoTitle 0x7f0800ce -int id text_num 0x7f0800cf -int id time 0x7f0800d0 -int id title 0x7f0800d1 -int id titleDividerNoCustom 0x7f0800d2 -int id title_template 0x7f0800d3 -int id top 0x7f0800d4 -int id topPanel 0x7f0800d5 -int id tv_alert_date 0x7f0800d6 -int id tv_folder_name 0x7f0800d7 -int id tv_modified_date 0x7f0800d8 -int id tv_name 0x7f0800d9 -int id tv_time 0x7f0800da -int id tv_title 0x7f0800db -int id tv_title_bar 0x7f0800dc -int id uniform 0x7f0800dd -int id up 0x7f0800de -int id useLogo 0x7f0800df -int id widget_bg_image 0x7f0800e0 -int id widget_text 0x7f0800e1 -int id withText 0x7f0800e2 -int id wrap_content 0x7f0800e3 +int id password_hint 0x7f08009e +int id prefenerece_sync_status_textview 0x7f08009f +int id preference_sync_button 0x7f0800a0 +int id progress_circular 0x7f0800a1 +int id progress_horizontal 0x7f0800a2 +int id radio 0x7f0800a3 +int id radioGroup 0x7f0800a4 +int id right 0x7f0800a5 +int id right_icon 0x7f0800a6 +int id right_side 0x7f0800a7 +int id screen 0x7f0800a8 +int id scrollIndicatorDown 0x7f0800a9 +int id scrollIndicatorUp 0x7f0800aa +int id scrollView 0x7f0800ab +int id search_badge 0x7f0800ac +int id search_bar 0x7f0800ad +int id search_button 0x7f0800ae +int id search_close_btn 0x7f0800af +int id search_edit_frame 0x7f0800b0 +int id search_go_btn 0x7f0800b1 +int id search_mag_icon 0x7f0800b2 +int id search_plate 0x7f0800b3 +int id search_src_text 0x7f0800b4 +int id search_voice_btn 0x7f0800b5 +int id select_dialog_listview 0x7f0800b6 +int id selection_menu 0x7f0800b7 +int id set_gesture 0x7f0800b8 +int id set_private_pwd 0x7f0800b9 +int id set_private_pwd_confirm 0x7f0800ba +int id shortcut 0x7f0800bb +int id showCustom 0x7f0800bc +int id showHome 0x7f0800bd +int id showTitle 0x7f0800be +int id spacer 0x7f0800bf +int id split_action_bar 0x7f0800c0 +int id src_atop 0x7f0800c1 +int id src_in 0x7f0800c2 +int id src_over 0x7f0800c3 +int id start 0x7f0800c4 +int id status_bar_latest_event_content 0x7f0800c5 +int id submenuarrow 0x7f0800c6 +int id submit_area 0x7f0800c7 +int id sv_note_edit 0x7f0800c8 +int id tabMode 0x7f0800c9 +int id tag_transition_group 0x7f0800ca +int id tag_unhandled_key_event_manager 0x7f0800cb +int id tag_unhandled_key_listeners 0x7f0800cc +int id text 0x7f0800cd +int id text2 0x7f0800ce +int id textSpacerNoButtons 0x7f0800cf +int id textSpacerNoTitle 0x7f0800d0 +int id textView1 0x7f0800d1 +int id textView2 0x7f0800d2 +int id text_num 0x7f0800d3 +int id time 0x7f0800d4 +int id title 0x7f0800d5 +int id titleDividerNoCustom 0x7f0800d6 +int id title_template 0x7f0800d7 +int id top 0x7f0800d8 +int id topPanel 0x7f0800d9 +int id tv_alert_date 0x7f0800da +int id tv_folder_name 0x7f0800db +int id tv_modified_date 0x7f0800dc +int id tv_name 0x7f0800dd +int id tv_time 0x7f0800de +int id tv_title 0x7f0800df +int id tv_title_bar 0x7f0800e0 +int id uniform 0x7f0800e1 +int id up 0x7f0800e2 +int id useLogo 0x7f0800e3 +int id widget_bg_image 0x7f0800e4 +int id widget_text 0x7f0800e5 +int id withText 0x7f0800e6 +int id wrap_content 0x7f0800e7 int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityShortDur 0x7f090001 int integer cancel_button_image_alpha 0x7f090002 @@ -930,38 +934,39 @@ int layout add_account_text 0x7f0a001d int layout datetime_picker 0x7f0a001e int layout dialog_edit_text 0x7f0a001f int layout dialog_pwd 0x7f0a0020 -int layout dialog_save 0x7f0a0021 -int layout folder_list_item 0x7f0a0022 -int layout gesture_setting 0x7f0a0023 -int layout myboard 0x7f0a0024 -int layout note_edit 0x7f0a0025 -int layout note_edit_list_item 0x7f0a0026 -int layout note_item 0x7f0a0027 -int layout note_list 0x7f0a0028 -int layout note_list_dropdown_menu 0x7f0a0029 -int layout note_list_footer 0x7f0a002a -int layout notification_action 0x7f0a002b -int layout notification_action_tombstone 0x7f0a002c -int layout notification_media_action 0x7f0a002d -int layout notification_media_cancel_action 0x7f0a002e -int layout notification_template_big_media 0x7f0a002f -int layout notification_template_big_media_custom 0x7f0a0030 -int layout notification_template_big_media_narrow 0x7f0a0031 -int layout notification_template_big_media_narrow_custom 0x7f0a0032 -int layout notification_template_custom_big 0x7f0a0033 -int layout notification_template_icon_group 0x7f0a0034 -int layout notification_template_lines_media 0x7f0a0035 -int layout notification_template_media 0x7f0a0036 -int layout notification_template_media_custom 0x7f0a0037 -int layout notification_template_part_chronometer 0x7f0a0038 -int layout notification_template_part_time 0x7f0a0039 -int layout select_dialog_item_material 0x7f0a003a -int layout select_dialog_multichoice_material 0x7f0a003b -int layout select_dialog_singlechoice_material 0x7f0a003c -int layout settings_header 0x7f0a003d -int layout support_simple_spinner_dropdown_item 0x7f0a003e -int layout widget_2x 0x7f0a003f -int layout widget_4x 0x7f0a0040 +int layout dialog_pwd_confirm 0x7f0a0021 +int layout dialog_save 0x7f0a0022 +int layout folder_list_item 0x7f0a0023 +int layout gesture_setting 0x7f0a0024 +int layout myboard 0x7f0a0025 +int layout note_edit 0x7f0a0026 +int layout note_edit_list_item 0x7f0a0027 +int layout note_item 0x7f0a0028 +int layout note_list 0x7f0a0029 +int layout note_list_dropdown_menu 0x7f0a002a +int layout note_list_footer 0x7f0a002b +int layout notification_action 0x7f0a002c +int layout notification_action_tombstone 0x7f0a002d +int layout notification_media_action 0x7f0a002e +int layout notification_media_cancel_action 0x7f0a002f +int layout notification_template_big_media 0x7f0a0030 +int layout notification_template_big_media_custom 0x7f0a0031 +int layout notification_template_big_media_narrow 0x7f0a0032 +int layout notification_template_big_media_narrow_custom 0x7f0a0033 +int layout notification_template_custom_big 0x7f0a0034 +int layout notification_template_icon_group 0x7f0a0035 +int layout notification_template_lines_media 0x7f0a0036 +int layout notification_template_media 0x7f0a0037 +int layout notification_template_media_custom 0x7f0a0038 +int layout notification_template_part_chronometer 0x7f0a0039 +int layout notification_template_part_time 0x7f0a003a +int layout select_dialog_item_material 0x7f0a003b +int layout select_dialog_multichoice_material 0x7f0a003c +int layout select_dialog_singlechoice_material 0x7f0a003d +int layout settings_header 0x7f0a003e +int layout support_simple_spinner_dropdown_item 0x7f0a003f +int layout widget_2x 0x7f0a0040 +int layout widget_4x 0x7f0a0041 int menu call_note_edit 0x7f0b0000 int menu call_record_folder 0x7f0b0001 int menu note_edit 0x7f0b0002 diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk index 45f2b9a..b22ee8f 100644 Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/app/src/main/java/net/micode/notes/data/Notes.java b/src/app/src/main/java/net/micode/notes/data/Notes.java index d7f16f2..eb908df 100644 --- a/src/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/app/src/main/java/net/micode/notes/data/Notes.java @@ -62,7 +62,9 @@ public class Notes { public static final Uri CONTENT_DATA_URI = Uri.parse(Content + AUTHORITY + "/data"); public interface NoteColumns { -//mine 1 + + //mine 2 + String HINT = "hint"; String PASSWORD = "note_password"; /** * The unique ID for a row diff --git a/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 093a686..0838bf4 100644 --- a/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -63,7 +63,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," + - NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT '' " +//mine 1 + NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT ''," +//创建密码的表项 + NoteColumns.HINT + " TEXT NOT NULL DEFAULT '' "+//创建密码提示的表项 ")"; private static final String CREATE_DATA_TABLE_SQL = @@ -237,23 +238,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER); db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } - /*public int retCount(){ - int NotesCount = mNotesCount; - int ItemCount = getCount(); - for (int i = 0; i < ItemCount; i++) { - Cursor c = (Cursor) getItem(i); - if (c != null) { - if (NoteItemData.getNoteType(c) == Notes.TYPE_FOLDER) { - NoteItemData NoteItem = new NoteItemData(mContext, c); - NotesCount += NoteItem.getNotesCount(); - } - } else { - Log.e(TAG, "Invalid cursor"); - return -1; - } - } - return NotesCount; - }*/ public void dosearch(String querystring) //搜索时不区分大小写,仿照上面的递归 { Cursor cursor = null; diff --git a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java index 1ff0c13..22d0eea 100644 --- a/src/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -127,19 +127,6 @@ public class WorkingNote { mNote = new Note(); loadNote(); } -//mine 12 - public boolean comparePassword(String passWord) - { - Cursor cursor = mContext.getContentResolver().query( - ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), new String[]{NoteColumns.PASSWORD}, null, - null, null); - - int passWordIndex = cursor.getColumnIndexOrThrow(NoteColumns.PASSWORD); - cursor.moveToFirst(); - String str = cursor.getString(passWordIndex); - cursor.close(); - return str.equals(passWord); - } private void loadNote() { Cursor cursor = mContext.getContentResolver().query( @@ -246,14 +233,6 @@ public class WorkingNote { public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { mNoteSettingStatusListener = l; } - //mine 4 - public void setmPwd(String password) - { - mNote.setNoteValue(NoteColumns.PASSWORD, String.valueOf(password)); - } - public void delmPwd(){ - mNote.setNoteValue(NoteColumns.PASSWORD, ""); - } public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { @@ -367,7 +346,29 @@ public class WorkingNote { public int getWidgetType() { return mWidgetType; } + //mine 22 + public boolean comparePassword(String passWord) + { + Cursor cursor = mContext.getContentResolver().query( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), new String[]{NoteColumns.PASSWORD}, null, + null, null); + int passWordIndex = cursor.getColumnIndexOrThrow(NoteColumns.PASSWORD); + cursor.moveToFirst(); + String str = cursor.getString(passWordIndex); + cursor.close(); + return str.equals(passWord); + } + public void setmPwd(String password,String hint) + { + mNote.setNoteValue(NoteColumns.PASSWORD, String.valueOf(password)); + mNote.setNoteValue(NoteColumns.HINT, String.valueOf(hint)); + } + + public void delmPwd(){ + mNote.setNoteValue(NoteColumns.PASSWORD, ""); + mNote.setNoteValue(NoteColumns.HINT, ""); + } public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed diff --git a/src/app/src/main/java/net/micode/notes/tool/ImageUtils.java b/src/app/src/main/java/net/micode/notes/tool/ImageUtils.java index 4f24516..4e4bdf8 100644 --- a/src/app/src/main/java/net/micode/notes/tool/ImageUtils.java +++ b/src/app/src/main/java/net/micode/notes/tool/ImageUtils.java @@ -352,5 +352,4 @@ public class ImageUtils { bitmap = compressImage(bitmap, 100);//质量压缩 return bitmap; } - } diff --git a/src/app/src/main/java/net/micode/notes/ui/MyBoard.java b/src/app/src/main/java/net/micode/notes/ui/MyBoard.java index a034eae..06da8b1 100644 --- a/src/app/src/main/java/net/micode/notes/ui/MyBoard.java +++ b/src/app/src/main/java/net/micode/notes/ui/MyBoard.java @@ -38,7 +38,7 @@ public class MyBoard extends Activity { setContentView(R.layout.myboard); imageView = (ImageView) findViewById(R.id.iv_image); - //使用Bitmap工厂把背景图片加载进来 + //使用Bitmap工厂把画板背景图片加载进来 Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.huaban); //创建一个空的图片，宽度和高度 还有信息跟原图片一样 copyBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), bitmap.getConfig()); @@ -63,7 +63,6 @@ public class MyBoard extends Activity { //按下事件 startX = event.getX(); startY = event.getY(); - //Log.e("按下", startX + "," + startY); break; case MotionEvent.ACTION_MOVE: //滑动事件 @@ -75,13 +74,11 @@ public class MyBoard extends Activity { imageView.setImageBitmap(copyBitmap); startX = x; startY = y; - //Log.e("滑动", x + "," + y); break; case MotionEvent.ACTION_UP: //抬起事件 float upX = event.getX(); float upY = event.getY(); - //Log.e("抬起", upX + "," + upY); break; } //必须设置为true，否则只执行按下事件 @@ -113,7 +110,7 @@ public class MyBoard extends Activity { FileOutputStream straeam; try { straeam = new FileOutputStream(file); - //生成图片，参数①为图片的类型，参数②为图片质量，参数③为文件输出流 + //生成图片，compress方法参数①为图片的类型，参数②为图片质量，参数③为文件输出流 copyBitmap.compress(Bitmap.CompressFormat.PNG, 100, straeam); Toast.makeText(this, "保存成功", Toast.LENGTH_SHORT).show(); } catch (FileNotFoundException e) { @@ -122,6 +119,6 @@ public class MyBoard extends Activity { Intent intent1=new Intent();//构造Intent，用于传递数据 intent1.putExtra("draw path",draw_path);//传递储存的路径 setResult(RESULT_OK,intent1);//专门向上一个活动传递数据的 - finish(); + finish();//退出活动 } } \ No newline at end of file diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index c73605d..14cd97f 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -200,12 +200,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return; } - //mine 4 - if (!(mWorkingNote.comparePassword(getIntent().getStringExtra("password")))) { - Toast.makeText(getApplicationContext(), "密码错误", Toast.LENGTH_SHORT); - finish(); - return; - } initResources(); count(); } @@ -256,21 +250,22 @@ public class NoteEditActivity extends Activity implements OnClickListener, } }); } - //mine 40 + //mine 41 @RequiresApi(api = Build.VERSION_CODES.KITKAT) private void initEditText() { InputStream in = null; + //根据传入值的不同类型，加载不同的文字到便签中 switch (getIntent().getIntExtra("open_mode", 0)) { - case 1: + case 1://创建事件便签 in = getResources().openRawResource(R.raw.event); break; - case 2: + case 2://创建联系人便签 in = getResources().openRawResource(R.raw.contact); break; - case 3: + case 3://创建账号便签 in = getResources().openRawResource(R.raw.passwd); break; - default: + default://创建普通便签 break; } if (in == null) return; @@ -303,8 +298,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, protected void onResume() { super.onResume(); initNoteScreen(); - initEditText(); - initImage(); + initEditText();//初始化便签内容 + initImage();//初始化图片 } @Override @@ -642,7 +637,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { getMenuInflater().inflate(R.menu.note_edit, menu); } - if (mWorkingNote.getCheckListMode() == TextNote.MODE_PRIVATE_TYPE) {//mine 5 + if (mWorkingNote.getCheckListMode() == TextNote.MODE_PRIVATE_TYPE) { menu.findItem(R.id.menu_setPrivate).setVisible(false); } else { menu.findItem(R.id.menu_leavePrivate).setVisible(false); @@ -662,14 +657,14 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) {//mine 17 - case R.id.menu_draw: + switch (item.getItemId()) {//mine 18 + case R.id.menu_draw://打开画板 startDraw(); break; - case R.id.menu_take_photo: + case R.id.menu_take_photo://打开相机 startTakePhoto(); break; - case R.id.menu_camera: + case R.id.menu_camera://打开图库 callGallery(); break; case R.id.menu_setPrivate://设置为私密便签 @@ -679,7 +674,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, setPwd(); } break; - case R.id.menu_leavePrivate://设置为 + case R.id.menu_leavePrivate://取消私密便签 delPwd(); break; case R.id.menu_new_note: @@ -748,7 +743,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, context.startActivity(intent); } - private void createNewNote() { + private void createNewNote() {//mine 1 // Firstly, save current editing notes saveNote(); @@ -1065,6 +1060,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, final AlertDialog.Builder builder = new AlertDialog.Builder(this);//初始化对话框 View view = LayoutInflater.from(this).inflate(R.layout.dialog_pwd, null);//加载对话框的布局文件 final EditText etPwd = (EditText) view.findViewById(R.id.set_private_pwd);//初始化对话框里的文本对象 + final EditText etHint = (EditText) view.findViewById(R.id.password_hint);//初始化对话框里的文本对象 showSoftInput();//显示软键盘 builder.setPositiveButton(android.R.string.ok, null);//确定按钮 builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @@ -1078,12 +1074,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, public void onClick(View v) {//设置确定按钮的接收器 hideSoftInput(etPwd);//点击确定后收起软键盘 String Password = etPwd.getText().toString(); - if (!TextUtils.isEmpty(Password)) {//输入不为空 + String Hint = etHint.getText().toString(); + if (!TextUtils.isEmpty(Password)&&!TextUtils.isEmpty(Hint)) {//输入不为空 //Toast.makeText(getApplicationContext(), Password, Toast.LENGTH_SHORT).show(); //加到数据库里 - mWorkingNote.setmPwd(Password); + mWorkingNote.setmPwd(Password,Hint); saveNote(); - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?//改workingnote的mMode的值，对应上文的界面设置 + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?//改workingnote的mMode的值，对应上文的菜单显示 TextNote.MODE_PRIVATE_TYPE : 0, false); } dialog.dismiss();//撤销对话框 @@ -1111,7 +1108,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void delPwd() { - //从数据库把password设置为‘’ mWorkingNote.delmPwd(); saveNote(); mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? @@ -1198,7 +1194,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, private SpannableString getBitmapMime(String path, String tagPath) { SpannableString ss = new SpannableString(tagPath);//这里使用加了标签的图片路径 int width = ScreenUtils.getScreenWidth(NoteEditActivity.this); - //int height = ScreenUtils.getScreenHeight(NoteEditActivity.this); BitmapFactory.Options options = new BitmapFactory.Options(); //路径对应的图片 Bitmap bitmap = BitmapFactory.decodeFile(path, options); @@ -1260,9 +1255,12 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void startTakePhoto() {//打开相机的方法 - Timestamp ts=new Timestamp(new Date().getTime());//用当前时间做一个时间戳，作为图片的名称 - pathTakingPhoto = ts.toString().replace(":","_")+".jpg";//因为时间戳中 : 字符是不允许出现在文件名称中的 - File outputImage = new File(getExternalCacheDir(), pathTakingPhoto);//将每次相机拍摄的图片存储下来 + //用当前时间做一个时间戳，作为图片的名称 + Timestamp ts=new Timestamp(new Date().getTime()); + //删除:字符,因为时间戳中 : 字符是不允许出现在文件名称中的 + pathTakingPhoto = ts.toString().replace(":","_")+".jpg"; + //将每次相机拍摄的图片存储下来 + File outputImage = new File(getExternalCacheDir(), pathTakingPhoto); try { outputImage.createNewFile(); } catch (IOException e) { @@ -1285,9 +1283,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, Bitmap bmp = (Bitmap) data.getExtras().get("data");// 解析返回的图片成bitmap // 保存文件 FileOutputStream fos = null; + //根据SD卡的路径创建文件对象 File file = new File(getExternalCacheDir(),pathTakingPhoto); - try {// 写入SD card + try { fos = new FileOutputStream(file.toString()); + //将图片储存到SD卡处 bmp.compress(Bitmap.CompressFormat.JPEG, 100, fos); } catch (FileNotFoundException e) { e.printStackTrace(); diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java index bf8ac3f..9ac579b 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java @@ -37,7 +37,7 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; -public class NoteEditText extends EditText { +public class NoteEditText extends androidx.appcompat.widget.AppCompatEditText { private static final String TAG = "NoteEditText"; private int mIndex; private int mSelectionStartBeforeDelete; diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 471c5a7..6567386 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -23,6 +23,7 @@ import android.text.TextUtils; import net.micode.notes.data.Contact; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.model.Note; import net.micode.notes.tool.DataUtils; //mine 5 @@ -40,7 +41,8 @@ public class NoteItemData { NoteColumns.TYPE, NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, - NoteColumns.PASSWORD//mine + NoteColumns.PASSWORD,//mine + NoteColumns.HINT }; private static final int ID_COLUMN = 0; @@ -56,6 +58,7 @@ public class NoteItemData { private static final int WIDGET_ID_COLUMN = 10; private static final int WIDGET_TYPE_COLUMN = 11; private static final int PASSWORD = 12; + private static final int HINT = 13; private long mId; private long mAlertDate;//提醒时间 @@ -72,6 +75,7 @@ public class NoteItemData { private String mName; private String mPhoneNumber; private String mPassWord; + private String mHint; private boolean mIsLastItem; private boolean mIsFirstItem; @@ -94,7 +98,8 @@ public class NoteItemData { mType = cursor.getInt(TYPE_COLUMN); mWidgetId = cursor.getInt(WIDGET_ID_COLUMN); mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); - mPassWord=cursor.getString(PASSWORD); + mPassWord = cursor.getString(PASSWORD);//mine 2 + mHint = cursor.getString(HINT); mPhoneNumber = ""; if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { @@ -138,6 +143,10 @@ public class NoteItemData { } } } + //mine 2 + public String getmHint(){ + return mHint; + } public String getmPassWord(){ return mPassWord; } diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 093638d..9163766 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -156,9 +156,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private final static int REQUEST_CODE_OPEN_NODE = 102;//打开某个便签时返回的 private final static int REQUEST_CODE_NEW_NODE = 103;//新建便签时返回的 + //mine 8 private final static int GESTURE_SETTING = 104; - //mine 4 - private String inputPwd; private AlertDialog alertDialog1; private GestureDetector mGestureDetector; private GestureLibrary library; @@ -170,13 +169,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt super.onCreate(savedInstanceState);//调用父类的创建，以保存的状态为参数 setContentView(R.layout.note_list);//设置视图 initResources();//初始化内容 - GestureLoad(); + /** * Insert an introduction when user firstly use this application */ setAppInfoFromRawRes();//从Res文件下的资源，加载便签 } + //mine 4 + @Override + protected void onResume() { + super.onResume(); + GestureLoad(); + } + //mine 21 private void GestureLoad(){ + //申请读的权限 ActivityCompat.requestPermissions(NotesListActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 1);//动态申请权限 //加载手势文件 if(GestureMode == 0) {//系统自定义数据库 @@ -202,7 +209,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt super.onStart();//调用父类，启动活动 startAsyncNotesListQuery();//同步便签列表 } - +//mine 3 @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {//从一个活动被销毁时，转换成另一个活动时会调用 if (resultCode == RESULT_OK @@ -213,7 +220,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt { GestureMode = 1; GestureLoad(); - } else { + }else { super.onActivityResult(requestCode, resultCode, data);//调用父类的方法 } } @@ -295,15 +302,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mTitleBar = (TextView) findViewById(R.id.tv_title_bar);//文件夹下的标头 mState = ListEditState.NOTE_LIST;//设置状态为主界面 mModeCallBack = new ModeCallback();//对便签的方法调用，删除和移动 - inputPwd = "";//mine + // mine4 mGestureDetector = new GestureDetector(new gesturelistener()); gestures_overlay = (GestureOverlayView) findViewById(R.id.gesture_view); gestures_overlay.addOnGesturePerformedListener(new gestureOverlayListener()); gestureViewName = findViewById(R.id.gesture_view_name); } - //设置监听 - private class gestureOverlayListener implements GestureOverlayView.OnGesturePerformedListener {//mine + //设置监听 mine85 + private class gestureOverlayListener implements GestureOverlayView.OnGesturePerformedListener { @Override public void onGesturePerformed(GestureOverlayView overlay, Gesture gesture) { @@ -465,7 +472,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt mActionMode.finish(); } - //here public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) { mNotesListAdapter.setCheckedItem(position, checked); @@ -479,9 +485,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - switch (item.getItemId()) { + switch (item.getItemId()) {//mine2 case R.id.delete: - if(WithoutPassword()){ + if(NotExistPassword()){ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); @@ -511,7 +517,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } } - public boolean WithoutPassword(){//mine 20 + public boolean NotExistPassword(){//mine 20 SQLiteDatabase db = null;//数据库对象 for (long id:mNotesListAdapter.getSelectedItemIds()) { try{ @@ -520,10 +526,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt { e.printStackTrace(); } - Cursor cursor = db.query("note", new String[]{NoteColumns.ID,NoteColumns.PASSWORD},//对数据库查询的光标 - "_id = ?",new String[]{String.valueOf(id)},null,null,null); - cursor.moveToFirst();//防止遗漏，先把光标移到最上面 - String p = cursor.getString(cursor.getColumnIndex("note_password"));//找对应的密码 + //对数据库查询的光标 + Cursor cursor = db.query("note", new String[]{NoteColumns.ID,NoteColumns.PASSWORD}, + "_id = ?",new String[]{String.valueOf(id)},null,null,null); + //防止遗漏，先把光标移到最上面 + cursor.moveToFirst(); + //找对应的密码 + String p = cursor.getString(cursor.getColumnIndex("note_password")); if(!p.equals("")) { return false; @@ -660,16 +669,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt builder.show();//显示对话框 } - private void createNewNote(int openMode) {//mine 2 + private void createNewNote(int openMode) {//mine 1 Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - intent.putExtra("password",""); - intent.putExtra("open_mode",openMode); + intent.putExtra("open_mode",openMode);//不同的打开方式，加载不同的便签模板 intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); - //putExtra(“A”,B)中，AB为键值对，第一个参数为键名，第二个参数为键对应的值。 - // 顺便提一下，如果想取出Intent对象中的这些值，需要在你的另一个Activity中用getXXXXXExtra方法， - // 注意需要使用对应类型的方法，参数为键名 - this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);//这个活动发出请求，等待下一个活动返回数据 + this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); } private void batchDelete() {//删除时候，会判断是否为桌面挂件 批量删除 @@ -738,11 +743,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt - private void openNode(NoteItemData data) {//打开便签，参数为数据 mine 2 + private void openNode(NoteItemData data) {//打开便签，参数为数据 Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); - intent.putExtra("password",inputPwd); - inputPwd = ""; intent.putExtra(Intent.EXTRA_UID, data.getId()); this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); } @@ -770,7 +773,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt public void onClick(View v) {//文件夹界面的点击相应的函数 switch (v.getId()) { case R.id.btn_new_note://创建新便签 - showList(); + showNoteType(); break; default: break; @@ -970,7 +973,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - + //mine 5 @Override public boolean onPrepareOptionsMenu(Menu menu) {//准备菜单，根据不同的状态加载不同的菜单 menu.clear();//先把原先的菜单删除 @@ -980,6 +983,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt // set sync or sync_cancel menu.findItem(R.id.menu_sync).setTitle( GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); + if (GestureMode == 0){ + menu.findItem(R.id.default_gesture).setVisible(false); + } + else if (GestureMode == 1){ + menu.findItem(R.id.set_gesture).setVisible(false); + } } else if (mState == ListEditState.SUB_FOLDER) { getMenuInflater().inflate(R.menu.sub_folder, menu); } else if (mState == ListEditState.CALL_RECORD_FOLDER) { @@ -987,29 +996,25 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } else { Log.e(TAG, "Wrong state:" + mState); } - if (GestureMode == 0){ - menu.findItem(R.id.default_gesture).setVisible(false); - } - else if (GestureMode == 1){ - menu.findItem(R.id.set_gesture).setVisible(false); - } + return true; } @Override - public boolean onOptionsItemSelected(MenuItem item) {//六个菜单 - switch (item.getItemId()) {//mine 6 - case R.id.set_gesture: { + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) {//mine 14 + case R.id.set_gesture: {//设置手势并切换至自定义手势库 startSetting(); Toast.makeText(NotesListActivity.this,"启用自定义手势",Toast.LENGTH_LONG); break; } - case R.id.default_gesture:{ + case R.id.default_gesture:{//切换至默认手势库 GestureMode = 0; Toast.makeText(NotesListActivity.this,"启用默认手势",Toast.LENGTH_LONG); + GestureLoad(); break; } - case R.id.menu_countAllNotes: { + case R.id.menu_countAllNotes: {//统计便签数量 showNumberofNotes(); break; } @@ -1038,7 +1043,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt break; } case R.id.menu_new_note: { - showList(); + showNoteType(); break; } case R.id.menu_search: @@ -1050,7 +1055,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - private void startSetting(){ + private void startSetting(){//mine 4 Intent intent = new Intent(NotesListActivity.this, GestureSetting.class); this.startActivityForResult(intent,GESTURE_SETTING); } @@ -1059,7 +1064,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt startSearch(null, false, null /* appData */, false);//好像还没实现 return true; } - public void showList(){//mine 12 + public void showNoteType(){//mine 12 final String[] items = {"普通便签", "事件便签", "联系人便签", "密码便签"}; AlertDialog.Builder alertBuilder = new AlertDialog.Builder(this); alertBuilder.setTitle("选择创建的便签"); @@ -1174,15 +1179,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - public void testNode(final NoteItemData item){//mine 52 + public void testNode(final NoteItemData item){//mine 56 if(item.getmPassWord().equals(""))//判断是否有密码，如果没有密码，那么item.getmPassWord()返回的值就是空字符串 { openNode(item); } else{ final AlertDialog.Builder builder = new AlertDialog.Builder(this);//初始化对话框 - View view = LayoutInflater.from(this).inflate(R.layout.dialog_pwd, null);//加载对话框的布局文件 - final EditText etPwd = (EditText) view.findViewById(R.id.set_private_pwd);//初始化对话框里的文本对象 + View view = LayoutInflater.from(this).inflate(R.layout.dialog_pwd_confirm, null);//加载对话框的布局文件 + final EditText etPwd = (EditText) view.findViewById(R.id.set_private_pwd_confirm);//初始化对话框里的文本对象 showSoftInput();//显示软键盘 builder.setPositiveButton(android.R.string.ok, null);//确定按钮 builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @@ -1197,8 +1202,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt hideSoftInput(etPwd);//点击确定后收起软键盘 String Password = etPwd.getText().toString();//文本框里的输入值 if (!TextUtils.isEmpty(Password)) {//输入不为空 - inputPwd = Password; - openNode(item); + if(Password.equals(item.getmPassWord())){ + openNode(item); + } + else { + Toast.makeText(getApplicationContext(),"密码错误",Toast.LENGTH_LONG).show(); + } } dialog.dismiss();//撤销对话框 diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index d30ed8f..618019e 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -35,14 +35,18 @@ public class NotesListAdapter extends CursorAdapter {//类NotesListAdopter实现 private static final String TAG = "NotesListAdapter";//名称，一般用于输出日志文件 private Context mContext;//便签相关内容 private HashMap mSelectedIndex;//哈希表表示的便签是否勾选 - private int mNotesCount;//便签数量 + private boolean mChoiceMode;//判断是否处于选择模式 - public int retCount(){ + + private int mNotesCount;//便签数量 + //返回便签总数量 + public int retCount(){//mine 16 int NotesCount = mNotesCount; int ItemCount = getCount(); for (int i = 0; i < ItemCount; i++) { Cursor c = (Cursor) getItem(i); if (c != null) { + //如果便签项是文件夹，则把文件夹下的便签也计入 if (NoteItemData.getNoteType(c) == Notes.TYPE_FOLDER) { NoteItemData NoteItem = new NoteItemData(mContext, c); NotesCount += NoteItem.getNotesCount(); diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 42b6e39..e6dc7f3 100644 --- a/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -77,7 +77,8 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } - if(!data.getmPassWord().equals("") && data.getType() == Notes.TYPE_NOTE){//如果便签为私密便签 + if(data.getType() == Notes.TYPE_NOTE && !(data.getmPassWord().equals("")) ){//如果便签为私密便签 + mTitle.setText("[已加密]"+"密码提示:"+data.getmHint());//mine 10 mKey.setImageResource(R.drawable.key); mKey.setVisibility(View.VISIBLE); } else { @@ -92,6 +93,7 @@ public class NotesListItem extends LinearLayout { + context.getString(R.string.format_folder_files_count, data.getNotesCount()));//设置便签标题内容为便签的前面部分的内容+文件数+便签数 mAlert.setVisibility(View.GONE);//设置提醒不可见 + mKey.setVisibility(View.GONE);//提前设置为gone } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));//如果是便签，则设置便签标题内容为便签的前面部分的内容 if (data.hasAlert()) {//如果数据项是有提醒的便签，则显示相应的图片 @@ -100,7 +102,8 @@ public class NotesListItem extends LinearLayout { } else { mAlert.setVisibility(View.GONE); } - if(!data.getmPassWord().equals("") && data.getType() == Notes.TYPE_NOTE){ + if(data.getType() == Notes.TYPE_NOTE && !(data.getmPassWord().equals("")) ){ + mTitle.setText("[已加密]"+"密码提示:"+data.getmHint()); mKey.setImageResource(R.drawable.key); mKey.setVisibility(View.VISIBLE); } else { diff --git a/src/app/src/main/res/layout/dialog_pwd.xml b/src/app/src/main/res/layout/dialog_pwd.xml index ca37a18..f61235f 100644 --- a/src/app/src/main/res/layout/dialog_pwd.xml +++ b/src/app/src/main/res/layout/dialog_pwd.xml @@ -1,7 +1,33 @@ + + + + + android:layout_height="fill_parent" > + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/layout/dialog_pwd_confirm.xml b/src/app/src/main/res/layout/dialog_pwd_confirm.xml new file mode 100644 index 0000000..946b583 --- /dev/null +++ b/src/app/src/main/res/layout/dialog_pwd_confirm.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/layout/gesture_setting.xml b/src/app/src/main/res/layout/gesture_setting.xml index 4466566..df978b6 100644 --- a/src/app/src/main/res/layout/gesture_setting.xml +++ b/src/app/src/main/res/layout/gesture_setting.xml @@ -4,19 +4,15 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context=".ui.GestureSetting"> - - - - \ No newline at end of file diff --git a/src/app/src/main/res/layout/note_item.xml b/src/app/src/main/res/layout/note_item.xml index 5cf2632..d78350f 100644 --- a/src/app/src/main/res/layout/note_item.xml +++ b/src/app/src/main/res/layout/note_item.xml @@ -79,5 +79,5 @@ android:id="@+id/for_key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|right"/> + android:layout_gravity="bottom|right" /> diff --git a/src/app/src/main/res/raw-zh-rCN/passwd b/src/app/src/main/res/raw-zh-rCN/passwd deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/src/main/res/raw/contact b/src/app/src/main/res/raw/contact deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/src/main/res/raw/event b/src/app/src/main/res/raw/event deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/src/main/res/raw/event.txt b/src/app/src/main/res/raw/event.txt index c634882..aa77f04 100644 --- a/src/app/src/main/res/raw/event.txt +++ b/src/app/src/main/res/raw/event.txt @@ -1,4 +1,5 @@ 事件名称： +优先级： 发生时间： 参与人物： 需做的准备： diff --git a/src/app/src/main/res/raw/gestrues b/src/app/src/main/res/raw/gestrues deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/src/main/res/raw/gestures b/src/app/src/main/res/raw/gestures deleted file mode 100644 index 8bc4ea1..0000000 Binary files a/src/app/src/main/res/raw/gestures and /dev/null differ diff --git a/src/app/src/main/res/raw/passwd b/src/app/src/main/res/raw/passwd deleted file mode 100644 index e69de29..0000000